diff options
| -rw-r--r-- | libraries/libffado/libffado-mixer.patch | 45 | ||||
| -rw-r--r-- | libraries/libffado/libffado.SlackBuild | 19 | ||||
| -rw-r--r-- | libraries/libffado/libffado.info | 6 |
3 files changed, 59 insertions, 11 deletions
diff --git a/libraries/libffado/libffado-mixer.patch b/libraries/libffado/libffado-mixer.patch new file mode 100644 index 0000000000..30ab57ce1d --- /dev/null +++ b/libraries/libffado/libffado-mixer.patch @@ -0,0 +1,45 @@ +--- 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 1d71ac9a37..f0bc67fb3b 100644 --- a/libraries/libffado/libffado.SlackBuild +++ b/libraries/libffado/libffado.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libffado -VERSION=2.1.0 +VERSION=${VERSION:-2.2.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -64,18 +64,21 @@ tar xvf $CWD/$PRGNAM-$VERSION.tgz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -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 +patch -p1 < $CWD/libffado-mixer.patch + scons \ PREFIX=/usr \ LIBDIR=/usr/lib${LIBDIRSUFFIX} \ DIST_TARGET="$TARGET" \ + COMPILE_FLAGS="$CFLAGS -std=gnu++11" \ DEBUG="False" scons \ @@ -93,14 +96,14 @@ install -m 0644 support/xdg/ffado.org-ffadomixer.desktop \ install -m 0644 support/xdg/hi64-apps-ffado.png \ $PKG/usr/share/pixmaps/ffado.png -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +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 find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS ChangeLog LICENSE* NEWS README TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS ChangeLog LICENSE* README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/libraries/libffado/libffado.info b/libraries/libffado/libffado.info index 01016f084e..04eee7ed85 100644 --- a/libraries/libffado/libffado.info +++ b/libraries/libffado/libffado.info @@ -1,8 +1,8 @@ PRGNAM="libffado" -VERSION="2.1.0" +VERSION="2.2.1" HOMEPAGE="http://www.ffado.org/" -DOWNLOAD="http://pkgs.fedoraproject.org/repo/pkgs/libffado/libffado-2.1.0.tgz/26bce2be0b9c1fa4e614f2f494edf388/libffado-2.1.0.tgz" -MD5SUM="26bce2be0b9c1fa4e614f2f494edf388" +DOWNLOAD="http://www.ffado.org/files/libffado-2.2.1.tgz" +MD5SUM="e113d828835051f835fb4a329cb0cbd4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libconfig libiec61883 libxml++" |