[chromaprint] Update to version 1.6.0 (#48567)

ports/chromaprint/pkgconfig-cxx-linkage.diff

@@ -1,21 +1,20 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index eae99d4..141bfe1 100644
+index 01b7df7..73e3599 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -197,6 +197,16 @@ else()
+@@ -181,6 +181,15 @@ else()
  endif()
  
  if(NOT BUILD_FRAMEWORK)
 +	foreach(lib IN LISTS CMAKE_CXX_IMPLICIT_LINK_LIBRARIES)
-+	    if(lib IN_LIST CMAKE_C_IMPLICIT_LINK_LIBRARIES)
-+	        continue()
-+	    elseif(EXISTS "${lib}")
-+	        string(APPEND PC_LIBS_PRIVATE " ${CMAKE_LINK_LIBRARY_FILE_FLAG}${lib}")
-+	    else()
-+	        string(APPEND PC_LIBS_PRIVATE " ${CMAKE_LINK_LIBRARY_FLAG}${lib}")
-+	    endif()
++		if(lib IN_LIST CMAKE_C_IMPLICIT_LINK_LIBRARIES)
++			continue()
++		elseif(EXISTS "${lib}")
++			string(APPEND PC_LIBS_PRIVATE " ${CMAKE_LINK_LIBRARY_FILE_FLAG}${lib}")
++		else()
++			string(APPEND PC_LIBS_PRIVATE " ${CMAKE_LINK_LIBRARY_FLAG}${lib}")
++		endif()
 +	endforeach()
-+	
- 	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libchromaprint.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libchromaprint.pc)
- 	install(
-         FILES ${CMAKE_CURRENT_BINARY_DIR}/libchromaprint.pc
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libchromaprint.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libchromaprint.pc @ONLY)
+   install(
+     FILES ${CMAKE_CURRENT_BINARY_DIR}/libchromaprint.pc

ports/chromaprint/pkgconfig-dependencies.diff

@@ -1,10 +1,10 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index eae99d4..141bfe1 100644
+index 01b7df7..d7af33f 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -20,6 +20,9 @@ include(CheckFunctionExists)
- include(CheckSymbolExists)
+@@ -23,6 +23,9 @@ include(CheckSymbolExists)
  include(CheckCXXCompilerFlag)
+ include(GNUInstallDirs)
  
 +set(PC_LIBS_PRIVATE "")
 +set(PC_REQUIRES_PRIVATE "")
@@ -12,35 +12,37 @@ index eae99d4..141bfe1 100644
  find_package(Threads)
  
  option(BUILD_SHARED_LIBS "Build shared libraries" ON)
-@@ -111,8 +114,10 @@ set(USE_KISSFFT OFF)
+@@ -106,10 +109,12 @@ set(USE_KISSFFT OFF)
  if(NOT FFT_LIB)
- 	if(APPLE AND ACCELERATE_LIBRARIES)
- 		set(FFT_LIB "vdsp")
-+		string(APPEND PC_LIBS_PRIVATE " -framework Accelerate")
- 	elseif(FFMPEG_LIBAVCODEC_FFT_FOUND)
- 		set(FFT_LIB "avfft")
-+		string(APPEND PC_REQUIRES_PRIVATE " libavcodec")
- 	elseif(FFTW3_LIBRARIES)
- 		set(FFT_LIB "fftw3")
- 	elseif(FFTW3_FFTWF_LIBRARY)
+   if(APPLE AND ACCELERATE_LIBRARIES)
+     set(FFT_LIB "vdsp")
++	string(APPEND PC_LIBS_PRIVATE " -framework Accelerate")
+   elseif(FFMPEG_LIBAVUTIL_TX_FOUND)
+     set(FFT_LIB "avtx")
+   elseif(FFMPEG_LIBAVCODEC_FFT_FOUND)
+     set(FFT_LIB "avfft")
++	string(APPEND PC_REQUIRES_PRIVATE " libavcodec")
+   elseif(FFTW3_LIBRARIES)
+     set(FFT_LIB "fftw3")
+   elseif(FFTW3_FFTWF_LIBRARY)
 @@ -172,6 +177,7 @@ if(AUDIO_PROCESSOR_LIB STREQUAL "swresample")
- 		set(USE_SWRESAMPLE ON)
- 		set(AUDIO_PROCESSOR_LIBRARIES ${FFMPEG_LIBSWRESAMPLE_LIBRARIES})
- 		set(AUDIO_PROCESSOR_INCLUDE_DIRS ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS})
-+		string(APPEND PC_REQUIRES_PRIVATE " libswresample")
- 	else()
- 		message(FATAL_ERROR "Selected ${AUDIO_PROCESSOR_LIB} for audio processing, but the library is not found")
- 	endif()
+     set(USE_SWRESAMPLE ON)
+     set(AUDIO_PROCESSOR_LIBRARIES ${FFMPEG_LIBSWRESAMPLE_LIBRARIES})
+     set(AUDIO_PROCESSOR_INCLUDE_DIRS ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS})
++	string(APPEND PC_REQUIRES_PRIVATE " libswresample")
+   else()
+     message(FATAL_ERROR "Selected ${AUDIO_PROCESSOR_LIB} for audio processing, but the library is not found")
+   endif()
 diff --git a/libchromaprint.pc.cmake b/libchromaprint.pc.cmake
-index 3799329..64123dc 100644
+index dbe8f98..c3059be 100644
 --- a/libchromaprint.pc.cmake
 +++ b/libchromaprint.pc.cmake
-@@ -7,6 +7,8 @@ Name: ${PROJECT_NAME}
+@@ -7,6 +7,8 @@ Name: @PROJECT_NAME@
  Description: Audio fingerprint library
  URL: http://acoustid.org/chromaprint
- Version: ${PROJECT_VERSION}
+ Version: @PROJECT_VERSION@
 +Requires.private: ${PC_REQUIRES_PRIVATE}
- Libs: -L${LIB_INSTALL_DIR} -lchromaprint
+ Libs: -L${libdir} -lchromaprint
 +Libs.private: ${PC_LIBS_PRIVATE}
- Cflags: -I${INCLUDE_INSTALL_DIR}
+ Cflags: -I${includedir}
  

ports/chromaprint/portfile.cmake

@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO acoustid/chromaprint
     REF "v${VERSION}"
-    SHA512 ea16e4d2b879c15b1d9b9ec93878da8b893f1834c70942663e1d2d106c2e0a661094fe2dd3bae7a6c2a1f9d5d8fab5e0b0ba493561090cf57b2228606fad1e66
+    SHA512 c556b3e9b67affaabadadaabc0a26fbbf32f89e271cde0843057166d0b02f054cbe44a6707c6c8cc9eb70d808821295ce4ea526a293f345e0b98af035a24234b
     HEAD_REF master
     PATCHES
         pkgconfig-dependencies.diff
@@ -16,6 +16,7 @@ vcpkg_cmake_configure(
         -DBUILD_TESTS=OFF
 )
 vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME Chromaprint CONFIG_PATH "lib/cmake/Chromaprint")
 vcpkg_fixup_pkgconfig()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")

ports/chromaprint/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "chromaprint",
-  "version": "1.5.1",
-  "port-version": 1,
+  "version": "1.6.0",
   "description": "C library for generating audio fingerprints used by AcoustID",
   "homepage": "https://github.com/acoustid/chromaprint",
   "license": "LGPL-2.1-or-later",
@@ -19,6 +18,10 @@
     {
       "name": "vcpkg-cmake",
       "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
     }
   ]
 }

versions/baseline.json

@@ -1717,8 +1717,8 @@
       "port-version": 8
     },
     "chromaprint": {
-      "baseline": "1.5.1",
-      "port-version": 1
+      "baseline": "1.6.0",
+      "port-version": 0
     },
     "chronoengine": {
       "baseline": "8.0.0",

versions/c-/chromaprint.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5521d63737f42175642f19929814815e2f3e672c",
+      "version": "1.6.0",
+      "port-version": 0
+    },
     {
       "git-tree": "7757884ac6885475efb0036e54085fca9d8f681a",
       "version": "1.5.1",