diff options
| -rw-r--r-- | libraries/libffado/README | 2 | ||||
| -rw-r--r-- | libraries/libffado/libffado-gcc47.patch | 55 | ||||
| -rw-r--r-- | libraries/libffado/libffado.SlackBuild | 13 | ||||
| -rw-r--r-- | libraries/libffado/libffado.info | 8 |
4 files changed, 12 insertions, 66 deletions
diff --git a/libraries/libffado/README b/libraries/libffado/README index 76e354e23b5cf..9a0dcf50cbb58 100644 --- a/libraries/libffado/README +++ b/libraries/libffado/README @@ -15,3 +15,5 @@ KERNEL=="raw1394", GROUP="disk" to /lib/udev/rules.d/65-permissions.rules and make your user a member of the disk group. + +This optionally depends on libdbus-c++. diff --git a/libraries/libffado/libffado-gcc47.patch b/libraries/libffado/libffado-gcc47.patch deleted file mode 100644 index 8263728809237..0000000000000 --- a/libraries/libffado/libffado-gcc47.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -Naur libffado-2.0.1-old/src/bebob/bebob_dl_mgr.cpp libffado-2.0.1/src/bebob/bebob_dl_mgr.cpp ---- libffado-2.0.1-old/src/bebob/bebob_dl_mgr.cpp 2009-05-17 23:42:38.000000000 +1000 -+++ libffado-2.0.1/src/bebob/bebob_dl_mgr.cpp 2012-04-29 15:26:29.011454798 +1000 -@@ -35,6 +35,7 @@ - - #include <cstdio> - #include <cstring> -+#include <unistd.h> - - namespace BeBoB { - enum { -diff -Naur libffado-2.0.1-old/src/ffadodevice.cpp libffado-2.0.1/src/ffadodevice.cpp ---- libffado-2.0.1-old/src/ffadodevice.cpp 2008-11-23 21:25:32.000000000 +1000 -+++ libffado-2.0.1/src/ffadodevice.cpp 2012-04-29 15:26:54.883998052 +1000 -@@ -34,6 +34,7 @@ - - #include <iostream> - #include <sstream> -+#include <unistd.h> - - #include <assert.h> - -diff -Naur libffado-2.0.1-old/src/fireworks/fireworks_device.cpp libffado-2.0.1/src/fireworks/fireworks_device.cpp ---- libffado-2.0.1-old/src/fireworks/fireworks_device.cpp 2009-11-23 00:40:08.000000000 +1000 -+++ libffado-2.0.1/src/fireworks/fireworks_device.cpp 2012-04-29 15:27:24.123105334 +1000 -@@ -44,6 +44,7 @@ - #define FIREWORKS_MIN_FIRMWARE_VERSION 0x04080000 - - #include <sstream> -+#include <unistd.h> - using namespace std; - - // FireWorks is the platform used and developed by ECHO AUDIO -diff -Naur libffado-2.0.1-old/src/libieee1394/IsoHandlerManager.cpp libffado-2.0.1/src/libieee1394/IsoHandlerManager.cpp ---- libffado-2.0.1-old/src/libieee1394/IsoHandlerManager.cpp 2010-04-18 05:15:54.000000000 +1000 -+++ libffado-2.0.1/src/libieee1394/IsoHandlerManager.cpp 2012-04-29 15:27:44.515816147 +1000 -@@ -34,6 +34,7 @@ - #include "libutil/Configuration.h" - - #include <cstring> -+#include <unistd.h> - #include <assert.h> - - IMPL_DEBUG_MODULE( IsoHandlerManager, IsoHandlerManager, DEBUG_LEVEL_NORMAL ); -diff -Naur libffado-2.0.1-old/support/dbus/test-dbus.cpp libffado-2.0.1/support/dbus/test-dbus.cpp ---- libffado-2.0.1-old/support/dbus/test-dbus.cpp 2008-04-27 03:30:41.000000000 +1000 -+++ libffado-2.0.1/support/dbus/test-dbus.cpp 2012-04-29 15:28:31.531047923 +1000 -@@ -24,6 +24,7 @@ - #include <argp.h> - #include <stdlib.h> - #include <iostream> -+#include <unistd.h> - #include <signal.h> - - #include "controlclient.h" diff --git a/libraries/libffado/libffado.SlackBuild b/libraries/libffado/libffado.SlackBuild index d8017f5a3d865..5fb643187f852 100644 --- a/libraries/libffado/libffado.SlackBuild +++ b/libraries/libffado/libffado.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for libffado -# Copyright 2010-2012 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2010-2013 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libffado -VERSION=2.0.1 -BUILD=${BUILD:-2} +VERSION=2.1.0 +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -60,7 +60,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tgz cd $PRGNAM-$VERSION chown -R root:root . find . \ @@ -69,9 +69,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Fix building with gcc 4.7 -patch -p1 -i $CWD/libffado-gcc47.patch - # Use our CFLAGS sed -i "s/-O2 -DNDEBUG/$SLKCFLAGS -DNDEBUG/" SConstruct @@ -99,6 +96,8 @@ install -m 0644 support/xdg/hi64-apps-ffado.png \ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +find $PKG/usr/man -type f -exec gzip -9 {} \; + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS ChangeLog LICENSE* NEWS README TODO \ $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/libraries/libffado/libffado.info b/libraries/libffado/libffado.info index a298656133faa..0a1dfbcebb07c 100644 --- a/libraries/libffado/libffado.info +++ b/libraries/libffado/libffado.info @@ -1,10 +1,10 @@ PRGNAM="libffado" -VERSION="2.0.1" +VERSION="2.1.0" HOMEPAGE="http://www.ffado.org/" -DOWNLOAD="http://www.ffado.org/files/libffado-2.0.1.tar.gz" -MD5SUM="786f31facd417e6207e429f50af0e15e" +DOWNLOAD="http://www.ffado.org/files/libffado-2.1.0.tgz" +MD5SUM="26bce2be0b9c1fa4e614f2f494edf388" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="libiec61883 libxml++ scons" +REQUIRES="libconfig libiec61883 libxml++ scons" MAINTAINER="Heinz Wiesinger" EMAIL="pprkut@liwjatan.at" |