[aqualung] Fix builds on Fedora < 36
by Sérgio M. Basto
commit 291af94b57b7b789ca92c81e1bb1603ff12dff55
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Feb 16 01:21:19 2022 +0000
Fix builds on Fedora < 36
aqualung.spec | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
---
diff --git a/aqualung.spec b/aqualung.spec
index ac5cdfd..237dbf3 100644
--- a/aqualung.spec
+++ b/aqualung.spec
@@ -53,7 +53,11 @@ BuildRequires: pkgconfig(speex)
BuildRequires: pkgconfig(libmodplug)
BuildRequires: libmpcdec-devel
%{?with_mac:BuildRequires: pkgconfig(mac)}
+%if 0%{?fedora} >= 36
%{?with_lavc:BuildRequires: compat-ffmpeg4-devel}
+%else
+%{?with_lavc:BuildRequires: ffmpeg-devel}
+%endif
%{?with_lame:BuildRequires: lame-devel}
BuildRequires: pkgconfig(wavpack)
BuildRequires: pkgconfig(lrdf)
@@ -76,7 +80,10 @@ inserting no gaps between adjacent tracks.
%autosetup -p1 -n %{name}-%{version}
%build
+%if 0%{?fedora} >= 36
export PKG_CONFIG_PATH=%{_libdir}/compat-ffmpeg4/pkgconfig
+%endif
+
./autogen.sh
%configure \
--without-sndio \
@@ -133,7 +140,7 @@ install -D -m 644 -p src/img/icon_48.png \
%changelog
* Wed Feb 16 2022 Sérgio Basto <sergio(a)serjux.com> - 1.1-2
-- Fix 32bit builds
+- Fix 32bit builds and builds on Fedora < 36
* Tue Feb 15 2022 Sérgio Basto <sergio(a)serjux.com> - 1.1-1
- Update aqualung to 1.1, patches copied from altlinux and use compat-ffmpeg4
2 years, 10 months
[acoustid-fingerprinter] fix
by Leigh Scott
Summary of changes:
0def9b9... fix (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 10 months
[acoustid-fingerprinter/f36] fix
by Leigh Scott
commit 0def9b98941add595e25ad793d0ff9288fd4bcea
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Feb 16 08:04:18 2022 +0000
fix
compat-ffmpeg4.patch | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/compat-ffmpeg4.patch b/compat-ffmpeg4.patch
index a053ba1..03d7d4c 100644
--- a/compat-ffmpeg4.patch
+++ b/compat-ffmpeg4.patch
@@ -1,16 +1,19 @@
--- a/cmake/modules/FindFFmpeg.cmake
+++ b/cmake/modules/FindFFmpeg.cmake
-@@ -33,6 +33,7 @@ MACRO(FFMPEG_FIND varname shortname head
+@@ -33,6 +33,8 @@ MACRO(FFMPEG_FIND varname shortname head
/Library/Frameworks
/usr/local/include
/usr/include/
++ /usr/include/ffmpeg
+ /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
+@@ -57,7 +59,9 @@ MACRO(FFMPEG_FIND varname shortname head
+ /usr/local/lib
/usr/local/lib64
/usr/lib
++ /usr/lib/compat-ffmpeg4
/usr/lib64
+ /usr/lib64/compat-ffmpeg4
/sw/lib
2 years, 10 months
[acoustid-fingerprinter] Build against compat-ffmpeg4
by Leigh Scott
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
2 years, 10 months
[aqualung] Fix 32bit builds
by Sérgio M. Basto
commit 79a3c7f640aaab6e62227e645d9a06ae9fc11fc5
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Feb 16 01:07:44 2022 +0000
Fix 32bit builds
aqualung.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/aqualung.spec b/aqualung.spec
index 5c4a9cb..ac5cdfd 100644
--- a/aqualung.spec
+++ b/aqualung.spec
@@ -19,7 +19,7 @@
Name: aqualung
Version: 1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Music Player for GNU/Linux
License: GPLv2+
URL: http://aqualung.jeremyevans.net/
@@ -76,7 +76,7 @@ inserting no gaps between adjacent tracks.
%autosetup -p1 -n %{name}-%{version}
%build
-export PKG_CONFIG_PATH=/usr/lib64/compat-ffmpeg4/pkgconfig
+export PKG_CONFIG_PATH=%{_libdir}/compat-ffmpeg4/pkgconfig
./autogen.sh
%configure \
--without-sndio \
@@ -132,6 +132,9 @@ install -D -m 644 -p src/img/icon_48.png \
%{_docdir}/%{name}
%changelog
+* Wed Feb 16 2022 Sérgio Basto <sergio(a)serjux.com> - 1.1-2
+- Fix 32bit builds
+
* Tue Feb 15 2022 Sérgio Basto <sergio(a)serjux.com> - 1.1-1
- Update aqualung to 1.1, patches copied from altlinux and use compat-ffmpeg4
2 years, 10 months