[qmmp-plugins-freeworld/f34] Add GCC patch from Fedora proper
commit c48ff9a209ff47104d829b63914548572263150f
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Feb 20 19:13:40 2021 +0000
Add GCC patch from Fedora proper
Sync with Fedora proper
qmmp-filter-provides.sh | 0
qmmp-gcc11.patch | 12 ++++++++++++
qmmp-plugins-freeworld.spec | 14 +++++++++-----
3 files changed, 21 insertions(+), 5 deletions(-)
---
diff --git a/qmmp-filter-provides.sh b/qmmp-filter-provides.sh
old mode 100644
new mode 100755
diff --git a/qmmp-gcc11.patch b/qmmp-gcc11.patch
new file mode 100644
index 0000000..7b0daed
--- /dev/null
+++ b/qmmp-gcc11.patch
@@ -0,0 +1,12 @@
+diff --git a/src/qmmp/audioconverter.cpp b/src/qmmp/audioconverter.cpp
+index c0dd1a2..201100a 100644
+--- a/src/qmmp/audioconverter.cpp
++++ b/src/qmmp/audioconverter.cpp
+@@ -20,6 +20,7 @@
+
+ #include <math.h>
+ #include <string.h>
++#include <limits>
+ #include <QtGlobal>
+ #include <QtEndian>
+ #include "audioconverter.h"
diff --git a/qmmp-plugins-freeworld.spec b/qmmp-plugins-freeworld.spec
index c23bb92..b704b9c 100644
--- a/qmmp-plugins-freeworld.spec
+++ b/qmmp-plugins-freeworld.spec
@@ -8,18 +8,21 @@ License: GPLv2+
URL: http://qmmp.ylsoftware.com/
Source: http://qmmp.ylsoftware.com/files/qmmp-%{version}.tar.bz2
Source2: qmmp-filter-provides.sh
+Patch0: qmmp-gcc11.patch
%define _use_internal_dependency_generator 0
-%define __find_provides %{_builddir}/%{buildsubdir}/qmmp-filter-provides.sh
+%define __find_provides %{SOURCE2}
BuildRequires: cmake
BuildRequires: desktop-file-utils
-BuildRequires: ffmpeg-devel
BuildRequires: enca-devel
BuildRequires: faad2-devel
+BuildRequires: ffmpeg-devel
+BuildRequires: libcurl-devel
BuildRequires: libmms-devel
BuildRequires: qt5-linguist
BuildRequires: qt5-qtbase-devel
-BuildRequires: taglib-devel libcurl-devel
+BuildRequires: taglib-devel >= 1.10
+BuildRequires: zlib-devel
Requires: qmmp%{?_isa} = %{version}
Supplements: qmmp
@@ -32,8 +35,7 @@ and also the mplayer plugin for video playback.
%prep
%setup -q -n qmmp-%{version}
-cp %{SOURCE2} .
-chmod +x qmmp-filter-provides.sh
+%patch0 -p1
# adjust includes for the header move in latest ffmpeg
sed -i \
-e 's|<avcodec.h|<libavcodec/avcodec.h|g' \
@@ -172,6 +174,8 @@ desktop-file-validate
%{buildroot}/%{_datadir}/applications/%{name}-ffmpeg-enque
%changelog
* Thu Feb 04 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> -
1.4.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+- Add GCC patch from Fedora proper
+- Sync with Fedora proper
* Fri Jan 1 2021 Leigh Scott <leigh123linux(a)gmail.com> - 1.4.2-2
- Rebuilt for new ffmpeg snapshot