package/gerbera: bump to version 1.4.0
PATCH v2 1/1 package/gerbera: bump to version 1.4.0
Also:
* Drop patch 0001 (fix static linking of libmagic) applied upstream
* Add optional dependency on libmatroska
* Add upstream patch to fix building with libmatroska
* Adjust spacing in hash file to 2 spaces
Signed-off-by J?rg Krause <[email protected]>
---
v2:
* Add missing "Backported from" to upstream patch
--- ...indLibMagic.cmake-fix-static-linking.patch | 60 ------------------- ...build-without-js-taglib-or-atrailers.patch | 51 ++++++++++++++++ package/gerbera/config.xml | 4 ++ package/gerbera/gerbera.hash | 4 +- package/gerbera/gerbera.mk | 9 ++- 5 files changed, 65 insertions(+), 63 deletions(-) delete mode 100644 package/gerbera/0001-cmake-FindLibMagic.cmake-fix-static-linking.patch create mode 100644 package/gerbera/0001-fix-matroska-build-without-js-taglib-or-atrailers.patch
package/gerbera/0001-cmake-FindLibMagic.cmake-fix-static-linking.patch deleted +0 -60
@@ -1,60 +0,0 @@ -From 64f49c6131f4112e5efd8b69094235f13882ccf5 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <[email protected]> -Date: Fri, 31 Jan 2020 17:14:11 +0100 -Subject: [PATCH] cmake/FindLibMagic.cmake: fix static linking - -libmagic can optionally depends on xz (for lzma) or bzip2 since version -5.38 and -https://github.com/file/file/commit/b259a07ea95827f565faa20f0316e5b2704064f7 -so use pkg-config to retrieve those static dependencies and avoid the -following build failure: - -[100%] Linking CXX executable gerbera -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/br-user/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libmagic.a(compress.o): in function `uncompressbuf': -compress.c:(.text+0x69c): undefined reference to `BZ2_bzDecompressInit' -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x710): undefined reference to `BZ2_bzDecompress' -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x730): undefined reference to `BZ2_bzDecompressEnd' -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x7bc): undefined reference to `lzma_auto_decoder' -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x828): undefined reference to `lzma_code' -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x848): undefined reference to `lzma_end' - -Fixes: - - http://autobuild.buildroot.org/results/37b1ef54dc41100689f311fbc31fc9300dc6ae63 - -Signed-off-by: Fabrice Fontaine <[email protected]> ---- - cmake/FindLibMagic.cmake | 15 +++++++++++++-- - 1 file changed, 13 insertions(+), 2 deletions(-) - -diff --git a/cmake/FindLibMagic.cmake b/cmake/FindLibMagic.cmake -index f68ab923..04995af4 100644 ---- a/cmake/FindLibMagic.cmake -+++ b/cmake/FindLibMagic.cmake -@@ -1,11 +1,22 @@ - INCLUDE (FindPackageHandleStandardArgs) - --FIND_PATH(MAGIC_INCLUDE_DIR magic.h) --FIND_LIBRARY(MAGIC_LIBRARIES NAMES magic) -+find_package(PkgConfig QUIET) -+ -+pkg_check_modules(PC_MAGIC QUIET libmagic) -+ -+FIND_PATH(MAGIC_INCLUDE_DIR magic.h -+ HINTS ${PC_MAGIC_INCLUDEDIR} ${PC_MAGIC_INCLUDE_DIRS}) -+FIND_LIBRARY(MAGIC_LIBRARIES NAMES magic -+ HINTS ${PC_MAGIC_LIBDIR} ${PC_MAGIC_LIBRARY_DIRS}) - - # handle the QUIETLY and REQUIRED arguments and set MAGIC_FOUND to TRUE - find_package_handle_standard_args(MAGIC DEFAULT_MSG MAGIC_LIBRARIES) - -+if (MAGIC_FOUND) -+ set (MAGIC_LIBRARIES ${MAGIC_LIBRARY} ${PC_MAGIC_LIBRARIES}) -+ set (MAGIC_INCLUDE_DIRS ${MAGIC_INCLUDE_DIR} ) -+endif () -+ - MARK_AS_ADVANCED( - MAGIC_LIBRARIES - MAGIC_INCLUDE_DIRS ) --- -2.24.1 -
package/gerbera/0001-fix-matroska-build-without-js-taglib-or-atrailers.patch new file +51 -0
51 lines not on this page · raw message
package/gerbera/config.xml +4 -0
@@ -79,6 +79,9 @@ <map from="flv" to="video/x-flv"/> <map from="mkv" to="video/x-matroska"/> <map from="mka" to="audio/x-matroska"/> + <map from="dsf" to="audio/x-dsd"/> + <map from="dff" to="audio/x-dsd"/> + <map from="wv" to="audio/x-wavpack"/> <!-- Uncomment the line below for PS3 divx support --> <!-- <map from="avi" to="video/divx"/> --> <!-- Uncomment the line below for D-Link DSM / ZyXEL DMA-1000 -->
@@ -107,6 +110,7 @@ <treat mimetype="audio/mp4" as="mp4"/> <treat mimetype="video/x-matroska" as="mkv"/> <treat mimetype="audio/x-matroska" as="mka"/> + <treat mimetype="audio/x-dsd" as="dsd"/> </mimetype-contenttype> </mappings> </import>
package/gerbera/gerbera.hash +2 -2
@@ -1,3 +1,3 @@ # Locally computed: -sha256 c7fbb6104dd03ed22d114c7b1fbe95eb7f90893148630e16b0a4c23f1f631341 gerbera-1.3.4.tar.gz -sha256 cae4138373be41fd2be75faf41ce7efbcf49fb17d0e05ad1c51cc01ac335b9b6 LICENSE.md +sha256 904a9031c85ac805e4c139f363510226952683d7257acd1dee25ba1e97fd7651 gerbera-1.4.0.tar.gz +sha256 cae4138373be41fd2be75faf41ce7efbcf49fb17d0e05ad1c51cc01ac335b9b6 LICENSE.md
package/gerbera/gerbera.mk +8 -1
@@ -4,7 +4,7 @@ # ################################################################################ -GERBERA_VERSION = 1.3.4 +GERBERA_VERSION = 1.4.0 GERBERA_SITE = $(call github,gerbera,gerbera,v$(GERBERA_VERSION)) GERBERA_LICENSE = GPL-2.0 GERBERA_LICENSE_FILES = LICENSE.md
@@ -63,6 +63,13 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y) GERBERA_DEPENDENCIES += libiconv endif +ifeq ($(BR2_PACKAGE_LIBMATROSKA),y) +GERBERA_DEPENDENCIES += libmatroska +GERBERA_CONF_OPTS += -DWITH_MATROSKA=ON +else +GERBERA_CONF_OPTS += -DWITH_MATROSKA=OFF +endif + ifeq ($(BR2_PACKAGE_MYSQL),y) GERBERA_DEPENDENCIES += mysql GERBERA_CONF_OPTS += -DWITH_MYSQL=ON
Signature · 1 line
2.26.1
Thomas Petazzoni
AppliedPATCH v2 1/1 package/gerbera: bump to version 1.4.0
Quoted 10 lines · On Mon, 20 Apr 2020 08:48:17 +0200 J?rg Krause <[email protected]>…
Also:
* Drop patch 0001 (fix static linking of libmagic) applied upstream
* Add optional dependency on libmatroska
* Add upstream patch to fix building with libmatroska
* Adjust spacing in hash file to 2 spacesSigned-off-by J?rg Krause <[email protected]>---
v2:
* Add missing "Backported from" to upstream patch
Quoted 9 lines
--- ...indLibMagic.cmake-fix-static-linking.patch | 60 ------------------- ...build-without-js-taglib-or-atrailers.patch | 51 ++++++++++++++++ package/gerbera/config.xml | 4 ++ package/gerbera/gerbera.hash | 4 +- package/gerbera/gerbera.mk | 9 ++- 5 files changed, 65 insertions(+), 63 deletions(-) delete mode 100644 package/gerbera/0001-cmake-FindLibMagic.cmake-fix-static-linking.patch create mode 100644 package/gerbera/0001-fix-matroska-build-without-js-taglib-or-atrailers.patch
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com