extra/avidemux to 2.7.4-5

This commit is contained in:
Kevin Mihelich 2020-06-09 16:21:49 +00:00
parent 2a61453fde
commit 00efe3e0ca
3 changed files with 31 additions and 1 deletions

View file

@ -7,7 +7,7 @@
pkgbase=avidemux
pkgname=('avidemux-cli' 'avidemux-qt')
pkgver=2.7.4
pkgrel=4
pkgrel=5
pkgdesc='Graphical tool to edit video (filter/re-encode/split)'
url='http://fixounet.free.fr/avidemux/'
arch=('x86_64')
@ -18,14 +18,21 @@ makedepends=('cmake' 'libxslt' 'qt5-base' 'jack' 'libvorbis' 'libxv' 'opus' 'des
'libvdpau' 'libdca' 'fribidi' 'glu' 'qt5-tools' 'twolame' 'libfdk-aac' 'libass')
options=('!emptydirs')
source=(https://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz
log.diff qt-5.15.diff
https://github.com/mean00/avidemux2/commit/aac9d5f795ea0af1e8fd54613d7e4c2fdad343bd.patch)
sha256sums=('7db0ac01c8255279a2c360ecb2725c27ea8a2c5bd1f38aeafabfed33ea588da9'
'8b751d137037f22fd4ae6750709014bcf61269a18f1c32e1a91f481285c807aa'
'255a2446d493503dc237482f6fe26e2186f0ea0ef43ac9e17b8059fe232aad43'
'4c3a6653c238394f4df1a50c4431f5be702f2fa01820e78efecc31710b5b00ab')
sha512sums=('e6d0a9eb525d82d0bdecb41b50eaa5894134064148a1889e4bba704d512bb53f871f797444668a0601fecf4e0e61a1f1727b1c59d543860bb64c1a294eb9bf42'
'bbae5b4a549113b12e728c4c0ac8c1c92a0b7500be8dcecc791c16c9a913406feaa9f7bc477985970a920d2df391cc9392457512d84b9c4b829981cc072f2b2e'
'ed78c2a3e4ede4fed1d3ea353c7dc350dc73050f76c8112cb24d97b3eda01f7c186d5db199f71f56953c5e5d8104de44dc0e84e1bfa01b6647c050c11fc375f2'
'bf4245064f4b082fe12e3baa12261836e8aff81eafcd18f582f9fb258ab45f037434619b4e42e4aac2141f9f7811ce2beb43e38e3c42e9abcfed8e50984954bb')
prepare() {
cd ${pkgbase}_${pkgver}
patch -Np1 -i ../log.diff # don't hide the build output
patch -Np1 -i ../qt-5.15.diff # fix build against Qt 5.15.0
sed -i 's|../avidemux/qt4|../avidemux/qt4 -DLRELEASE_EXECUTABLE=/usr/bin/lrelease-qt5|' bootStrap.bash
sed -e 's|0.19|1.0|' -i avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt
patch -p1 -i ../aac9d5f795ea0af1e8fd54613d7e4c2fdad343bd.patch

12
extra/avidemux/log.diff Normal file
View file

@ -0,0 +1,12 @@
diff -u -r avidemux_2.7.4/bootStrap.bash avidemux_2.7.4-fix/bootStrap.bash
--- avidemux_2.7.4/bootStrap.bash 2019-08-15 07:25:40.000000000 +0000
+++ avidemux_2.7.4-fix/bootStrap.bash 2020-06-05 13:40:10.633140851 +0000
@@ -66,7 +66,7 @@
fi
cd $BUILDDIR
cmake $COMPILER $PKG $FAKEROOT $QT_FLAVOR -DCMAKE_EDIT_COMMAND=vim $INSTALL_PREFIX $EXTRA $BUILD_QUIRKS $ASAN $DEBUG -G "$BUILDER" $SOURCEDIR || fail cmakeZ
- make $PARAL >& /tmp/log$BUILDDIR || fail "make, result in /tmp/log$BUILDDIR"
+ make $PARAL || fail make
if [ "x$PKG" != "x" ] ; then
$FAKEROOT_COMMAND make package DESTDIR=$FAKEROOT_DIR/tmp || fail package
fi

View file

@ -0,0 +1,11 @@
diff -u -r avidemux_2.7.4/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp avidemux_2.7.4-fix/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp
--- avidemux_2.7.4/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp 2019-08-15 07:25:39.000000000 +0000
+++ avidemux_2.7.4-fix/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp 2020-06-05 13:48:28.014061206 +0000
@@ -8,6 +8,7 @@
***************************************************************************///
#include <QPainter>
+#include <QPainterPath>
#include <QRubberBand>
#include <QBoxLayout>
#include <QSizeGrip>