commit chromaprint for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package chromaprint for openSUSE:Factory
checked in at 2023-11-10 12:29:00
Comparing /work/SRC/openSUSE:Factory/chromaprint (Old)
and /work/SRC/openSUSE:Factory/.chromaprint.new.17445 (New)
Package is "chromaprint"
Fri Nov 10 12:29:00 2023 rev:25 rq:1124432 version:1.5.1
Changes:
--- /work/SRC/openSUSE:Factory/chromaprint/chromaprint.changes 2023-10-26
17:12:15.671513945 +0200
+++ /work/SRC/openSUSE:Factory/.chromaprint.new.17445/chromaprint.changes
2023-11-10 12:29:06.711175539 +0100
@@ -1,0 +2,5 @@
+Wed Nov 8 12:38:27 UTC 2023 - Bjørn Lie
+
+- Drop unused and unneeded libtag-devel Requires from devel package
+
+---
Other differences:
--
++ chromaprint.spec ++
--- /var/tmp/diff_new_pack.nj492y/_old 2023-11-10 12:29:07.371199749 +0100
+++ /var/tmp/diff_new_pack.nj492y/_new 2023-11-10 12:29:07.371199749 +0100
@@ -54,7 +54,6 @@
Summary:Audio Fingerprinting Library
License:LGPL-2.1-or-later
Requires: libchromaprint%{soname} = %{version}
-Requires: libtag-devel
%description -n libchromaprint-devel
Chromaprint is the core component of the Acoustid project. It's a client-side
commit chromaprint for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package chromaprint for openSUSE:Factory
checked in at 2023-10-26 17:11:57
Comparing /work/SRC/openSUSE:Factory/chromaprint (Old)
and /work/SRC/openSUSE:Factory/.chromaprint.new.24901 (New)
Package is "chromaprint"
Thu Oct 26 17:11:57 2023 rev:24 rq:1119997 version:1.5.1
Changes:
--- /work/SRC/openSUSE:Factory/chromaprint/chromaprint.changes 2023-10-22
21:01:47.657147201 +0200
+++ /work/SRC/openSUSE:Factory/.chromaprint.new.24901/chromaprint.changes
2023-10-26 17:12:15.671513945 +0200
@@ -1,0 +2,6 @@
+Tue Oct 24 10:19:34 UTC 2023 - Bjørn Lie
+
+- Drop unused libtag-devel BuildRequires.
+- Use cmake_build macro.
+
+---
Other differences:
--
++ chromaprint.spec ++
--- /var/tmp/diff_new_pack.fZXfhM/_old 2023-10-26 17:12:16.319537745 +0200
+++ /var/tmp/diff_new_pack.fZXfhM/_new 2023-10-26 17:12:16.319537745 +0200
@@ -26,9 +26,9 @@
URL:https://acoustid.org/chromaprint
Source0:
https://github.com/acoustid/chromaprint/releases/download/v%{version}/%{name}-%{version}.tar.gz
Source1:baselibs.conf
+
BuildRequires: cmake
BuildRequires: gcc-c++
-BuildRequires: libtag-devel
BuildRequires: pkgconfig
BuildRequires: pkgconfig(libavcodec) < 59
BuildRequires: pkgconfig(libavformat) < 59
@@ -84,7 +84,7 @@
-DUSE_AVFFT=ON -DFFT_LIB=avfft \
-DBUILD_TESTS=OFF -DBUILD_TOOLS=ON
-%make_build
+%cmake_build
%install
%cmake_install
commit chromaprint for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package chromaprint for openSUSE:Factory
checked in at 2023-10-22 21:01:29
Comparing /work/SRC/openSUSE:Factory/chromaprint (Old)
and /work/SRC/openSUSE:Factory/.chromaprint.new.1945 (New)
Package is "chromaprint"
Sun Oct 22 21:01:29 2023 rev:23 rq:1119211 version:1.5.1
Changes:
--- /work/SRC/openSUSE:Factory/chromaprint/chromaprint.changes 2023-05-08
17:23:56.484573723 +0200
+++ /work/SRC/openSUSE:Factory/.chromaprint.new.1945/chromaprint.changes
2023-10-22 21:01:47.657147201 +0200
@@ -1,0 +2,7 @@
+Fri Oct 20 08:56:45 UTC 2023 - Bjørn Lie
+
+- Drop fftw3-devel BuildRequires and Requires, pass DFFT_LIB=avfft
+ to cmake, use the already present ffmpeg lib.
+- Use ldconfig_scriptlets for post(un) handling.
+
+---
Other differences:
--
++ chromaprint.spec ++
--- /var/tmp/diff_new_pack.OQR1vb/_old 2023-10-22 21:01:48.825189672 +0200
+++ /var/tmp/diff_new_pack.OQR1vb/_new 2023-10-22 21:01:48.829189817 +0200
@@ -27,7 +27,6 @@
Source0:
https://github.com/acoustid/chromaprint/releases/download/v%{version}/%{name}-%{version}.tar.gz
Source1:baselibs.conf
BuildRequires: cmake
-BuildRequires: fftw3-devel
BuildRequires: gcc-c++
BuildRequires: libtag-devel
BuildRequires: pkgconfig
@@ -54,7 +53,6 @@
%package -n libchromaprint-devel
Summary:Audio Fingerprinting Library
License:LGPL-2.1-or-later
-Requires: fftw3-devel
Requires: libchromaprint%{soname} = %{version}
Requires: libtag-devel
@@ -83,7 +81,7 @@
%cmake \
-DCMAKE_SKIP_RPATH=TRUE \
-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE \
--DUSE_AVFFT=ON \
+-DUSE_AVFFT=ON -DFFT_LIB=avfft \
-DBUILD_TESTS=OFF -DBUILD_TOOLS=ON
%make_build
@@ -91,8 +89,7 @@
%install
%cmake_install
-%post -n libchromaprint%{soname} -p /sbin/ldconfig
-%postun -n libchromaprint%{soname} -p /sbin/ldconfig
+%ldconfig_scriptlets -n libchromaprint%{soname}
%files -n libchromaprint%{soname}
%license LICENSE.md
commit chromaprint for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package chromaprint for openSUSE:Factory
checked in at 2023-05-08 17:23:54
Comparing /work/SRC/openSUSE:Factory/chromaprint (Old)
and /work/SRC/openSUSE:Factory/.chromaprint.new.1533 (New)
Package is "chromaprint"
Mon May 8 17:23:54 2023 rev:22 rq:1085470 version:1.5.1
Changes:
--- /work/SRC/openSUSE:Factory/chromaprint/chromaprint.changes 2023-04-29
17:27:58.294499714 +0200
+++ /work/SRC/openSUSE:Factory/.chromaprint.new.1533/chromaprint.changes
2023-05-08 17:23:56.484573723 +0200
@@ -1,0 +2,7 @@
+Wed May 3 09:39:48 UTC 2023 - Bjørn Lie
+
+- Drop 8ccad69.patch and 82781d02.patch, and add back
+ pkgconfig(libavresample) BuildRequires. Also limit package to
+ build against ffmpeg-4 and older.
+
+---
Old:
82781d02.patch
8ccad69.patch
Other differences:
--
++ chromaprint.spec ++
--- /var/tmp/diff_new_pack.YmeK1o/_old 2023-05-08 17:23:56.992576726 +0200
+++ /var/tmp/diff_new_pack.YmeK1o/_new 2023-05-08 17:23:57.008576821 +0200
@@ -26,18 +26,16 @@
URL:https://acoustid.org/chromaprint
Source0:
https://github.com/acoustid/chromaprint/releases/download/v%{version}/%{name}-%{version}.tar.gz
Source1:baselibs.conf
-# PATCH-FIX-UPSTREAM
https://github.com/acoustid/chromaprint/commit/8ccad69.patch -- Upgrade code to
FFmpeg 5.x APIs
-Patch0: 8ccad69.patch
-Patch1: https://github.com/acoustid/chromaprint/commit/82781d02.patch
BuildRequires: cmake
BuildRequires: fftw3-devel
BuildRequires: gcc-c++
BuildRequires: libtag-devel
BuildRequires: pkgconfig
-BuildRequires: pkgconfig(libavcodec) >= 59
-BuildRequires: pkgconfig(libavformat)
-BuildRequires: pkgconfig(libavutil)
-BuildRequires: pkgconfig(libswresample)
+BuildRequires: pkgconfig(libavcodec) < 59
+BuildRequires: pkgconfig(libavformat) < 59
+BuildRequires: pkgconfig(libavresample)
+BuildRequires: pkgconfig(libavutil) < 58
+BuildRequires: pkgconfig(libswresample) < 57
%description
Chromaprint is the core component of the Acoustid project. It's a client-side
commit chromaprint for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package chromaprint for openSUSE:Factory
checked in at 2023-04-29 17:27:52
Comparing /work/SRC/openSUSE:Factory/chromaprint (Old)
and /work/SRC/openSUSE:Factory/.chromaprint.new.1533 (New)
Package is "chromaprint"
Sat Apr 29 17:27:52 2023 rev:21 rq:1083512 version:1.5.1
Changes:
--- /work/SRC/openSUSE:Factory/chromaprint/chromaprint.changes 2022-12-07
17:35:19.936659789 +0100
+++ /work/SRC/openSUSE:Factory/.chromaprint.new.1533/chromaprint.changes
2023-04-29 17:27:58.294499714 +0200
@@ -1,0 +2,6 @@
+Thu Apr 27 17:14:20 UTC 2023 - Dominique Leuenberger
+
+- Add 82781d02.patch: FFmpeg 5.x: Some files return error codes
+ when scanning.
+
+---
New:
82781d02.patch
Other differences:
--
++ chromaprint.spec ++
--- /var/tmp/diff_new_pack.iTG6al/_old 2023-04-29 17:27:58.818501908 +0200
+++ /var/tmp/diff_new_pack.iTG6al/_new 2023-04-29 17:27:58.822501925 +0200
@@ -1,7 +1,7 @@
#
# spec file for package chromaprint
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2012 Pascal Bleser
#
# All modifications and additions to the file contributed by third parties
@@ -28,7 +28,7 @@
Source1:baselibs.conf
# PATCH-FIX-UPSTREAM
https://github.com/acoustid/chromaprint/commit/8ccad69.patch -- Upgrade code to
FFmpeg 5.x APIs
Patch0: 8ccad69.patch
-
+Patch1: https://github.com/acoustid/chromaprint/commit/82781d02.patch
BuildRequires: cmake
BuildRequires: fftw3-devel
BuildRequires: gcc-c++
++ 82781d02.patch ++
>From 82781d02cd3063d071a501218297a90bde9a314f Mon Sep 17 00:00:00 2001
From: Marshal Walker
Date: Thu, 8 Dec 2022 11:53:58 -0500
Subject: [PATCH] ffmpeg5 fix for issue #122
tested on Arch Linux, needs testing on win/mac/etc (should be fine tho)
---
src/audio/ffmpeg_audio_processor_swresample.h | 4 ++--
src/audio/ffmpeg_audio_reader.h | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/audio/ffmpeg_audio_processor_swresample.h
b/src/audio/ffmpeg_audio_processor_swresample.h
index b1d4bea..e8fcb3f 100644
--- a/src/audio/ffmpeg_audio_processor_swresample.h
+++ b/src/audio/ffmpeg_audio_processor_swresample.h
@@ -29,7 +29,7 @@ class FFmpegAudioProcessor {
}
void SetInputChannelLayout(AVChannelLayout *channel_layout) {
- av_opt_set_int(m_swr_ctx, "in_channel_layout",
channel_layout->u.mask, 0);
+ av_opt_set_chlayout(m_swr_ctx, "in_chlayout", channel_layout,
0);
}
void SetInputSampleFormat(AVSampleFormat sample_format) {
@@ -41,7 +41,7 @@ class FFmpegAudioProcessor {
}
void SetOutputChannelLayout(AVChannelLayout *channel_layout) {
- av_opt_set_int(m_swr_ctx, "out_channel_layout",
channel_layout->u.mask, 0);
+ av_opt_set_chlayout(m_swr_ctx, "out_chlayout", channel_layout,
0);
}
void SetOutputSampleFormat(AVSampleFormat sample_format) {
diff --git a/src/audio/ffmpeg_audio_reader.h b/src/audio/ffmpeg_audio_reader.h
index 1c6b346..35b2934 100644
--- a/src/audio/ffmpeg_audio_reader.h
+++ b/src/audio/ffmpeg_audio_reader.h
@@ -301,9 +301,10 @@ inline bool FFmpegAudioReader::Read(const int16_t **data,
size_t *size) {
} else {
m_has_more_frames = false;
}
+ } else {
+ SetError("Error decoding the audio source",
ret);
+ return false;
}
- SetError("Error decoding the audio source", ret);
- return false;
}
if (m_frame->nb_samples > 0) {
commit chromaprint for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package chromaprint for openSUSE:Factory
checked in at 2022-12-07 17:34:20
Comparing /work/SRC/openSUSE:Factory/chromaprint (Old)
and /work/SRC/openSUSE:Factory/.chromaprint.new.1835 (New)
Package is "chromaprint"
Wed Dec 7 17:34:20 2022 rev:20 rq:1040587 version:1.5.1
Changes:
--- /work/SRC/openSUSE:Factory/chromaprint/chromaprint.changes 2022-07-13
14:31:45.701239775 +0200
+++ /work/SRC/openSUSE:Factory/.chromaprint.new.1835/chromaprint.changes
2022-12-07 17:35:19.936659789 +0100
@@ -1,0 +2,8 @@
+Fri Nov 11 17:00:42 UTC 2022 - Bjørn Lie
+
+- Add 8ccad69.patch: Upgrade code to FFmpeg 5.x APIs. Following
+ this, drop pkgconfig(libavresample) BuildRequires: No longer
+ used.
+ * https://github.com/acoustid/chromaprint/commit/8ccad69.patch
+
+---
@@ -14,2 +22,2 @@
- * Added support for fpcalc -raw -signed, which helps with easier PostgreSQL
- integration
+ * Added support for fpcalc -raw -signed, which helps with easier
+PostgreSQL integration
New:
8ccad69.patch
Other differences:
--
++ chromaprint.spec ++
--- /var/tmp/diff_new_pack.V7s4Yy/_old 2022-12-07 17:35:20.788664455 +0100
+++ /var/tmp/diff_new_pack.V7s4Yy/_new 2022-12-07 17:35:20.792664477 +0100
@@ -26,14 +26,16 @@
URL:https://acoustid.org/chromaprint
Source0:
https://github.com/acoustid/chromaprint/releases/download/v%{version}/%{name}-%{version}.tar.gz
Source1:baselibs.conf
+# PATCH-FIX-UPSTREAM
https://github.com/acoustid/chromaprint/commit/8ccad69.patch -- Upgrade code to
FFmpeg 5.x APIs
+Patch0: 8ccad69.patch
+
BuildRequires: cmake
BuildRequires: fftw3-devel
BuildRequires: gcc-c++
BuildRequires: libtag-devel
BuildRequires: pkgconfig
-BuildRequires: pkgconfig(libavcodec)
+BuildRequires: pkgconfig(libavcodec) >= 59
BuildRequires: pkgconfig(libavformat)
-BuildRequires: pkgconfig(libavresample)
BuildRequires: pkgconfig(libavutil)
BuildRequires: pkgconfig(libswresample)
++ 8ccad69.patch ++
>From 8ccad6937177b1b92e40ab8f4447ea27bac009a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Lalinsk=C3=BD?=
Date: Fri, 4 Nov 2022 21:47:38 +0100
Subject: [PATCH] Use FFmpeg 5.x (#120)
* Use FFmpeg 5.1.2 for CI builds
* Build on Ubuntu 20.04
* Upgrade code to FFmpeg 5.x APIs
* Only set FFmpeg include dirs if building tools
* No longer needed
* Use ubuntu 20.04
---
.github/workflows/build.yml | 6 +-
CMakeLists.txt| 16 --
package/build.sh | 4 +-
src/audio/ffmpeg_audio_processor.h| 2 -
src/audio/ffmpeg_audio_processor_avresample.h | 72 ---
src/audio/ffmpeg_audio_processor_swresample.h | 18 +-
src/audio/ffmpeg_audio_reader.h | 197 +-
tests/CMakeLists.txt | 6 +
8 files changed, 122 insertions(+), 199 deletions(-)
delete mode 100644 src/audio/ffmpeg_audio_processor_avresample.h
Index: chromaprint-1.5.1/.github/workflows/build.yml
===
--- chromaprint-1.5.1.orig/.github/workflows/build.yml
+++ chromaprint-1.5.1/.github/workflows/build.yml
@@ -6,7 +6,7 @@ on:
jobs:
test-linux:
-runs-on: ubuntu-18.04
+runs-on: ubuntu-20.04
strategy:
matrix:
fft:
@@ -50,7 +50,7 @@ jobs:
make check VERBOSE=1
package-linux:
-runs-on: ubuntu-18.04
+runs-on: ubuntu-20.04
strategy:
matrix:
arch:
@@ -71,7 +71,7 @@ jobs:
path: artifacts/
package-windows:
-runs-on: ubuntu-18.04
+runs-on: ubuntu-20.04
strategy:
matrix:
arch:
Index: chromaprint-1.5.1/CMakeLists.txt
===
--- chromaprint-1.5.1.orig/CMakeLists.txt
+++ chromaprint-1.5.1/CMakeLists.txt
@@ -82,9 +82,6 @@ find_package(FFmpeg)
if(FFMPEG_LIBRARIES)
cmake_push_check_state(RESET)
set(CMAKE_REQUIRED_LIBRARIES ${FFMPEG_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT} -lm)
- check_function_exists(av_packet_unref HAVE_AV_PACKET_UNREF)
- check_function_exists(av_frame_alloc HAVE_AV_FRAME_ALLOC)
- check_function_exists(av_frame_free HAVE_AV_FRAME_FREE)
cmake_pop_check_state()
endif()
@@ -161,30 +158,17 @@ message(STATUS "Using ${FFT_LIB} for FFT
if(NOT AUDIO_PROCESSOR_LIB)
if(FFMPEG_LIBSWRESAMPLE_FOUND)
set(AUDIO_PROCESSOR_LIB "swresample")
- elseif(FFMPEG_LIBAVRESAMPLE_FOUND)
- set(AUDIO_PROCESSOR_LIB "avresample")
commit chromaprint for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package chromaprint for openSUSE:Factory
checked in at 2022-07-13 14:31:44
Comparing /work/SRC/openSUSE:Factory/chromaprint (Old)
and /work/SRC/openSUSE:Factory/.chromaprint.new.1523 (New)
Package is "chromaprint"
Wed Jul 13 14:31:44 2022 rev:19 rq:988544 version:1.5.1
Changes:
--- /work/SRC/openSUSE:Factory/chromaprint/chromaprint.changes 2020-08-14
09:30:16.724304617 +0200
+++ /work/SRC/openSUSE:Factory/.chromaprint.new.1523/chromaprint.changes
2022-07-13 14:31:45.701239775 +0200
@@ -1,0 +2,9 @@
+Mon Jul 11 18:31:39 UTC 2022 - Dirk M??ller
+
+- update to 1.5.1:
+ * 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.
+
+---
Old:
chromaprint-1.5.0.tar.gz
New:
chromaprint-1.5.1.tar.gz
Other differences:
--
++ chromaprint.spec ++
--- /var/tmp/diff_new_pack.yyopob/_old 2022-07-13 14:31:46.261240508 +0200
+++ /var/tmp/diff_new_pack.yyopob/_new 2022-07-13 14:31:46.261240508 +0200
@@ -1,7 +1,7 @@
#
# spec file for package chromaprint
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2012 Pascal Bleser
#
# All modifications and additions to the file contributed by third parties
@@ -19,10 +19,10 @@
%define soname 1
Name: chromaprint
-Version:1.5.0
+Version:1.5.1
Release:0
Summary:Audio Fingerprinting Library
-License:MIT AND LGPL-2.1-only
+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
Source1:baselibs.conf
@@ -77,14 +77,14 @@
fingerprinting.
%prep
-%setup -q -n %{name}-v%{version}
+%autosetup -p1
%build
%cmake \
-DCMAKE_SKIP_RPATH=TRUE \
-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE \
-DUSE_AVFFT=ON \
--DBUILD_TOOLS=ON
+-DBUILD_TESTS=OFF -DBUILD_TOOLS=ON
%make_build
++ chromaprint-1.5.0.tar.gz -> chromaprint-1.5.1.tar.gz ++
126546 lines of diff (skipped)
