From 93ef2997b289273a1bfe1577eeb617d8306cb621 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 8 Jul 2020 12:18:43 +0200 Subject: [PATCH] avidemux: update to 2.7.6 --- srcpkgs/avidemux/patches/qt5.15.patch | 24 ------------------------ srcpkgs/avidemux/template | 11 ++++++----- 2 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 srcpkgs/avidemux/patches/qt5.15.patch diff --git a/srcpkgs/avidemux/patches/qt5.15.patch b/srcpkgs/avidemux/patches/qt5.15.patch deleted file mode 100644 index e27ba4cb9e..0000000000 --- a/srcpkgs/avidemux/patches/qt5.15.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 1a8bb36c5a0392d1e4d1b23812a926dde2796d5c Mon Sep 17 00:00:00 2001 -From: eumagga0x2a -Date: Fri, 5 Jun 2020 11:41:37 +0200 -Subject: [PATCH] [Qt] Fix build with Qt 5.15 - ---- - avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp -index 59180d1dd..3c115a824 100644 ---- avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp -+++ avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp -@@ -12,6 +12,10 @@ - #include - #include - -+#if QT_VERSION >= QT_VERSION_CHECK(5,15,0) -+ #include -+#endif -+ - #include "ADM_default.h" - #include "DIA_flyDialogQt4.h" - diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template index 578597c788..7c7dea5b18 100644 --- a/srcpkgs/avidemux/template +++ b/srcpkgs/avidemux/template @@ -1,7 +1,7 @@ # Template file for 'avidemux' pkgname=avidemux -version=2.7.4 -revision=6 +version=2.7.6 +revision=1 # Can't be compiled for aarch64, arm* or mips* archs="x86_64* i686*" wrksrc="${pkgname}_${version}" @@ -18,15 +18,16 @@ license="GPL-2.0-or-later" homepage="http://avidemux.sourceforge.net/" changelog="http://avidemux.sourceforge.net/news.html" distfiles="${SOURCEFORGE_SITE}/avidemux/avidemux/${version}/${pkgname}_${version}.tar.gz" -checksum=7db0ac01c8255279a2c360ecb2725c27ea8a2c5bd1f38aeafabfed33ea588da9 +checksum=9a88741f3535443d4bde35d4207ca2ff96d3b136db2e7232cb50dd6b4eb293cf -do_build() { +do_configure() { MAKEFLAGS=${makejobs} \ bash bootStrap.bash \ --with-system-libass \ --with-system-liba52 \ --with-system-libmad \ - --with-system-libmp4v2 + --with-system-libmp4v2 \ + ${cross_compile} } do_install() { cp -aR install/usr ${DESTDIR}