diff options
Diffstat (limited to 'libraries/libffado')
-rw-r--r-- | libraries/libffado/doinst.sh | 6 | ||||
-rw-r--r-- | libraries/libffado/libffado-mixer.patch | 45 | ||||
-rw-r--r-- | libraries/libffado/libffado.SlackBuild | 78 | ||||
-rw-r--r-- | libraries/libffado/libffado.info | 10 |
4 files changed, 52 insertions, 87 deletions
diff --git a/libraries/libffado/doinst.sh b/libraries/libffado/doinst.sh index 2a90c874a7..2e82bb7622 100644 --- a/libraries/libffado/doinst.sh +++ b/libraries/libffado/doinst.sh @@ -1,9 +1,3 @@ if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1 fi - -if [ -x /usr/bin/gtk-update-icon-cache ] \ - && [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 -fi - diff --git a/libraries/libffado/libffado-mixer.patch b/libraries/libffado/libffado-mixer.patch deleted file mode 100644 index 30ab57ce1d..0000000000 --- a/libraries/libffado/libffado-mixer.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/tests/test-enhanced-mixer.cpp -+++ b/tests/test-enhanced-mixer.cpp -@@ -77,7 +77,7 @@ - exit(0); - } - -- int errno = 0; -+ extern int errno; - char* tail; - int node_id = strtol( argv[1], &tail, 0 ); - int fb_id = strtol( argv[2], &tail, 0 ); ---- a/tests/test-mixer.cpp -+++ b/tests/test-mixer.cpp -@@ -227,7 +227,7 @@ - exit(0); - } - -- int errno = 0; -+ extern int errno; - char* tail; - int port = strtol( argv[1], &tail, 0 ); - int node_id = strtol( argv[2], &tail, 0 ); ---- a/tests/test-pan.cpp -+++ b/tests/test-pan.cpp -@@ -131,7 +131,7 @@ - exit(0); - } - -- int errno = 0; -+ extern int errno; - char* tail; - int node_id = strtol( argv[1], &tail, 0 ); - int fb_id = strtol( argv[2], &tail, 0 ); ---- a/tests/test-volume.cpp -+++ b/tests/test-volume.cpp -@@ -127,7 +127,7 @@ - exit(0); - } - -- int errno = 0; -+ extern int errno; - char* tail; - int node_id = strtol( argv[1], &tail, 0 ); - int fb_id = strtol( argv[2], &tail, 0 ); - diff --git a/libraries/libffado/libffado.SlackBuild b/libraries/libffado/libffado.SlackBuild index f0bc67fb3b..3b2467b36b 100644 --- a/libraries/libffado/libffado.SlackBuild +++ b/libraries/libffado/libffado.SlackBuild @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for libffado -# Copyright 2010-2013 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2010-2021 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -11,37 +11,47 @@ # 1. Redistributions of this script must retain the above copyright # notice, this list of conditions and the following disclaimer. # -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libffado -VERSION=${VERSION:-2.2.1} -BUILD=${BUILD:-1} +VERSION=${VERSION:-2.4.4} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -CWD=$(pwd) +# 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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" TARGET="i386" elif [ "$ARCH" = "i686" ]; then @@ -54,6 +64,8 @@ elif [ "$ARCH" = "x86_64" ]; then TARGET="x86_64" fi +PYTHON_VERSION=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') + set -e rm -rf $PKG @@ -69,32 +81,36 @@ 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 {} \; -# Use our CFLAGS -sed -i "s/-O2 -DNDEBUG/$SLKCFLAGS -DNDEBUG/" SConstruct +# fix icon name, so it's coherent with XDG desktop file name +sed -i 's/hi64-apps-ffado/ffado-mixer/g' \ + support/xdg/ffado.org-ffadomixer.desktop -patch -p1 < $CWD/libffado-mixer.patch +# fix id, so it's coherent with XDG desktop file name +sed -i 's/ffado.org-ffadomixer.desktop/ffado-mixer.desktop/g' \ + support/xdg/ffado-mixer.appdata.xml +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -std=gnu++11 -Wno-deprecated-declarations" \ scons \ PREFIX=/usr \ LIBDIR=/usr/lib${LIBDIRSUFFIX} \ DIST_TARGET="$TARGET" \ - COMPILE_FLAGS="$CFLAGS -std=gnu++11" \ - DEBUG="False" + PYTHON_INTERPRETER='/usr/bin/python3' \ + PYPKGDIR="/usr/lib$LIBDIRSUFFIX/python${PYTHON_VERSION}/site-packages" \ + CUSTOM_ENV="True" \ + DEBUG="False" \ + UDEVDIR='/lib/udev/rules.d' scons \ - --implicit-deps-unchanged \ - PREFIX=/usr \ - LIBDIR=/usr/lib${LIBDIRSUFFIX} \ - DIST_TARGET="$TARGET" \ - DEBUG="False" \ DESTDIR=$PKG \ + WILL_DEAL_WITH_XDG_MYSELF="True" \ install mkdir -p $PKG/usr/share/{applications,pixmaps} install -m 0644 support/xdg/ffado.org-ffadomixer.desktop \ - $PKG/usr/share/applications/ffadomixer.desktop + $PKG/usr/share/applications/ffado-mixer.desktop install -m 0644 support/xdg/hi64-apps-ffado.png \ - $PKG/usr/share/pixmaps/ffado.png + $PKG/usr/share/pixmaps/ffado-mixer.png 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 @@ -111,4 +127,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/libffado/libffado.info b/libraries/libffado/libffado.info index 04eee7ed85..e37e503c0f 100644 --- a/libraries/libffado/libffado.info +++ b/libraries/libffado/libffado.info @@ -1,10 +1,10 @@ PRGNAM="libffado" -VERSION="2.2.1" +VERSION="2.4.4" HOMEPAGE="http://www.ffado.org/" -DOWNLOAD="http://www.ffado.org/files/libffado-2.2.1.tgz" -MD5SUM="e113d828835051f835fb4a329cb0cbd4" +DOWNLOAD="http://www.ffado.org/files/libffado-2.4.4.tgz" +MD5SUM="f27970e21a80a1e9ccc1842c4a6a3c62" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="libconfig libiec61883 libxml++" +REQUIRES="libconfig libdbus-c++ libiec61883 libxml++3" MAINTAINER="Heinz Wiesinger" -EMAIL="pprkut@liwjatan.at" +EMAIL="pprkut@slackbuilds.org" |