multimedia/avidemux: Updated for version 2.7.4.

This introduces the new dependency qt5

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

3 files changed, 18 insertions, 155 deletions

diff --git a/multimedia/avidemux/README b/multimedia/avidemux/README
index c51dee2b3a4c..32c356af2c6a 100644
--- a/multimedia/avidemux/README
+++ b/multimedia/avidemux/README
@@ -3,18 +3,5 @@ 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.
 
-By default only the cli and qt4 interfaces are built. Upstream currently
-does not support the gtk interface and while it may build, the gtk gui
-crashes during startup. To enable (or disable) an interface, use the
-WITH_CLI, WITH_QT4, and WITH_GTK variables as such:
-
-WITH_CLI=NO sh ./avidemux.SlackBuild
-
-or, if you use fakeroot:
-
-fakeroot env WITH_GTK=YES sh ./avidemux.SlackBuild
-
-though building the gtk is not recommended or supported.
-
 Optional dependencies are aften, amrnb, jack-audio-connection-kit,
-and x265.
+nv-codec-headers and x265.
diff --git a/multimedia/avidemux/avidemux.SlackBuild b/multimedia/avidemux/avidemux.SlackBuild
index eb6fc5c7b36c..e1ae707bad84 100644
--- a/multimedia/avidemux/avidemux.SlackBuild
+++ b/multimedia/avidemux/avidemux.SlackBuild
@@ -5,7 +5,7 @@
 # Derived from a SlackBuild by Eric Hameleers.
 # Copyright 2009, 2010, 2011, 2013  Eric Hameleers, Eindhoven, NL
 # Copyright 2015 John Vogel Corning, NY USA
-# Copyright 2017-2018 Matteo Bernardini, Pisa, IT
+# Copyright 2017-2019 Matteo Bernardini, Pisa, IT
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=avidemux
-VERSION=${VERSION:-2.7.1}
+VERSION=${VERSION:-2.7.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -74,145 +74,21 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-WITH_CLI=${WITH_CLI:-YES}
-WITH_QT4=${WITH_QT4:-YES}
-WITH_GTK=${WITH_GTK:-NO}
-
-mkdir -p build_core
-cd build_core
-cmake \
-  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-  -DCMAKE_INSTALL_PREFIX=/usr \
-  -DFAKEROOT="$PKG" \
-  ../avidemux_core
-make
-make -j 1 install DESTDIR=$PKG
-cd ..
-
-if [ "x$WITH_QT4" = "xYES" ]; then
-  mkdir -p build_qt4
-  cd build_qt4
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DFAKEROOT="$PKG" \
-    ../avidemux/qt4
-  make
-  make -j 1 install DESTDIR=$PKG
-  cd ..
-fi
-
-if [ "x$WITH_GTK" = "xYES" ]; then
-  mkdir -p build_gtk
-  cd build_gtk
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DFAKEROOT="$PKG" \
-    ../avidemux/gtk
-  make
-  make -j 1 install DESTDIR=$PKG
-  cd ..
-fi
-
-if [ "x$WITH_CLI" = "xYES" ]; then
-  mkdir -p build_cli
-  cd build_cli
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DFAKEROOT="$PKG" \
-    ../avidemux/cli
-  make
-  make -j 1 install DESTDIR=$PKG
-  cd ..
-fi
+sed -i 's|../avidemux/qt4|../avidemux/qt4 -DLRELEASE_EXECUTABLE=/usr/bin/lrelease-qt5|' bootStrap.bash || exit 1
+sed -i 's|0.19|1.0|' avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt || exit 1
 
-mkdir -p build_plugins_common
-cd build_plugins_common
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DAVIDEMUX_SOURCE_DIR="$TMP/${PRGNAM}_${VERSION}" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPLUGIN_UI=COMMON \
-    -DFAKEROOT="$PKG" \
-    ../avidemux_plugins
-  make
-  make -j 1 install DESTDIR=$PKG
-cd ..
-
-if [ "x$WITH_QT4" = "xYES" ]; then
-  mkdir -p build_plugins_qt4
-  cd build_plugins_qt4
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DAVIDEMUX_SOURCE_DIR="$TMP/${PRGNAM}_${VERSION}" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPLUGIN_UI=QT4 \
-    -DFAKEROOT="$PKG" \
-    ../avidemux_plugins
-  make
-  make -j 1 install DESTDIR=$PKG
-  cd ..
-fi
+bash bootStrap.bash --with-core --with-cli --with-plugins
 
-if [ "x$WITH_GTK" = "xYES" ]; then
-  mkdir -p build_plugins_gtk
-  cd build_plugins_gtk
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DAVIDEMUX_SOURCE_DIR="$TMP/${PRGNAM}_${VERSION}" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPLUGIN_UI=GTK \
-    -DFAKEROOT="$PKG" \
-    ../avidemux_plugins
-  make
-  make -j 1 install DESTDIR=$PKG
-  cd ..
-fi
+make -C buildCli DESTDIR="$PKG" install
+make -C buildCore DESTDIR="$PKG" install
+make -C buildPluginsCLI DESTDIR="$PKG" install
+make -C buildPluginsCommon DESTDIR="$PKG" install
 
-if [ "x$WITH_CLI" = "xYES" ]; then
-  mkdir -p build_plugins_cli
-  cd build_plugins_cli
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DAVIDEMUX_SOURCE_DIR="$TMP/${PRGNAM}_${VERSION}" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPLUGIN_UI=CLI \
-    -DFAKEROOT="$PKG" \
-    ../avidemux_plugins
-  make
-  make -j 1 install DESTDIR=$PKG
-  cd ..
-fi
+install -Dm 644 avidemux_icon.png $PKG/usr/share/pixmaps/avidemux.png
+install -Dm 644 man/avidemux.1 $PKG/usr/man/man1
 
-mkdir -p $PKG/usr/share/applications
-mkdir -p $PKG/usr/share/pixmaps
-if [ "x$WITH_QT4" = "xYES" ]; then
-	cat avidemux2.desktop | sed -e 's/avidemux2$/avidemux/' -e 's/3_qt5/3_qt4/' >\
-		$PKG/usr/share/applications/avidemux_qt.desktop
-fi
-if [ "x$WITH_GTK" = "xYES" ]; then
-	cat avidemux2.desktop | sed -e 's/avidemux2$/avidemux/' -e 's/2_gtk/3_gtk/' >\
-		$PKG/usr/share/applications/avidemux_gtk.desktop
-fi
-install -m644 avidemux_icon.png $PKG/usr/share/pixmaps/avidemux.png
-for sz in 16x16 32x32 48x48 64x64 ; do
-  mkdir -p $PKG/usr/share/icons/hicolor/$sz/apps
-  convert avidemux_icon.png -resize $sz \
-    $PKG/usr/share/icons/hicolor/$sz/apps/avidemux.png
-done
-
-mkdir -p $PKG/usr/man/man1
-gzip -c man/avidemux.1 > $PKG/usr/man/man1/avidemux.1.gz
+make -C buildQt5 DESTDIR="$PKG" install
+make -C buildPluginsQt5 DESTDIR="$PKG" install
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/multimedia/avidemux/avidemux.info b/multimedia/avidemux/avidemux.info
index 879c10f349d5..bafc51fb4f89 100644
--- a/multimedia/avidemux/avidemux.info
+++ b/multimedia/avidemux/avidemux.info
@@ -1,10 +1,10 @@
 PRGNAM="avidemux"
-VERSION="2.7.1"
+VERSION="2.7.4"
 HOMEPAGE="http://avidemux.org"
-DOWNLOAD="http://downloads.sf.net/avidemux/avidemux_2.7.1.tar.gz"
-MD5SUM="e3510c858c9371283551b1b4b67d288b"
+DOWNLOAD="http://downloads.sf.net/avidemux/avidemux_2.7.4.tar.gz"
+MD5SUM="87b4dd1ef3a1f695b3d0f9971da8abde"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="faac faad2 lame libdca x264 xvidcore"
+REQUIRES="faac faad2 lame libdca qt5 x264 xvidcore"
 MAINTAINER="Matteo Bernardini"
 EMAIL="ponce@slackbuilds.org"