[dvbcut] Fix build
by Sérgio M. Basto
commit 7491cac61d4ed7f60a1b72ffdf134b3529d4507b
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Feb 27 23:44:39 2022 +0000
Fix build
autoupdate.patch | 58 ++++++++++++++++++++++++++++++++++++++++++++++
dvbcut-use_pkgconfig.patch | 22 +++++++++---------
dvbcut.spec | 1 +
3 files changed, 70 insertions(+), 11 deletions(-)
---
diff --git a/autoupdate.patch b/autoupdate.patch
new file mode 100644
index 0000000..0222d38
--- /dev/null
+++ b/autoupdate.patch
@@ -0,0 +1,58 @@
+Only in dvbcut-0.7.3: autom4te.cache
+diff -upr dvbcut-0.7.3.orig/configure.ac dvbcut-0.7.3/configure.ac
+--- dvbcut-0.7.3.orig/configure.ac 2018-08-20 00:18:53.000000000 +0100
++++ dvbcut-0.7.3/configure.ac 2022-02-27 21:42:37.087154133 +0000
+@@ -4,11 +4,12 @@
+
+ #@(#) $Id$
+
+-AC_INIT(src/dvbcut.cpp)
++AC_INIT
++AC_CONFIG_SRCDIR([src/dvbcut.cpp])
+
+-AC_PREREQ(2.13)
++AC_PREREQ([2.69])
+
+-AC_CANONICAL_SYSTEM
++AC_CANONICAL_TARGET
+
+ CONFIGURE_ARGS="$ac_configure_args"
+ AC_SUBST(CONFIGURE_ARGS)
+@@ -21,8 +22,18 @@ AC_PROG_INSTALL
+ AC_CHECK_TOOL(STRIP, strip, :)
+ AC_CHECK_TOOL(PKG_CONFIG, pkg-config, :)
+
+-AC_CYGWIN
+-AC_MINGW32
++AC_CANONICAL_HOST
++case $host_os in
++ *cygwin* ) CYGWIN=yes;;
++ * ) CYGWIN=no;;
++esac
++
++AC_CANONICAL_HOST
++case $host_os in
++ *mingw32* ) MINGW32=yes;;
++ * ) MINGW32=no;;
++esac
++
+ AC_EXEEXT
+ AC_OBJEXT
+
+@@ -82,7 +93,6 @@ fi
+ dnl AC_CHECK_LIB(m, sqrt, [LIBS="$LIBS -lm"])
+
+ dnl Checks for header files.
+-AC_HEADER_STDC
+ AC_CHECK_HEADERS(ao/ao.h mad.h stdint.h a52dec/a52.h)
+
+ dnl Checks for typedefs, structures, and compiler characteristics.
+@@ -141,6 +151,7 @@ AC_DEFINE(__STDC_CONSTANT_MACROS, 1, [Re
+ AC_DEFINE(_FILE_OFFSET_BITS, 64, [We are always using large files])
+ dnl AC_DEFINE(_LARGEFILE_SOURCE)
+
+-AC_OUTPUT([Makefile src/Makefile dvbcut.desktop])
++AC_CONFIG_FILES([Makefile src/Makefile dvbcut.desktop])
++AC_OUTPUT
+
+ # vi: set ts=8 sw=2 :
diff --git a/dvbcut-use_pkgconfig.patch b/dvbcut-use_pkgconfig.patch
index 6bd50f3..d3059db 100644
--- a/dvbcut-use_pkgconfig.patch
+++ b/dvbcut-use_pkgconfig.patch
@@ -1,29 +1,29 @@
-Index: dvbcut-deb-0.7.2/configure.ac
-===================================================================
---- dvbcut-deb-0.7.2.orig/configure.ac
-+++ dvbcut-deb-0.7.2/configure.ac
-@@ -43,12 +43,35 @@ done
+diff -upr dvbcut-0.7.3.orig/configure.ac dvbcut-0.7.3/configure.ac
+--- dvbcut-0.7.3.orig/configure.ac 2022-02-27 23:39:19.579651681 +0000
++++ dvbcut-0.7.3/configure.ac 2022-02-27 23:32:11.292333787 +0000
+@@ -54,12 +54,35 @@ done
dnl Checks for libraries.
-FFMPEG_LIBS='-lavformat -lavcodec -lavutil'
AC_SUBST(FFMPEG_LIBS)
-+AC_CHECK_LIB(avformat, main,
+-AC_CHECK_LIB(swscale, main,
+- [AC_DEFINE(HAVE_LIB_SWSCALE, 1, [Define this if you have libswscale.])
+- FFMPEG_LIBS="$FFMPEG_LIBS -lswscale"])
++PKG_CHECK_MODULES(avformat, libavformat,
+ [HAVE_FFMPEG="yes"],
+ [AC_MSG_ERROR([libavformat library not found])])
+
-+AC_CHECK_LIB(avcodec, main,
++PKG_CHECK_MODULES(avcodec, libavcodec,
+ [HAVE_FFMPEG="yes"],
+ [AC_MSG_ERROR([libavcodec library not found])])
+
-+AC_CHECK_LIB(avutil, main,
++PKG_CHECK_MODULES(avutil, libavutil,
+ [HAVE_FFMPEG="yes"],
+ [AC_MSG_ERROR([libavutil library not found])])
+
- AC_CHECK_LIB(swscale, main,
-- [AC_DEFINE(HAVE_LIB_SWSCALE, 1, [Define this if you have libswscale.])
-- FFMPEG_LIBS="$FFMPEG_LIBS -lswscale"])
++PKG_CHECK_MODULES(swscale, libavutil,
+ [HAVE_SWSCALE="yes"],
+ [AC_MSG_ERROR([libswscale library not found])])
+
diff --git a/dvbcut.spec b/dvbcut.spec
index 3ba67de..6d24fc9 100644
--- a/dvbcut.spec
+++ b/dvbcut.spec
@@ -18,6 +18,7 @@ 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
+Patch6: autoupdate.patch
BuildRequires: autoconf
BuildRequires: libtool
2 years, 2 months
[vlc/el8: 2/2] Merge branch 'master' into el8
by Nicolas Chauvet
commit 7c79e492202424ab44e6563a949e5cec6884b9e7
Merge: 88ad600 f633042
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sun Feb 27 21:21:48 2022 +0100
Merge branch 'master' into el8
vlc.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
2 years, 2 months
[vlc] Fixup private headers usage
by Nicolas Chauvet
commit f633042c9086b9e2d17cfbdfb749f99826944a89
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sun Feb 27 21:20:49 2022 +0100
Fixup private headers usage
vlc.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index 350e060..2bde75c 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -191,7 +191,7 @@ BuildRequires: pkgconfig(libpulse) >= 0.9.8
BuildRequires: pkgconfig(libsecret-1) >= 0.18
BuildRequires: pkgconfig(microdns) >= 0.1.2
BuildRequires: pkgconfig(protobuf-lite) >= 2.5
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 8
BuildRequires: qt5-qtbase-private-devel
%endif
BuildRequires: pkgconfig(Qt5Core) >= 5.5
2 years, 2 months
[vlc/el7: 25/25] Merge branch 'master' into el7
by Nicolas Chauvet
commit 4eeea2dee0b31339901728dedd4eb2f8a8d2c12a
Merge: 7cf6151 88ad023
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sun Feb 27 19:22:38 2022 +0100
Merge branch 'master' into el7
...by-ref.-from-getConnectionEndpointAddress.patch | 50 +++++++++++
Remove_legacy_caca.patch | 98 ++++++++++++++++++++++
sources | 2 +-
vlc.spec | 73 ++++++++++++----
4 files changed, 204 insertions(+), 19 deletions(-)
---
2 years, 2 months
[vlc/el7] (25 commits) ...Merge branch 'master' into el7
by Nicolas Chauvet
Summary of changes:
b4c36b7... Rebuilt (*)
3baadf2... Make check non-fatal (*)
4c7bbeb... Mass rebuild for x264-0.163 (*)
b9e3759... - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass (*)
8e9d909... Rebuilt (*)
e953da7... Rebuild (*)
4cfe09e... Rebuilt for new ffmpeg snapshot (*)
3e020fd... fix (*)
d4bf359... Apply upstream ffmpeg fix to f36+ (*)
3d5a592... Update to snapshot (*)
46051cf... Update patch (*)
c008e7e... Rebuilt (*)
410c535... Add sources (*)
9de2aaa... Update 3.x snapshot (*)
5a5f6fb... Fix build with new live555 (*)
b2e2ca7... Add WIP remaining patch for FFmpeg-5.0 (*)
0d3efe4... Apply patch (*)
2247057... Bump (*)
43434e5... fix (*)
2bdfb59... Reword conditions (*)
62442a1... Rebuilt (*)
285ea57... Rebuild (*)
98c4ce0... Update to 3.0.17 (*)
88ad023... Fixup (*)
4eeea2d... Merge branch 'master' into el7
(*) This commit already existed in another branch; no separate mail sent
2 years, 2 months
[dvbcut] Switch to compat-ffmpeg4
by Sérgio M. Basto
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
2 years, 2 months
