From b68ae304a98e0cba99ee111db424012e573117ed Mon Sep 17 00:00:00 2001 From: Heinz Wiesinger Date: Sat, 13 Nov 2021 16:32:16 +0100 Subject: libraries/libffado: Various script cleanup - Depend on libxml++3 - Make desktop/icon file XDG compliant - Remove no longer used patch Signed-off-by: Heinz Wiesinger Signed-off-by: Willy Sudiarto Raharjo --- libraries/libffado/libffado-mixer.patch | 45 --------------------------------- libraries/libffado/libffado.SlackBuild | 36 ++++++++++++++++---------- libraries/libffado/libffado.info | 2 +- 3 files changed, 23 insertions(+), 60 deletions(-) delete mode 100644 libraries/libffado/libffado-mixer.patch (limited to 'libraries') 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 29f26f6f0d..3b2467b36b 100644 --- a/libraries/libffado/libffado.SlackBuild +++ b/libraries/libffado/libffado.SlackBuild @@ -2,7 +2,7 @@ # 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,22 +11,22 @@ # 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.4.4} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -81,6 +81,14 @@ 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 {} \; +# 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 + +# 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 \ @@ -100,9 +108,9 @@ scons \ 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 diff --git a/libraries/libffado/libffado.info b/libraries/libffado/libffado.info index 3fca3fcffb..e37e503c0f 100644 --- a/libraries/libffado/libffado.info +++ b/libraries/libffado/libffado.info @@ -5,6 +5,6 @@ DOWNLOAD="http://www.ffado.org/files/libffado-2.4.4.tgz" MD5SUM="f27970e21a80a1e9ccc1842c4a6a3c62" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="libconfig libdbus-c++ libiec61883 libxml++" +REQUIRES="libconfig libdbus-c++ libiec61883 libxml++3" MAINTAINER="Heinz Wiesinger" EMAIL="pprkut@slackbuilds.org" -- cgit v1.2.3