1 Commits

Author SHA256 Message Date
43412fbf8c Sync changes to SLFO-1.2 branch 2025-08-20 09:06:11 +02:00
5 changed files with 53 additions and 53 deletions

View File

@@ -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) {

Binary file not shown.

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9d33482e56a1389a37a0d6742c376139fa43e3b8a63d29003222b93db2cb40da
size 1577695

View File

@@ -1,30 +1,3 @@
-------------------------------------------------------------------
Tue Sep 2 07:34:40 UTC 2025 - pgajdos@suse.com
- version update to 1.6.0
* Added support for FFmpeg 8.0
* Added chromaprint_decode_fingerprint_header function
* Added missing chromaprint_get_algorithm function implementation
* Optimized simhash calculation and fingerprint decoding
* Improved fingerprint compression performance by pre-allocating vector storage
* CMake improvements: updated minimum version to 3.10, use GNUInstallDirs, install config targets
* Build Linux ARM64 binaries
* Allow build to exclude internal avresample
- removed patches
- 0005-Fix-compatibility-with-ffmpeg-7.0.patch (upstreamed)
-------------------------------------------------------------------
Mon Mar 31 09:54:14 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
- More precise ffmpeg BuildRequires to nudge bs_sched for 15.6
-------------------------------------------------------------------
Sat Mar 29 11:53:17 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
- Use pkgconfig(libavcodec) to allow building with ffmpeg-*-mini
- Rename %soname to %sover to reflect actual use of the variable
- Use the SRPM base name for the devel subpackage
-------------------------------------------------------------------
Sat Jan 25 08:50:23 UTC 2025 - Dave Plater <davejplater@gmail.com>

View File

@@ -1,7 +1,7 @@
#
# spec file for package chromaprint
#
# Copyright (c) 2025 SUSE LLC and contributors
# 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
@@ -18,46 +18,46 @@
%define rev aa67c95b9e486884a6d3ee8b0c91207d8c2b0551
%define sover 1
%define soname 1
Name: chromaprint
Version: 1.6.0
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}/chromaprint-%{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) >= 61
BuildRequires: pkgconfig(libavformat) >= 61
BuildRequires: pkgconfig(libavutil) >= 59
BuildRequires: pkgconfig(libswresample) >= 5
BuildRequires: pkgconfig(libavformat)
BuildRequires: pkgconfig(libavutil)
BuildRequires: pkgconfig(libswresample)
%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.
%package -n libchromaprint%{sover}
%package -n libchromaprint%{soname}
Summary: Audio Fingerprinting Library
License: LGPL-2.1-or-later
%description -n libchromaprint%{sover}
%description -n libchromaprint%{soname}
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.
%package devel
%package -n libchromaprint-devel
Summary: Audio Fingerprinting Library
License: LGPL-2.1-or-later
Requires: libchromaprint%{sover} = %{version}
Obsoletes: libchromaprint-devel < %{version}-%{release}
Provides: libchromaprint-devel = %{version}-%{release}
Requires: libchromaprint%{soname} = %{version}
%description devel
%description -n libchromaprint-devel
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.
@@ -65,7 +65,7 @@ audio source.
%package fpcalc
Summary: Chromaprint Audio Fingerprinting Command Line Tool
License: GPL-2.0-or-later
Requires: libchromaprint%{sover} = %{version}
Requires: libchromaprint%{soname} = %{version}
Provides: fpcalc = %{version}
%description fpcalc
@@ -76,7 +76,7 @@ This package contains fpcalc, a command-line tool to perform Chromaprint
fingerprinting.
%prep
%autosetup -p1
%autosetup -p1 -n %{name}-%{rev}
%build
%cmake \
@@ -90,19 +90,18 @@ fingerprinting.
%install
%cmake_install
%ldconfig_scriptlets -n libchromaprint%{sover}
%ldconfig_scriptlets -n libchromaprint%{soname}
%files -n libchromaprint%{sover}
%files -n libchromaprint%{soname}
%license LICENSE.md
%doc NEWS.txt README.md
%{_libdir}/libchromaprint.so.*
%{_libdir}/libchromaprint.so.%{soname}
%{_libdir}/libchromaprint.so.%{soname}.*
%files devel
%files -n libchromaprint-devel
%{_includedir}/chromaprint.h
%{_libdir}/libchromaprint.so
%{_libdir}/pkgconfig/libchromaprint.pc
%dir %{_libdir}/cmake/Chromaprint
%{_libdir}/cmake/Chromaprint/*.cmake
%files fpcalc
%{_bindir}/fpcalc