chromaprint: Migrate to ffmpeg6

cross/chromaprint/Makefile

@@ -1,34 +1,51 @@
 PKG_NAME = chromaprint
-PKG_VERS = 1.5.2
+PKG_VERS = 1.5.1
 PKG_EXT = tar.gz
-PKG_GIT_HASH = aa67c95b9e486884a6d3ee8b0c91207d8c2b0551
-PKG_DIST_NAME = $(PKG_GIT_HASH).$(PKG_EXT)
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/acoustid/chromaprint/archive
-PKG_DIST_FILE = $(PKG_NAME)-git$(PKG_GIT_HASH).$(PKG_EXT)
-PKG_DIR = $(PKG_NAME)-$(PKG_GIT_HASH)
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+#PKG_GIT_HASH = aa67c95b9e486884a6d3ee8b0c91207d8c2b0551
+#PKG_DIST_NAME = $(PKG_GIT_HASH).$(PKG_EXT)
+#PKG_DIST_FILE = $(PKG_NAME)-git$(PKG_GIT_HASH).$(PKG_EXT)
+#PKG_DIR = $(PKG_NAME)-$(PKG_GIT_HASH)
 
 HOMEPAGE = https://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+
 
-OPTIONAL_DEPENDS = cross/ffmpeg$(FFMPEG_VERSION)
-
 # compiler too old
 UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS)
 
-ifneq ($(wildcard $(FFMPEG_DIR)),)
-CMAKE_RPATH = /var/packages/ffmpeg$(subst 4,,$(FFMPEG_VERSION))/target/lib
+CMAKE_ARGS += -DBUILD_TOOLS=ON
+CMAKE_ARGS += -DBUILD_TESTS=OFF
+CMAKE_ARGS += -DCMAKE_CXX_FLAGS="-Wno-deprecated-declarations"
+
+ifneq ($(wildcard $(FFMPEG_PACKAGE_ROOT)),)
+CMAKE_ARGS += -DCMAKE_INSTALL_RPATH=$(FFMPEG_PREFIX)/lib
+
+# Location of FFMPEG Headers
+CMAKE_ARGS += -DFFMPEG_LIBAVCODEC_FFT_INCLUDE_DIRS:PATH=$(FFMPEG_STAGING_PREFIX)/include
+CMAKE_ARGS += -DFFMPEG_LIBAVCODEC_FFT_LIBRARIES:FILEPATH=$(FFMPEG_STAGING_PREFIX)/lib/libavcodec.so
+CMAKE_ARGS += -DFFMPEG_LIBAVCODEC_INCLUDE_DIRS:PATH=$(FFMPEG_STAGING_PREFIX)/include
+CMAKE_ARGS += -DFFMPEG_LIBAVCODEC_LIBRARIES:FILEPATH=$(FFMPEG_STAGING_PREFIX)/lib/libavcodec.so
+CMAKE_ARGS += -DFFMPEG_LIBAVDEVICE_INCLUDE_DIRS:PATH=$(FFMPEG_STAGING_PREFIX)/include
+CMAKE_ARGS += -DFFMPEG_LIBAVDEVICE_LIBRARIES:FILEPATH=$(FFMPEG_STAGING_PREFIX)/lib/libavdevice.so
+CMAKE_ARGS += -DFFMPEG_LIBAVFORMAT_INCLUDE_DIRS:PATH=$(FFMPEG_STAGING_PREFIX)/include
+CMAKE_ARGS += -DFFMPEG_LIBAVFORMAT_LIBRARIES:FILEPATH=$(FFMPEG_STAGING_PREFIX)/lib/libavformat.so
+#CMAKE_ARGS += -DFFMPEG_LIBAVRESAMPLE_INCLUDE_DIRS:PATH=$(FFMPEG_STAGING_PREFIX)/include
+#CMAKE_ARGS += -DFFMPEG_LIBAVRESAMPLE_LIBRARIES:FILEPATH=$(FFMPEG_STAGING_PREFIX)/lib/libswresample.so
+CMAKE_ARGS += -DFFMPEG_LIBAVUTIL_INCLUDE_DIRS:PATH=$(FFMPEG_STAGING_PREFIX)/include
+CMAKE_ARGS += -DFFMPEG_LIBAVUTIL_LIBRARIES:FILEPATH=$(FFMPEG_STAGING_PREFIX)/lib/libavutil.so
+CMAKE_ARGS += -DFFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS:PATH=$(FFMPEG_STAGING_PREFIX)/include
+CMAKE_ARGS += -DFFMPEG_LIBSWRESAMPLE_LIBRARIES:FILEPATH=$(FFMPEG_STAGING_PREFIX)/lib/libswresample.so
+CMAKE_ARGS += -DFFMPEG_LIBSWSCALE_INCLUDE_DIRS:PATH=$(FFMPEG_STAGING_PREFIX)/include
+CMAKE_ARGS += -DFFMPEG_LIBSWSCALE_LIBRARIES:FILEPATH=$(FFMPEG_STAGING_PREFIX)/lib/libswscale.so
+
 else
-DEPENDS = cross/ffmpeg$(FFMPEG_VERSION)
+DEPENDS = cross/$(FFMPEG_PACKAGE)
 CMAKE_RPATH =
 endif
 
-CMAKE_BUILD_DIR = $(WORK_DIR)/$(PKG_DIR)
-CMAKE_USE_TOOLCHAIN_FILE = OFF
-
 include ../../mk/spksrc.cross-cmake.mk
-
-CMAKE_ARGS += -DBUILD_TOOLS=ON
-CMAKE_ARGS += -DBUILD_TESTS=OFF
-CMAKE_ARGS += -DCMAKE_INSTALL_RPATH=$(CMAKE_RPATH)
-CMAKE_ARGS += -DCMAKE_CXX_FLAGS="-Wno-deprecated-declarations"

cross/chromaprint/digests

@@ -1,3 +1,3 @@
-chromaprint-gitaa67c95b9e486884a6d3ee8b0c91207d8c2b0551.tar.gz SHA1 3e85f4bd134263b1699b7e7412b1e089865185d7
-chromaprint-gitaa67c95b9e486884a6d3ee8b0c91207d8c2b0551.tar.gz SHA256 88e13f065e31d59d102339d956d0e2f99b125386e4d58ae7de6f09b90104b90f
-chromaprint-gitaa67c95b9e486884a6d3ee8b0c91207d8c2b0551.tar.gz MD5 80d7d474a585c186a6a3285465bfef1e
+chromaprint-1.5.1.tar.gz SHA1 f54d8b58ff514ab65851d524237b38d8965cba57
+chromaprint-1.5.1.tar.gz SHA256 a1aad8fa3b8b18b78d3755b3767faff9abb67242e01b478ec9a64e190f335e1c
+chromaprint-1.5.1.tar.gz MD5 54e71f86bcf1d34989db639044ba9628