chromaprint build fix (SynoCommunity#4103)

* chromaprint: Build fix with direct and against linked ffmpeg * Version bump for next ffmpeg 4.2.4 release * chromaprint: Mark powerpc arches as unsupported
AlexPresso · Aug 5, 2020 · 44b86b2 · 44b86b2
1 parent f63d496
commit 44b86b2
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 17 deletions.
diff --git a/cross/chromaprint/Makefile b/cross/chromaprint/Makefile
@@ -9,15 +9,18 @@ HOMEPAGE = http://acoustid.org/chromaprint
 COMMENT  = Chromaprint is the core component of the AcoustID project. It\'s a client-side library that implements a custom algorithm for extracting fingerprints from any audio source.
 LICENSE  = LGPL2.1+
 
-include ../../mk/spksrc.cross-cmake.mk
+UNSUPPORTED_ARCHS = $(ARM5_ARCHES) powerpc ppc824x ppc853x ppc854x
 
 ifneq ($(wildcard $(FFMPEG_DIR)),)
-CMAKE_ARGS += -DCMAKE_INSTALL_RPATH=/var/packages/ffmpeg/target/lib
+CMAKE_RPATH = /var/packages/ffmpeg/target/lib
 else
 DEPENDS = cross/ffmpeg
+CMAKE_RPATH =
 endif
 
-# chromaprint specific for proper build
+CMAKE_BUILD_DIR = $(WORK_DIR)/$(PKG_DIR)
+
+include ../../mk/spksrc.cross-cmake.mk
+
 CMAKE_ARGS += -DBUILD_TOOLS=ON
-CMAKE_ARGS += -DBUILD_SHARED_LIBS=OFF
-CMAKE_ARGS += -DCMAKE_CXX_FLAGS=-Wno-deprecated-declarations
+CMAKE_ARGS += -DCMAKE_INSTALL_RPATH=$(CMAKE_RPATH)
diff --git a/mk/spksrc.cross-cmake-env.mk b/mk/spksrc.cross-cmake-env.mk
@@ -6,11 +6,8 @@ CMAKE_ARGS += -DCMAKE_SYSTEM_NAME=Linux
 CMAKE_ARGS += -DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS += -DCMAKE_C_COMPILER=$(TC_PATH)$(TC_PREFIX)gcc
 CMAKE_ARGS += -DCMAKE_CXX_COMPILER=$(TC_PATH)$(TC_PREFIX)g++
-CMAKE_ARGS += -DCMAKE_EXE_LINKER_FLAGS=-L$(INSTALL_DIR)$(INSTALL_PREFIX)/lib -Wl,--rpath-link,$(INSTALL_DIR)$(INSTALL_PREFIX)/lib -Wl,--rpath,$(INSTALL_PREFIX)/lib
 CMAKE_ARGS += -DCMAKE_FIND_ROOT_PATH=$(INSTALL_DIR)$(INSTALL_PREFIX)
 CMAKE_ARGS += -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER
-CMAKE_ARGS += -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY
-CMAKE_ARGS += -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY
 CMAKE_ARGS += -DCMAKE_INSTALL_RPATH=$(INSTALL_PREFIX)/lib
 CMAKE_ARGS += -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE
 CMAKE_ARGS += -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE

diff --git a/spk/chromaprint/Makefile b/spk/chromaprint/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = chromaprint
 SPK_VERS = 1.5.0
-SPK_REV = 10
+SPK_REV = 11
 SPK_ICON = src/chromaprint.png
 
 DEPENDS = cross/$(SPK_NAME)
@@ -10,7 +10,7 @@ STARTABLE = no
 MAINTAINER = ymartin59
 DESCRIPTION = Chromaprint is the core component of the AcoustID project. It\'s a client-side library that implements a custom algorithm for extracting fingerprints from any audio source.
 DISPLAY_NAME = Chromaprint
-CHANGELOG = "1. Update version 1.5.0<br/>2. Update to ffmpeg 4.2.2"
+CHANGELOG = "1. Update version 1.5.0<br/>2. Update to ffmpeg 4.2.4"
 
 HOMEPAGE   = http://acoustid.org/chromaprint
 LICENSE    = LGPL2.1+
@@ -27,13 +27,15 @@ endif
 
 SPK_COMMANDS = bin/fpcalc
 
-
 include ../../mk/spksrc.spk.mk
 
 .PHONY: chromaprint_pre_depend
 
 # From library detection at cmake/modules/FindFFmpeg.cmake
-FFMPEG_LIBS = libavutil.pc libavformat.pc libavcodec.pc
+FFMPEG_LIBS = libavcodec.pc
+FFMPEG_LIBS += libavformat.pc
+FFMPEG_LIBS += libavutil.pc
+
 chromaprint_pre_depend:
 	mkdir -p $(STAGING_INSTALL_PREFIX)/lib/pkgconfig/
 	$(foreach lib,$(FFMPEG_LIBS),ln -sf $(FFMPEG_DIR)/lib/pkgconfig/$(lib) $(STAGING_INSTALL_PREFIX)/lib/pkgconfig/ ;)
diff --git a/spk/comskip/Makefile b/spk/comskip/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = comskip
 SPK_VERS = 0.82.010
-SPK_REV = 3
+SPK_REV = 4
 SPK_ICON = src/comskip.png
 
 REQUIRED_DSM = 5.2
@@ -12,7 +12,7 @@ STARTABLE = no
 MAINTAINER = schumi2004
 DESCRIPTION = Comskip is a free mpeg commercial detector. Read the wiki on how to use and configure it.
 DISPLAY_NAME = Comskip
-CHANGELOG = "Initial release"
+CHANGELOG = "1. Update to ffmpeg 4.2.4"
 
 HOMEPAGE = http://www.kaashoek.com/comskip/
 LICENSE = GNU/LGPL

diff --git a/spk/ffmpeg/Makefile b/spk/ffmpeg/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = ffmpeg
 SPK_VERS = 4.2.4
-SPK_REV = 32
+SPK_REV = 33
 SPK_ICON = src/ffmpeg.png
 CHANGELOG = "1. Update ffmpeg to 4.2.4<br/>2. Update Intel libva to v2.7 and Intel driver toolstack to 20Q1 v20.1.1<br/>3. Update all trivial dependencies (x264, x265, libaom, libogg, freetype, fribidi, libbluray)br/>4. Update libaom to version 2.0.0-rc1<br/>5. Add experimental support for SVT-AV1 and SVT-HEVC<br/>6. Simplify access to vainfo binary (intel platforms only)<br/>6. Enable libtheora support"
 

diff --git a/spk/tvheadend/Makefile b/spk/tvheadend/Makefile
@@ -4,7 +4,7 @@ SPK_GIT_HASH = ce09077
 SPK_GIT_DATE = 20200713
 SPK_VERS = $(SPK_SHORT_VERS).$(SPK_GIT_DATE)~$(SPK_GIT_HASH)
 TVH_VERS = $(SPK_SHORT_VERS)~$(SPK_GIT_HASH)
-SPK_REV = 23
+SPK_REV = 24
 SPK_ICON = src/tvheadend.png
 DSM_UI_DIR = app
 
@@ -20,7 +20,7 @@ DESCRIPTION = Tvheadend is a TV streaming server and recorder for Linux, FreeBSD
 RELOAD_UI = yes
 DISPLAY_NAME = Tvheadend
 STARTABLE = yes
-CHANGELOG = "1. Update to latest git version ce09077 as of July 13th 2020<br/>2. Enable Intel VAAPI on Intel platforms<br/>3. Disable bintray cache<br/>4. Enable tracing<br/>5. Enable pngquant<br/>6. Enable libtheora<br/>7. Enable fdk-acc<br/>8. Enable re-using FFMPEG media and vaapi shared librairies"
+CHANGELOG = "1. Update to latest git version ce09077 as of July 13th 2020<br/>2. Enable Intel VAAPI on Intel platforms<br/>3. Disable bintray cache<br/>4. Enable tracing<br/>5. Enable pngquant<br/>6. Enable libtheora<br/>7. Enable fdk-acc<br/>8. Enable re-using FFMPEG media and vaapi shared librairies<br/>9. Update to ffmpeg 4.2.4"
 HOMEPAGE = https://tvheadend.org/
 LICENSE = GPL v3