[acoustid-fingerprinter] Build against compat-ffmpeg4
commit 3ed793a8ccbdb6309aaee177578f19fcb37fd931
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Feb 10 17:58:50 2022 +0000
Build against compat-ffmpeg4
acoustid-fingerprinter.spec | 15 ++++++++++-----
compat-ffmpeg4.patch | 18 ++++++++++++++++++
2 files changed, 28 insertions(+), 5 deletions(-)
---
diff --git a/acoustid-fingerprinter.spec b/acoustid-fingerprinter.spec
index 5bdf13b..cb5519a 100644
--- a/acoustid-fingerprinter.spec
+++ b/acoustid-fingerprinter.spec
@@ -10,15 +10,20 @@ URL: https://github.com/acoustid/%{name}
Source: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Patch0:
%{url}/commit/2c778334a9fc2f0ccf9b1d7635c116bce6509748.patch#/01-Fix-build-with-upcoming-Libav-10-release.patch
Patch1:
%{url}/commit/5b3d32b26a7e4522b7c1b59b1d75367f2779c98d.patch#/02-CodecID.patch
-Patch2: 03-pkg-config.patch
+#Patch2: 03-pkg-config.patch
Patch3:
%{url}/commit/6cb95c67cd9699fb3d703451eb1c4bcabc96e25f.patch#/04-typo-warning.patch
Patch4:
%{url}/commit/632e87969c3a5562a5d4842b03613267ba6236b2.patch#/05-g++-6-char-cast.patch
Patch5:
%{url}/commit/681ef059e4bdb0a9b1a073d6cbb9bb54e993fef9.patch#/06-taglib.patch
+Patch6: compat-ffmpeg4.patch
-BuildRequires: cmake3
+BuildRequires: cmake
BuildRequires: ninja-build
BuildRequires: qt4-devel
+%if 0%{?fedora} && 0%{?fedora} > 35
+BuildRequires: compat-ffmpeg4-devel
+%else
BuildRequires: ffmpeg-devel
+%endif
BuildRequires: taglib-devel
BuildRequires: desktop-file-utils
BuildRequires: libchromaprint-devel
@@ -37,13 +42,13 @@ track title, artist name, album name, etc.
%autosetup -p1
%build
-%cmake3 -DCMAKE_BUILD_TYPE=Debug -GNinja
+%cmake -DCMAKE_BUILD_TYPE=Debug -GNinja
# removing the -O3 optimization flag for the release building type
sed -i "s/-O3 -DNDEBUG//g" %{_vpath_builddir}/CMakeCache.txt
-%cmake3_build
+%cmake_build
%install
-%cmake3_install
+%cmake_install
install -d -m755 %{buildroot}%{_datadir}/applications
diff --git a/compat-ffmpeg4.patch b/compat-ffmpeg4.patch
new file mode 100644
index 0000000..a053ba1
--- /dev/null
+++ b/compat-ffmpeg4.patch
@@ -0,0 +1,18 @@
+--- a/cmake/modules/FindFFmpeg.cmake
++++ b/cmake/modules/FindFFmpeg.cmake
+@@ -33,6 +33,7 @@ MACRO(FFMPEG_FIND varname shortname head
+ /Library/Frameworks
+ /usr/local/include
+ /usr/include/
++ /usr/include/compat-ffmpeg4
+ /sw/include # Fink
+ /opt/local/include # DarwinPorts
+ /opt/csw/include # Blastwave
+@@ -58,6 +59,7 @@ MACRO(FFMPEG_FIND varname shortname head
+ /usr/local/lib64
+ /usr/lib
+ /usr/lib64
++ /usr/lib64/compat-ffmpeg4
+ /sw/lib
+ /opt/local/lib
+ /opt/csw/lib