feat: update chromaprint to 1.5.1

.gitignore

@@ -1 +1,41 @@
-.pc/
+CMakeFiles
+CMakeCache.txt
+Makefile
+cmake_install.cmake
+cmake_uninstall.cmake
+config.h
+tests/all_tests
+tools/fpgen
+tools/fpcollect
+*.exe
+*.dll
+*.so
+*.a
+tools/fpeval
+tools/learn_filters
+tools/decode
+tools/chromagram
+tools/resample
+libchromaprint.pc
+install_manifest.txt
+tools/spectrogram
+src/libchromaprint.so.*
+*.vcxproj
+*.vcxproj.*
+*.dir
+*.sln
+*.suo
+Debug
+src/Debug
+*.dll
+*.lib
+*.pdb
+*.dll.manifest
+*.exp
+*.dylib
+*.vcproj
+*.user
+*.ncb
+src/Release
+fpcalc
+fpcmp

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.3)
 
 set(chromaprint_VERSION_MAJOR 1)
 set(chromaprint_VERSION_MINOR 5)
-set(chromaprint_VERSION_PATCH 0)
+set(chromaprint_VERSION_PATCH 1)
 set(chromaprint_VERSION "${chromaprint_VERSION_MAJOR}.${chromaprint_VERSION_MINOR}.${chromaprint_VERSION_PATCH}")
 
 project(chromaprint LANGUAGES C CXX VERSION "${chromaprint_VERSION}")
@@ -17,6 +17,7 @@ set_property(CACHE FFT_LIB PROPERTY STRINGS avfft fftw3 fftw3f kissfft vdsp)
 
 include(CMakePushCheckState)
 include(CheckFunctionExists)
+include(CheckSymbolExists)
 include(CheckCXXCompilerFlag)
 
 find_package(Threads)
@@ -37,8 +38,8 @@ endif()
 
 cmake_push_check_state(RESET)
 set(CMAKE_REQUIRED_LIBRARIES -lm)
-check_function_exists(lrintf HAVE_LRINTF)
-check_function_exists(round HAVE_ROUND)
+check_symbol_exists(lrintf math.h HAVE_LRINTF)
+check_symbol_exists(round math.h HAVE_ROUND)
 cmake_pop_check_state()
 
 add_definitions(
@@ -61,7 +62,7 @@ if(APPLE)
 endif()
 
 option(BUILD_TOOLS "Build command line tools" OFF)
-option(BUILD_TESTS "Build test suite" OFF)
+option(BUILD_TESTS "Build test suite" ON)
 
 if(CMAKE_COMPILER_IS_GNUCXX)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
@@ -191,7 +192,10 @@ endif()
 
 if(NOT BUILD_FRAMEWORK)
 	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libchromaprint.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libchromaprint.pc)
-	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libchromaprint.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+	install(
+        FILES ${CMAKE_CURRENT_BINARY_DIR}/libchromaprint.pc
+        DESTINATION ${LIB_INSTALL_DIR}/pkgconfig
+        COMPONENT chromaprint)
 endif()
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)

NEWS.txt

@@ -1,3 +1,11 @@
+Version 1.5.1 -- December 23, 2021
+==================================
+
+ - No functional source code changes.
+ - Fixed some compiler warnings.
+ - Rebuilt the fpcalc binaries with FFmpeg 4.4.1.
+ - Added support for fat binaries on macOS, with support for both Intel and Apple silicon.
+
 Version 1.5.0 -- April 15, 2020
 ===============================
 

README.md

@@ -82,16 +82,17 @@ Bindings, wrappers and reimplementations in other languages:
  * [Python](https://github.com/beetbox/pyacoustid)
  * [Rust](https://github.com/jameshurst/rust-chromaprint)
  * [Ruby](https://github.com/TMXCredit/chromaprint)
- * [Perl](https://github.com/jonathanstowe/Audio-Fingerprint-Chromaprint)
+ * [Perl](https://metacpan.org/pod/Audio::Chromaprint)
+ * [Raku](https://github.com/jonathanstowe/Audio-Fingerprint-Chromaprint)
  * [JavaScript](https://github.com/parshap/node-fpcalc)
  * [JavaScript](https://github.com/bjjb/chromaprint.js) (reimplementation)
  * [Go](https://github.com/go-fingerprint/gochroma)
  * [C#](https://github.com/wo80/AcoustID.NET) (reimplementation)
  * [C#](https://github.com/protyposis/Aurio/tree/master/Aurio/Aurio/Matching/Chromaprint) (reimplementation)
  * [Pascal](https://github.com/CMCHTPC/ChromaPrint) (reimplementation)
  * [Scala/JVM](https://github.com/mgdigital/Chromaprint.scala) (reimplementation)
- * [C++/CLI](https://github.com/CyberSinh/Luminescence.Audio)
  * [Vala](https://github.com/GNOME/vala-extra-vapis/blob/master/libchromaprint.vapi)
+ * [Swift](https://github.com/wallisch/ChromaSwift)
 
 Integrations:
 

cmake/modules/FindGTest.cmake

@@ -1,35 +1,20 @@
-# Locate the Google C++ Testing Framework source directory.
+# 
+# Try to find GoogleTest library  
 #
 # Defines the following variables:
-#
-#   GTEST_FOUND - Found the Google Testing framework sources
+# 
+#   GTEST_FOUND - Found the GoogleTest library
 #   GTEST_INCLUDE_DIRS - Include directories
-#   GTEST_SOURCE_DIR - Source code directory
-#   GTEST_LIBRARIES - libgtest
-#   GTEST_MAIN_LIBRARIES - libgtest-main
-#   GTEST_BOTH_LIBRARIES - libgtest & libgtest-main
+#   GTEST_SOURCES - Source code to include in your project
 #
 # Accepts the following variables as input:
 #
 #   GTEST_ROOT - (as CMake or environment variable)
-#                The root directory of the gtest install prefix
-#
-# Example usage:
-#
-#    find_package(GTest REQUIRED)
-#    include_directories(${GTEST_INCLUDE_DIRS})
-#    add_subdirectory(${GTEST_SOURCE_DIR}
-#        ${CMAKE_CURRENT_BINARY_DIR}/gtest_build)
-#
-#    add_executable(foo foo.cc)
-#    target_link_libraries(foo ${GTEST_BOTH_LIBRARIES})
-#
-#    enable_testing(true)
-#    add_test(AllTestsInFoo foo)
+#                  The root directory of GoogleTest sources
 #
 # =========================================================
 #
-# Copyright (C) 2012 Lukas Lalinsky <[email protected]>
+# Copyright (C) 2014 Lukas Lalinsky <[email protected]>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
@@ -58,25 +43,26 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 find_path(GTEST_SOURCE_DIR
-	NAMES src/gtest-all.cc CMakeLists.txt
-	HINTS $ENV{GTEST_ROOT} ${GTEST_ROOT} /usr/src/gtest
+    NAMES
+        src/gtest-all.cc
+    PATHS
+        $ENV{GTEST_ROOT}
+        ${GTEST_ROOT}
+        ${CMAKE_SOURCE_DIR}/src/3rdparty/googletest/googletest
+    NO_DEFAULT_PATH
+    DOC "GoogleTest tools headers"
 )
 mark_as_advanced(GTEST_SOURCE_DIR)
 
-find_path(GTEST_INCLUDE_DIR
-	NAMES gtest/gtest.h
-	HINTS $ENV{GTEST_ROOT}/include ${GTEST_ROOT}/include
-)
-mark_as_advanced(GTEST_INCLUDE_DIR)
-
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(GTest DEFAULT_MSG GTEST_SOURCE_DIR GTEST_INCLUDE_DIR)
+find_package_handle_standard_args(GTest DEFAULT_MSG GTEST_SOURCE_DIR)
 
 if(GTEST_FOUND)
-	set(GTEST_INCLUDE_DIRS ${GTEST_INCLUDE_DIR})
-	set(GTEST_LIBRARIES gtest)
-	set(GTEST_MAIN_LIBRARIES gtest_main)
-    set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES})
+    SET(GTEST_INCLUDE_DIRS
+        ${GTEST_SOURCE_DIR}/include
+    )
+    SET(GTEST_SOURCES
+        ${GTEST_SOURCE_DIR}/src/gtest-all.cc
+    )
 endif()

cmake/modules/FindKissFFT.cmake

@@ -50,7 +50,7 @@ find_path(KISSFFT_SOURCE_DIR
     PATHS
         $ENV{KISSFFT_ROOT}
         ${KISSFFT_ROOT}
-        ${CMAKE_SOURCE_DIR}/vendor/kissfft
+        ${CMAKE_SOURCE_DIR}/src/3rdparty/kissfft
     NO_DEFAULT_PATH
     DOC "Kiss FFT tools headers"
 )

debian/changelog

@@ -1,3 +1,40 @@
+chromaprint (1.5.1-4) unstable; urgency=medium
+
+  [ Diederik de Haas ]
+  * d/symbols: Set Build-Depends-Package field for libchromaprint1
+  * d/patches: Add DEP-3 Bug field to forwarded issue
+  * d/patches: Replace ffmpeg 5 patches with upstream's
+
+ -- Sebastian Ramacher <[email protected]>  Thu, 27 Jul 2023 09:26:55 +0200
+
+chromaprint (1.5.1-3) unstable; urgency=medium
+
+  * debian/control: Bump Standards-Version
+  * debian/patches: Fix build with googletest 1.13 (Closes: #1040998)
+
+ -- Sebastian Ramacher <[email protected]>  Mon, 17 Jul 2023 23:24:39 +0200
+
+chromaprint (1.5.1-2) unstable; urgency=medium
+
+  [ Debian Janitor ]
+  * Remove constraints unnecessary since buster
+
+  [ Sebastian Ramacher ]
+  * debian/patches: Apply fix for ffmpeg 5.0 (Closes: #1004785)
+
+ -- Sebastian Ramacher <[email protected]>  Wed, 16 Feb 2022 23:02:01 +0100
+
+chromaprint (1.5.1-1) unstable; urgency=medium
+
+  * New upstream version 1.5.1
+  * debian/copyright: Update for 1.5.1
+  * debian/control: Bump Standards-Version
+  * debian/rules: Prefer gtest from libgtest-dev
+  * debian/libchromaprint1.symbols: Relax dependencies for template
+    instantiations
+
+ -- Sebastian Ramacher <[email protected]>  Wed, 05 Jan 2022 18:45:01 +0100
+
 chromaprint (1.5.0-2) unstable; urgency=medium
 
   [ Helmut Grohne ]

debian/control

@@ -11,8 +11,8 @@ Build-Depends:
  libavformat-dev,
  libgtest-dev <!nocheck>,
  libswresample-dev,
- python3-docutils (>= 0.6)
-Standards-Version: 4.5.1
+ python3-docutils
+Standards-Version: 4.6.2
 Section: libs
 Homepage: https://acoustid.org/chromaprint
 Vcs-Git: https://salsa.debian.org/multimedia-team/chromaprint.git

debian/copyright

@@ -23,8 +23,28 @@ License: Expat
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
 
-Files: vendor/*
+Files: src/3rdparty/googletest/*
+Copyright: 2008 Google Inc
+License: BSD-3-clause
+
+Files: src/3rdparty/kissfft/*
 Copyright: 2003-2010 Mark Borgerding
+License: BSD-3-clause
+
+Files: src/avresample/avcodec.h
+Copyright: 2001 Fabrice Bellard
+License: LGPL-2.1+
+
+Files: src/avresample/resample2.c
+Copyright: 2004 Michael Nidermayer <[email protected]>
+License: LGPL-2.1+
+
+Files: debian/*
+Copyright: 2010-2011 Lukáš Lalinský <[email protected]>
+           2011 Clint Adams <[email protected]>
+           2011-2014 Simon Chopin <[email protected]>
+License: LGPL-2.1+
+
 License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
@@ -49,20 +69,6 @@ License: BSD-3-clause
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-Files: src/avresample/avcodec.h
-Copyright: 2001 Fabrice Bellard
-License: LGPL-2.1+
-
-Files: src/avresample/resample2.c
-Copyright: 2004 Michael Nidermayer <[email protected]>
-License: LGPL-2.1+
-
-Files: debian/*
-Copyright: 2010-2011 Lukáš Lalinský <[email protected]>
-           2011 Clint Adams <[email protected]>
-           2011-2014 Simon Chopin <[email protected]>
-License: LGPL-2.1+
-
 License: LGPL-2.1+
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

debian/libchromaprint1.symbols

@@ -1,6 +1,6 @@
 libchromaprint.so.1 libchromaprint1 #MINVER#
-| libchromaprint1 (>= 1.5.0), libchromaprint1 (<< 1.5.1)
- (regex|optional)"^_ZN?St.*@Base$" 0.6 1
+* Build-Depends-Package: libchromaprint-dev
+ (regex|optional)"^_ZN?St.*@Base$" 0.6
  chromaprint_clear_fingerprint@Base 1.4.1
  chromaprint_dealloc@Base 1.3.2
  chromaprint_decode_fingerprint@Base 1.3.2