diff --git a/multimedia/converter/avidemux/files/log.diff b/multimedia/converter/avidemux/files/log.diff new file mode 100644 index 0000000000..4f50635ef1 --- /dev/null +++ b/multimedia/converter/avidemux/files/log.diff @@ -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 diff --git a/multimedia/converter/avidemux/files/qt-5.15.diff b/multimedia/converter/avidemux/files/qt-5.15.diff new file mode 100644 index 0000000000..5ebe3753c2 --- /dev/null +++ b/multimedia/converter/avidemux/files/qt-5.15.diff @@ -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 ++#include + #include + #include + #include diff --git a/multimedia/converter/avidemux/pspec.xml b/multimedia/converter/avidemux/pspec.xml index 1ca6ba528b..4e0dee978f 100755 --- a/multimedia/converter/avidemux/pspec.xml +++ b/multimedia/converter/avidemux/pspec.xml @@ -14,7 +14,7 @@ app:console Simple video editing/encoding tool Avidemux is a video editor designed for simple cutting, filtering and encoding tasks. It supports many file types, including AVI, DVD compatible MPEG files, MP4 and ASF using a variety of codecs. Tasks can be automated using projects, job queue and powerful scripting capabilities. - mirrors://sourceforge/avidemux/avidemux_2.7.4.tar.gz + mirrors://sourceforge/avidemux/avidemux_2.7.6.tar.gz qt5-base-devel qt5-assistant-devel @@ -66,9 +66,14 @@ libvorbis-devel fontconfig-devel opencore-amr-devel + libfdk-aac-devel pulseaudio-libs-devel jack-audio-connection-kit-devel + + log.diff + qt-5.15.diff + @@ -106,6 +111,7 @@ libvorbis fontconfig opencore-amr + libfdk-aac pulseaudio-libs jack-audio-connection-kit @@ -191,6 +197,13 @@ + + 2020-10-15 + 2.7.6 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2020-03-08 2.7.4