avidemux: update to 2.7.6

This commit is contained in:
Jürgen Buchmüller 2020-07-08 12:18:43 +02:00
parent a698f734ad
commit 93ef2997b2
2 changed files with 6 additions and 29 deletions

View file

@ -1,24 +0,0 @@
From 1a8bb36c5a0392d1e4d1b23812a926dde2796d5c Mon Sep 17 00:00:00 2001
From: eumagga0x2a <eumagga0x2a@users.noreply.github.com>
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 <QBoxLayout>
#include <QSizeGrip>
+#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
+ #include <QPainterPath>
+#endif
+
#include "ADM_default.h"
#include "DIA_flyDialogQt4.h"

View file

@ -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}