mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-31 13:20:03 +00:00
minidlna: update 1.2.1 -> 1.3.0
Drop unneeded patch. This addresses build failures with ffmpeg 5.0 Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
committed by
Khem Raj
parent
ea427dceaa
commit
605ffa2302
@@ -13,7 +13,7 @@ SRC_URI = "git://git.code.sf.net/p/minidlna/git;branch=master;module=git \
|
|||||||
file://minidlna.service \
|
file://minidlna.service \
|
||||||
file://0001-Update-Gettext-version.patch \
|
file://0001-Update-Gettext-version.patch \
|
||||||
file://0001-configure-Check-for-clock_gettime-seprately-from-__N.patch \
|
file://0001-configure-Check-for-clock_gettime-seprately-from-__N.patch \
|
||||||
file://0001-Mark-setjmp_buffer-extern-declaration.patch \
|
file://0001-configure.ac-drop-non-standard-checks.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|||||||
-29
@@ -1,29 +0,0 @@
|
|||||||
From 1c6028f5f8bbfd3fd7327a43e1bb762c2c166167 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
|
||||||
Date: Wed, 12 Aug 2020 18:10:54 -0700
|
|
||||||
Subject: [PATCH] Mark setjmp_buffer extern declaration
|
|
||||||
|
|
||||||
Fixes build with -fno-common
|
|
||||||
|
|
||||||
Upstream-Status: Pending
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
||||||
---
|
|
||||||
metadata.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/metadata.c b/metadata.c
|
|
||||||
index 8a10c77..c114091 100644
|
|
||||||
--- a/metadata.c
|
|
||||||
+++ b/metadata.c
|
|
||||||
@@ -484,7 +484,7 @@ GetAudioMetadata(const char *path, const char *name)
|
|
||||||
}
|
|
||||||
|
|
||||||
/* For libjpeg error handling */
|
|
||||||
-jmp_buf setjmp_buffer;
|
|
||||||
+extern jmp_buf setjmp_buffer;
|
|
||||||
static void
|
|
||||||
libjpeg_error_handler(j_common_ptr cinfo)
|
|
||||||
{
|
|
||||||
--
|
|
||||||
2.28.0
|
|
||||||
|
|
||||||
+8
-13
@@ -1,4 +1,4 @@
|
|||||||
From 1118b1912916924bbfa3fd4dced9dfed01fbf0e0 Mon Sep 17 00:00:00 2001
|
From 93e7e25a10c890b8c8cd06cbfd78175c30999d31 Mon Sep 17 00:00:00 2001
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
Date: Mon, 9 Mar 2020 09:44:33 -0700
|
Date: Mon, 9 Mar 2020 09:44:33 -0700
|
||||||
Subject: [PATCH] configure: Check for clock_gettime seprately from
|
Subject: [PATCH] configure: Check for clock_gettime seprately from
|
||||||
@@ -9,13 +9,16 @@ since direct use of __NR_clock_gettime is not time64-safe
|
|||||||
|
|
||||||
Upstream-Status: Pending
|
Upstream-Status: Pending
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
---
|
|
||||||
configure.ac | 10 +++++++---
|
|
||||||
1 file changed, 7 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
|
---
|
||||||
|
configure.ac | 4 ++++
|
||||||
|
1 file changed, 4 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index 3d218ea..aa7dd1c 100644
|
||||||
--- a/configure.ac
|
--- a/configure.ac
|
||||||
+++ b/configure.ac
|
+++ b/configure.ac
|
||||||
@@ -125,6 +125,10 @@ case $host in
|
@@ -127,6 +127,10 @@ case $host in
|
||||||
esac
|
esac
|
||||||
|
|
||||||
AC_CHECK_HEADERS(syscall.h sys/syscall.h mach/mach_time.h)
|
AC_CHECK_HEADERS(syscall.h sys/syscall.h mach/mach_time.h)
|
||||||
@@ -26,11 +29,3 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|||||||
AC_MSG_CHECKING([for __NR_clock_gettime syscall])
|
AC_MSG_CHECKING([for __NR_clock_gettime syscall])
|
||||||
AC_COMPILE_IFELSE(
|
AC_COMPILE_IFELSE(
|
||||||
[AC_LANG_PROGRAM(
|
[AC_LANG_PROGRAM(
|
||||||
@@ -143,7 +147,6 @@ AC_COMPILE_IFELSE(
|
|
||||||
],
|
|
||||||
[
|
|
||||||
AC_MSG_RESULT([no])
|
|
||||||
- AC_SEARCH_LIBS([clock_gettime], [rt], [AC_DEFINE([HAVE_CLOCK_GETTIME], [1], [use clock_gettime])],)
|
|
||||||
])
|
|
||||||
|
|
||||||
AC_CHECK_HEADER(linux/netlink.h,
|
|
||||||
|
|||||||
+37
@@ -0,0 +1,37 @@
|
|||||||
|
From 83425344b2d7339e8f5b0ad230c51278d330d613 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alexander Kanavin <alex@linutronix.de>
|
||||||
|
Date: Sat, 22 Jan 2022 11:41:50 +0100
|
||||||
|
Subject: [PATCH] configure.ac: drop non-standard checks
|
||||||
|
|
||||||
|
Not sure what upstream is trying to do here but it does not work
|
||||||
|
with the latest autoconf.
|
||||||
|
|
||||||
|
Upstream-Status: Inactive-Upstream
|
||||||
|
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
||||||
|
---
|
||||||
|
configure.ac | 5 -----
|
||||||
|
1 file changed, 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index aa7dd1c..858db52 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -418,7 +418,6 @@ for dir in "" /usr/local $SEARCH_DIR; do
|
||||||
|
AC_CHECK_LIB([id3tag -lz], [id3_file_open], [LIBID3TAG_LIBS="-lid3tag -lz"], [unset ac_cv_lib_id3tag_id3_file_open; LDFLAGS="$LDFLAGS_SAVE"; continue])
|
||||||
|
break
|
||||||
|
done
|
||||||
|
-test x"$ac_cv_lib_id3tag__lz___id3_file_open" = x"yes" || AC_MSG_ERROR([Could not find libid3tag])
|
||||||
|
AC_SUBST(LIBID3TAG_LIBS)
|
||||||
|
|
||||||
|
LDFLAGS_SAVE="$LDFLAGS"
|
||||||
|
@@ -444,10 +443,6 @@ for dir in "" /usr/local $SEARCH_DIR; do
|
||||||
|
[unset ac_cv_lib_avformat_av_open_input_file; unset ac_cv_lib_avformat_avformat_open_input; LDFLAGS="$LDFLAGS_SAVE"; continue])])
|
||||||
|
break
|
||||||
|
done
|
||||||
|
-if test x"$ac_cv_lib_avformat__lavcodec__lavutil__lz___av_open_input_file" != x"yes" &&
|
||||||
|
- test x"$ac_cv_lib_avformat__lavcodec__lavutil__lz___avformat_open_input" != x"yes"; then
|
||||||
|
- AC_MSG_ERROR([Could not find libavformat - part of ffmpeg])
|
||||||
|
-fi
|
||||||
|
AC_SUBST(LIBAVFORMAT_LIBS)
|
||||||
|
|
||||||
|
AC_CHECK_LIB(pthread, pthread_create)
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
require ${BPN}.inc
|
require ${BPN}.inc
|
||||||
|
|
||||||
SRCREV = "c760a338e07ebd11d62fef701e3de824a91f8625"
|
SRCREV = "109d63cb11ac207c18a784556834eb054b34b00b"
|
||||||
LIC_FILES_CHKSUM = "file://LICENCE.miniupnpd;md5=b0dabf9d8e0f871554e309d62ead8d2b"
|
LIC_FILES_CHKSUM = "file://LICENCE.miniupnpd;md5=b0dabf9d8e0f871554e309d62ead8d2b"
|
||||||
Reference in New Issue
Block a user