diff options
author | Eric Hameleers <alien@slackware.com> | 2016-01-21 09:50:47 +0100 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2016-01-21 09:50:47 +0100 |
commit | d35b569b0d7e8eee543799832edb62abd0453541 (patch) | |
tree | c45d0b5da11f86df731211c46a712808f39c7db8 /deps/qt5/qt5.SlackBuild | |
parent | 74d2be0456cf94c3080fcd98f7655907791e4b73 (diff) | |
download | ktown-d35b569b0d7e8eee543799832edb62abd0453541.tar.gz ktown-d35b569b0d7e8eee543799832edb62abd0453541.tar.xz |
Updated deps for the new KDE 5:
OpenAL: version bump.
qt5: rebuilt against PulseAudio.
phonon: rebuilt against PulseAudio.
Diffstat (limited to '')
-rwxr-xr-x | deps/qt5/qt5.SlackBuild | 14 |
1 files changed, 10 insertions, 4 deletions
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. |