commit 6ea6e00e1f1b30bda5e20e571a41be9afe7393e8
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Feb 27 17:18:23 2022 +0000
Switch to compat-ffmpeg4
deprecated_QString_sprintf.patch | 11 +++++++++++
dvbcut.spec | 16 ++++++++++++----
2 files changed, 23 insertions(+), 4 deletions(-)
---
diff --git a/deprecated_QString_sprintf.patch b/deprecated_QString_sprintf.patch
new file mode 100644
index 0000000..9d0cd61
--- /dev/null
+++ b/deprecated_QString_sprintf.patch
@@ -0,0 +1,11 @@
+--- ./src/eventlistitem.cpp.orig 2022-02-27 17:05:06.870547741 +0000
++++ ./src/eventlistitem.cpp 2022-02-27 17:05:15.056515593 +0000
+@@ -68,7 +68,7 @@ QString EventListItem::getstring() const
+ //: Text shown on bookmark markers in the main window marker list
+ .arg(QCoreApplication::translate("eventlist",
"BOOKMARK"));
+
+- return label + QString().sprintf("<br>%02d:%02d:%02d.%03d<br>%d
(%c)",
++ return label + QString().asprintf("<br>%02d:%02d:%02d.%03d<br>%d
(%c)",
+ int(pts/(3600*90000)),
+ int(pts/(60*90000))%60,
+ int(pts/90000)%60,
diff --git a/dvbcut.spec b/dvbcut.spec
index 0eddc56..3ba67de 100644
--- a/dvbcut.spec
+++ b/dvbcut.spec
@@ -17,6 +17,7 @@ Patch1: dvbcut-use_pkgconfig.patch
Patch3: dvbcut-appicon.patch
# PATCH-FIX-OPENSUSE dvbcut-locale.patch aloisio(a)gmx.com -- also install .qm locale
files
Patch4: dvbcut-locale.patch
+Patch5: deprecated_QString_sprintf.patch
BuildRequires: autoconf
BuildRequires: libtool
@@ -32,7 +33,11 @@ BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5Xml)
BuildRequires: pkgconfig(ao)
BuildRequires: libmad-devel
+%if 0%{?fedora} && 0%{?fedora} > 35
+BuildRequires: compat-ffmpeg4-devel
+%else
BuildRequires: ffmpeg-devel
+%endif
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
# mplayer not actually required, but much better with it.
@@ -50,13 +55,13 @@ dvbcut can use Mplayer if available.
%prep
-%setup -q -n %{name}-deb-%{version}
-%patch1 -p1
-%patch3 -p1
-%patch4 -p1
+%autosetup -p1 -n %{name}-deb-%{version}
%build
+%if 0%{?fedora} && 0%{?fedora} > 35
+export PKG_CONFIG_PATH="%{_libdir}/compat-ffmpeg4/pkgconfig"
+%endif
autoreconf -i
%configure
@@ -97,6 +102,9 @@ update-desktop-database &> /dev/null || :
%changelog
+* Sun Feb 27 2022 Sérgio Basto <sergio(a)serjux.com> - 0.7.3-2
+- Switch to compat-ffmpeg4
+
* Wed Feb 09 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> -
0.7.3-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild