From ddfdebbe9bad6eeb4328fd23f657b86bb9fc0fb9 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Sat, 14 Sep 2019 13:08:13 +0200
Subject: Deps: updated for the upcoming release

The qt5 and qt5-speech packages have been updated to 5.13.1,
PyQt5 was updated to 5.13.0.
There's a new official polkit-qt5-1 version too: 0.113.0.
The cryfs package was updated to 0.10.2.
Tthe phonon layer is now Qt5-only:
  phonon 4.11.0, phonon-gstreamer 4.10.0, phonon-vlc 0.11.0.
---
 deps/phonon-vlc/.url                  |  2 +-
 deps/phonon-vlc/phonon-vlc.SlackBuild | 35 ++++++++---------------------------
 2 files changed, 9 insertions(+), 28 deletions(-)

(limited to 'deps/phonon-vlc')

diff --git a/deps/phonon-vlc/.url b/deps/phonon-vlc/.url
index 9353df9..fab73be 100644
--- a/deps/phonon-vlc/.url
+++ b/deps/phonon-vlc/.url
@@ -1,2 +1,2 @@
-https://download.kde.org/stable/phonon/phonon-backend-vlc/0.10.2/phonon-backend-vlc-0.10.2.tar.xz
+https://download.kde.org/stable/phonon/phonon-backend-vlc/0.11.0/phonon-backend-vlc-0.11.0.tar.xz
 
diff --git a/deps/phonon-vlc/phonon-vlc.SlackBuild b/deps/phonon-vlc/phonon-vlc.SlackBuild
index d5c2a2e..6c84cff 100755
--- a/deps/phonon-vlc/phonon-vlc.SlackBuild
+++ b/deps/phonon-vlc/phonon-vlc.SlackBuild
@@ -27,11 +27,9 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=phonon-vlc
 SRCNAM=phonon-backend-vlc
-VERSION=${VERSION:-0.10.2}
+VERSION=${VERSION:-0.11.0}
 BUILD=${BUILD:-1}
 
-NUMJOBS=${NUMJOBS:-"-j$(nproc)"}
-
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$(uname -m)" in
@@ -68,6 +66,8 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   exit 0
 fi
 
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
@@ -75,7 +75,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1
 cd $SRCNAM-$VERSION || exit 1
 
 chown -R root:root .
@@ -86,8 +86,10 @@ find . \
  -exec chmod 644 {} \;
 
 echo Building ...
-mkdir -p build
-cd build
+
+# Qt5 is the only supported Qt as if 0.11.0:
+mkdir -p build-qt5
+cd build-qt5
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
@@ -103,27 +105,6 @@ cd build
   make DESTDIR=$PKG install
 cd -
 
-# Conditional build of Qt5 support:
-if qtpaths-qt5 --qt-version 1>/dev/null 2>/dev/null ; then
-  mkdir -p build-qt5
-  cd build-qt5
-    cmake \
-      -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-      -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-      -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-      -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DMAN_INSTALL_DIR=/usr/man \
-      -DSYSCONF_INSTALL_DIR=/etc \
-      -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-      -DPHONON_BUILD_PHONON4QT5=ON \
-      ..
-    make $NUMJOBS
-    make DESTDIR=$PKG install
-  cd -
-fi
-
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-- 
cgit v1.2.3