chromaprint: update to 1.4.3

Allow building against ffmpeg package libraries

cross/chromaprint/Makefile

@@ -1,16 +1,25 @@
 PKG_NAME = chromaprint
-PKG_VERS = 1.3.2
+PKG_VERS = 1.4.3
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = https://bitbucket.org/acoustid/chromaprint/downloads
-PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
-
-DEPENDS = cross/ffmpeg
+PKG_DIST_SITE = https://github.com/acoustid/chromaprint/releases/download/v$(PKG_VERS)
+PKG_DIR = $(PKG_NAME)-v$(PKG_VERS)
 
 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+
 
+ifneq ($(wildcard $(FFMPEG_DIR)),)
+$(info Reuse ffmpeg package libraries)
+CMAKE_FFMPEG_ROOT = "-DFFMPEG_ROOT=$(FFMPEG_DIR)"
+CMAKE_RPATH = ${INSTALL_PREFIX}/lib:/var/packages/ffmpeg/target/lib
+else
+$(warning WARNING Build spk/ffmpeg first to depend on its libraries $(FFMPEG_DIR))
+DEPENDS = cross/ffmpeg
+CMAKE_FFMPEG_ROOT =
+CMAKE_RPATH = ${INSTALL_PREFIX}/lib
+endif
+
 CONFIGURE_TARGET = chromaprint_custom_configure
 COMPILE_TARGET = chromaprint_custom_compile
 INSTALL_TARGET = chromaprint_custom_install
@@ -20,22 +29,22 @@ include ../../mk/spksrc.cross-cc.mk
 .PHONY: chromaprint_custom_configure chromaprint_custom_compile chromaprint_custom_install
 
 chromaprint_custom_configure:
-	$(RUN) cmake \
-		-DBUILD_EXAMPLES=ON \
+	$(RUN) cmake $(CMAKE_FFMPEG_ROOT) \
+		-DBUILD_TOOLS=ON \
 		-DBUILD_SHARED_LIBS=OFF \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=$(INSTALL_PREFIX) \
 		-DCMAKE_CROSSCOMPILING=TRUE \
 		-DCMAKE_SYSTEM_NAME=Linux \
 		-DCMAKE_C_COMPILER=$(TC_PATH)$(TC_PREFIX)gcc \
 		-DCMAKE_CXX_COMPILER=$(TC_PATH)$(TC_PREFIX)g++ \
-		-DCMAKE_INSTALL_RPATH=${CMAKE_INSTALL_PREFIX}/lib \
+		-DCMAKE_INSTALL_RPATH=$(CMAKE_RPATH) \
 		-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE \
-		-DCMAKE_FIND_ROOT_PATH=$(INSTALL_DIR)$(INSTALL_PREFIX) \
 		-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \
 		-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \
 		-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY
 
+
 chromaprint_custom_compile:
 	$(RUN) $(MAKE) VERBOSE=1
 

cross/chromaprint/digests

@@ -1,3 +1,3 @@
-chromaprint-1.3.2.tar.gz SHA1 29e86490f14c5d50f8720974b814340f9846f71f
-chromaprint-1.3.2.tar.gz SHA256 c3af900d8e7a42afd74315b51b79ebd2e43bc66630b4ba585a54bf3160439652
-chromaprint-1.3.2.tar.gz MD5 cba6ed3209516518d2ecfda887dabdaf
+chromaprint-1.4.3.tar.gz SHA1 c3f880f6ed752c0d0802c55d28a1a6df78b4d7d4
+chromaprint-1.4.3.tar.gz SHA256 ea18608b76fb88e0203b7d3e1833fb125ce9bb61efe22c6e169a50c52c457f82
+chromaprint-1.4.3.tar.gz MD5 20014ca19974de9657d91d331d11f936

spk/chromaprint/Makefile

@@ -1,23 +1,31 @@
 SPK_NAME = chromaprint
-SPK_VERS = 1.3.2
-SPK_REV = 4
+SPK_VERS = 1.4.3
+SPK_REV = 6
 SPK_ICON = src/chromaprint.png
 
-DEPENDS  = cross/lame cross/$(SPK_NAME)
+DEPENDS = cross/$(SPK_NAME)
 
 STARTABLE = no
 
 MAINTAINER = cytec
 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 = "Update to 1.3.2"
+CHANGELOG = "Update to 1.4.3"
 
 HOMEPAGE   = http://acoustid.org/chromaprint
 LICENSE    = LGPL2.1+
 
-INSTALLER_SCRIPT = src/installer.sh
-SSS_SCRIPT       = src/dsm-control.sh
+include ../../mk/spksrc.common.mk
 
-INSTALL_PREFIX = /usr/local/$(SPK_NAME)
+# Reuse ffmpeg libraries
+# Requires to invoke: make [package|publish] ARCH= TCVERSION=
+export FFMPEG_DIR = $(shell pwd)/../ffmpeg/work-$(ARCH)-$(TCVERSION)/install/var/packages/ffmpeg/target
+
+ifneq ($(wildcard $(FFMPEG_DIR)),)
+$(info Depend on ffmpeg package libraries)
+SPK_DEPENDS = "ffmpeg>3.4"
+else
+$(warning Build spk/ffmpeg first to depend on its libraries $(FFMPEG_DIR))
+endif
 
 include ../../mk/spksrc.spk.mk