11:45 p.m.
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