Sync changes to SLFO-1.2 branch

0005-Fix-compatibility-with-ffmpeg-7.0.patch

@@ -0,0 +1,28 @@
+From: Sebastian Ramacher <sebastian@ramacher.at>
+Date: Fri, 2 Aug 2024 23:38:21 +0200
+Subject: Fix compatibility with ffmpeg 7.0
+
+---
+ src/audio/ffmpeg_audio_reader.h | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/src/audio/ffmpeg_audio_reader.h b/src/audio/ffmpeg_audio_reader.h
+index 35b2934..d57d9a1 100644
+--- a/src/audio/ffmpeg_audio_reader.h
++++ b/src/audio/ffmpeg_audio_reader.h
+@@ -118,8 +118,13 @@ inline bool FFmpegAudioReader::SetInputSampleRate(int sample_rate) {
+ 
+ inline bool FFmpegAudioReader::SetInputChannels(int channels) {
+ 	char buf[64];
+-	sprintf(buf, "%d", channels);
+-	return av_dict_set(&m_input_opts, "channels", buf, 0) >= 0;
++	if (channels == 1)
++		sprintf(buf, "%s", "mono");
++	else if (channels == 2)
++		sprintf(buf, "%s", "stereo");
++	else
++		sprintf(buf, "%d channels", channels);
++	return av_dict_set(&m_input_opts, "ch_layout", buf, 0) >= 0;
+ }
+ 
+ inline bool FFmpegAudioReader::Open(const std::string &file_name) {

chromaprint.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Sat Jan 25 08:50:23 UTC 2025 - Dave Plater <davejplater@gmail.com>
+
+- Add 0005-Fix-compatibility-with-ffmpeg-7.0.patch and force build
+  with ffmpeg-7 libraries
+
+-------------------------------------------------------------------
+Fri Jan 24 13:45:25 UTC 2025 - Dave Plater <davejplater@gmail.com>
+
+- Update to git snapshot 1.5.1+git.20221217 to allow build against
+  ffmpeg-5 libraries. No other major changes.
+
+-------------------------------------------------------------------
+Wed Dec 11 12:25:42 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Use kissfft for shared library, ffmpeg is only needed for the
+  standalone fpcalc tool.
+
 -------------------------------------------------------------------
 Wed Nov  8 12:38:27 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
 

chromaprint.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package chromaprint
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 # Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org>
 #
 # All modifications and additions to the file contributed by third parties
@@ -17,24 +17,26 @@
 #
 
 
+%define rev aa67c95b9e486884a6d3ee8b0c91207d8c2b0551
 %define soname      1
 Name:           chromaprint
-Version:        1.5.1
+Version:        1.5.1+git.20221217
 Release:        0
 Summary:        Audio Fingerprinting Library
 License:        LGPL-2.1-only AND MIT
 URL:            https://acoustid.org/chromaprint
-Source0:        https://github.com/acoustid/chromaprint/releases/download/v%{version}/%{name}-%{version}.tar.gz
+#https://github.com/acoustid/chromaprint/archive/refs/
+Source0:        https://github.com/acoustid/chromaprint/archive/%{rev}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        baselibs.conf
+Patch0:         0005-Fix-compatibility-with-ffmpeg-7.0.patch
 
 BuildRequires:  cmake
+BuildRequires:  ffmpeg-7-libavcodec-devel
 BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig
-BuildRequires:  pkgconfig(libavcodec) < 59
-BuildRequires:  pkgconfig(libavformat) < 59
-BuildRequires:  pkgconfig(libavresample)
-BuildRequires:  pkgconfig(libavutil) < 58
-BuildRequires:  pkgconfig(libswresample) < 57
+BuildRequires:  pkgconfig(libavformat)
+BuildRequires:  pkgconfig(libavutil)
+BuildRequires:  pkgconfig(libswresample)
 
 %description
 Chromaprint is the core component of the Acoustid project. It's a client-side
@@ -74,13 +76,13 @@ This package contains fpcalc, a command-line tool to perform Chromaprint
 fingerprinting.
 
 %prep
-%autosetup -p1
+%autosetup -p1 -n %{name}-%{rev}
 
 %build
 %cmake \
     -DCMAKE_SKIP_RPATH=TRUE \
     -DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE \
-    -DUSE_AVFFT=ON -DFFT_LIB=avfft \
+    -DUSE_AVFFT=ON -DFFT_LIB=kissfft \
     -DBUILD_TESTS=OFF -DBUILD_TOOLS=ON
 
 %cmake_build