From d35b569b0d7e8eee543799832edb62abd0453541 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Thu, 21 Jan 2016 09:50:47 +0100
Subject: Updated deps for the new KDE 5:

OpenAL: version bump.
qt5: rebuilt against PulseAudio.
phonon: rebuilt against PulseAudio.
---
 deps/OpenAL/OpenAL.SlackBuild |  2 +-
 deps/phonon/.url              |  1 +
 deps/phonon/phonon.SlackBuild | 14 +++++++++++---
 deps/qt5/qt5.SlackBuild       | 14 ++++++++++----
 4 files changed, 23 insertions(+), 8 deletions(-)
 create mode 100644 deps/phonon/.url

(limited to 'deps')

diff --git a/deps/OpenAL/OpenAL.SlackBuild b/deps/OpenAL/OpenAL.SlackBuild
index 8fa7162..66f98b3 100755
--- a/deps/OpenAL/OpenAL.SlackBuild
+++ b/deps/OpenAL/OpenAL.SlackBuild
@@ -26,7 +26,7 @@
 PKGNAM=OpenAL
 SRCNAM=openal-soft
 VERSION=${VERSION:-1.17.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 NUMJOBS=${NUMJOBS:" -j4 "}
 
 CWD=$(pwd)
diff --git a/deps/phonon/.url b/deps/phonon/.url
new file mode 100644
index 0000000..4e1a11b
--- /dev/null
+++ b/deps/phonon/.url
@@ -0,0 +1 @@
+http://download.kde.org/stable/phonon/4.8.3/src/phonon-4.8.3.tar.xz
diff --git a/deps/phonon/phonon.SlackBuild b/deps/phonon/phonon.SlackBuild
index 1d1bc29..b92a87b 100755
--- a/deps/phonon/phonon.SlackBuild
+++ b/deps/phonon/phonon.SlackBuild
@@ -26,7 +26,7 @@
 
 PKGNAM=phonon
 VERSION=${VERSION:-4.8.3}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 NUMJOBS=${NUMJOBS:--j7}
 
@@ -76,6 +76,13 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Check if we have pulseaudio:
+if pkg-config --exists libpulse 2>/dev/null ; then
+  DOPULSE="ON"
+else
+  DOPULSE="OFF"
+fi
+
 mkdir build
 cd build
   cmake \
@@ -87,7 +94,7 @@ cd build
     -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=ON \
     -DPHONON_QT_PLUGIN_INSTALL_DIR=/usr/lib$LIBDIRSUFFIX/qt/plugins/designer \
     -DWITH_QZeitgeist=BOOL:OFF \
-    -DWITH_PulseAudio=BOOL:OFF \
+    -DWITH_PulseAudio=BOOL:${DOPULSE} \
     ..
   make $NUMJOBS || make || exit 1
   make install DESTDIR=$PKG || exit 1
@@ -106,8 +113,9 @@ if qtpaths-qt5 --qt-version 1>/dev/null 2>/dev/null ; then
       -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=ON \
       -DPHONON_QT_PLUGIN_INSTALL_DIR=/usr/lib$LIBDIRSUFFIX/qt/plugins/designer \
       -DWITH_QZeitgeist=BOOL:OFF \
-      -DWITH_PulseAudio=BOOL:OFF \
+      -DWITH_PulseAudio=BOOL:${DOPULSE} \
       -DPHONON_BUILD_PHONON4QT5=ON \
+      -D__KDE_HAVE_GCC_VISIBILITY=NO \
       -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt5 \
       ..
     make $NUMJOBS || make || exit 1
diff --git a/deps/qt5/qt5.SlackBuild b/deps/qt5/qt5.SlackBuild
index 719f71b..ef123fc 100755
--- a/deps/qt5/qt5.SlackBuild
+++ b/deps/qt5/qt5.SlackBuild
@@ -47,7 +47,7 @@
 
 PKGNAM=qt5
 VERSION=${VERSION:-5.5.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:--j7}
 
@@ -129,8 +129,14 @@ fi
 # Fix path to mysql header:
 cat $CWD/patches/qt5.mysql.h.diff | patch -p1 --verbose || exit 1
 
-# Forcibly disable pulseaudio in qtwebengine:
-cat $CWD/patches/qt5.pulseaudio.diff | patch -p1 --verbose || exit 1
+if ! pkg-config --exists libpulse 2>/dev/null ; then
+  # Forcibly disable pulseaudio in qtwebengine:
+  cat $CWD/patches/qt5.pulseaudio.diff | patch -p1 --verbose || exit 1
+  # Disable pulseaudio in Qt5:
+  PACONF="-no-pulseaudio"
+else
+  PACONF=" "
+fi
 
 # Install path fix for libplatformplugin.so:
 # See https://bugs.webkit.org/show_bug.cgi?id=117077
@@ -178,10 +184,10 @@ export QT_PLUGIN_PATH="${QTDIR}/qtbase/plugins"
   -xcb \
   -nomake examples \
   -nomake tests \
-  -no-pulseaudio \
   -no-separate-debug-info \
   -no-strip \
   -no-use-gold-linker \
+  ${PACONF} \
   ${RELOCATIONS} \
   -no-pch \
   # No-precompiled-headers is ccache-friendly.
-- 
cgit v1.2.3