From 646a5c1cbfd95873950a87b5f75d52073a967023 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 28 May 2018 19:12:29 +0000 Subject: Mon May 28 19:12:29 UTC 2018 a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded. --- source/l/phonon/phonon.SlackBuild | 26 +++++++++++++++++++++----- source/l/phonon/slack-desc | 10 +++++----- 2 files changed, 26 insertions(+), 10 deletions(-) (limited to 'source/l/phonon') diff --git a/source/l/phonon/phonon.SlackBuild b/source/l/phonon/phonon.SlackBuild index 1ff8f1fa..7d31d9d9 100755 --- a/source/l/phonon/phonon.SlackBuild +++ b/source/l/phonon/phonon.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2008 Robby Workman, Northport, Alabama, USA -# Copyright 2008, 2009, 2010, 2011, 2012, 2015 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012, 2015, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,10 +23,11 @@ # Modified 2010, 2011, 2012, 2014 Eric Hameleers, Eindhoven, NL +cd $(dirname $0) ; CWD=$(pwd) PKGNAM=phonon VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:--j7} @@ -59,7 +60,22 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) +# Configure for ALSA only if PulseAudio is not installed: +if [ ! -r /usr/lib${LIBDIRSUFFIX}/pkgconfig/libpulse.pc ]; then + TAG="_alsa" + PULSEAUDIO=OFF +else + PULSEAUDIO=ON +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD$TAG.txz" + exit 0 +fi + TMP=${TMP:-/tmp} PKG=$TMP/package-phonon @@ -88,7 +104,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:ON \ + -DWITH_PulseAudio=BOOL:${PULSEAUDIO} \ .. make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 @@ -144,5 +160,5 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/phonon-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/phonon-$VERSION-$ARCH-$BUILD$TAG.txz diff --git a/source/l/phonon/slack-desc b/source/l/phonon/slack-desc index 12acecb6..97f667a4 100644 --- a/source/l/phonon/slack-desc +++ b/source/l/phonon/slack-desc @@ -1,8 +1,8 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| @@ -10,10 +10,10 @@ phonon: phonon (multimedia framework for KDE4) phonon: phonon: Phonon is the multimedia API provided by Qt and is the standard phonon: abstraction for handling multimedia streams within the KDE Software -phonon: Compilation. Phonon provides an API for multimedia using various +phonon: Compilation. Phonon provides an API for multimedia using various phonon: backends (gstreamer, mplayer, xine) to handle the lower level I/O. phonon: -phonon: Homepage: http://phonon.kde.org +phonon: Homepage: http://phonon.kde.org phonon: phonon: phonon: -- cgit v1.2.3