[arch-commits] Commit in libffado/trunk (PKGBUILD libffado-gcc47.patch)

[Allan McRae]

    Date: Sunday, April 29, 2012 @ 01:38:49
  Author: allan
Revision: 157741

upgpkg: libffado 2.0.1-6

move udev rules from /lib

Added:
  libffado/trunk/libffado-gcc47.patch
Modified:
  libffado/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   10 ++++++--
 libffado-gcc47.patch |   55 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-29 05:35:15 UTC (rev 157740)
+++ PKGBUILD	2012-04-29 05:38:49 UTC (rev 157741)
@@ -5,25 +5,29 @@
 
 pkgname=libffado
 pkgver=2.0.1
-pkgrel=5
+pkgrel=6
 pkgdesc="Driver for FireWire audio devices"
 arch=('i686' 'x86_64')
 url="http://www.ffado.org/"
 license=('GPL')
 depends=('libiec61883' 'libavc1394' 'libsigc++'
-          'libxml++' 'alsa-lib' 'dbus')
+         'libxml++' 'alsa-lib' 'dbus')
 makedepends=('scons' 'python2-pyqt')
 optdepends=('python2: ffado-diag'
             'python2-pyqt: mixer applet')
 provides=('ffado')
 source=("http://www.ffado.org/files/$pkgname-$pkgver.tar.gz"
+	"libffado-gcc47.patch"
         '60-ffado.rules')
 md5sums=('786f31facd417e6207e429f50af0e15e'
+         '287bb3f506e31626c4b8f91f0e1d9407'
          'f03a3e950801c4405b8934084651bca8')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  patch -p1 -i "$srcdir"/libffado-gcc47.patch
+
   # hack to use CFLAGS without optimising
   sed -i 's/-O2//g' SConstruct
 
@@ -49,7 +53,7 @@
   # add audio device rules
   # see https://bugs.archlinux.org/task/26342
   install -Dm644 "$srcdir/60-ffado.rules" \
-    "$pkgdir/lib/udev/rules.d/60-ffado.rules"
+    "$pkgdir/usr/lib/udev/rules.d/60-ffado.rules"
 
   # python2 fix
   for i in $(grep '^#!.*bin.*python' -R "$pkgdir" | sed 's/:.*//'); do

Added: libffado-gcc47.patch
===================================================================
--- libffado-gcc47.patch	                        (rev 0)
+++ libffado-gcc47.patch	2012-04-29 05:38:49 UTC (rev 157741)
@@ -0,0 +1,55 @@
+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"