Fri Oct 11 00:07:27 PDT 2013

2 files changed, 101 insertions, 7 deletions

diff --git a/extra/libffado/PKGBUILD b/extra/libffado/PKGBUILD
index d1a09155e..9510acf06 100644
--- a/extra/libffado/PKGBUILD
+++ b/extra/libffado/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 168113 2012-10-06 05:43:33Z schiv $
+# $Id: PKGBUILD 196292 2013-10-10 19:31:03Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: galiyosha@gmail.com
 # Contributor: Jon Kristian Nilsen <jokr.nilsen@gmail.com>
 
 pkgname=libffado
 pkgver=2.1.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Driver for FireWire audio devices"
 arch=('i686' 'x86_64')
 url="http://www.ffado.org/"
@@ -17,9 +17,11 @@ optdepends=('python2: ffado-diag'
             'python2-pyqt: mixer applet')
 provides=('ffado')
 source=("http://www.ffado.org/files/$pkgname-$pkgver.tgz"
-        'python2-qt.patch')
+        'python2-qt.patch'
+        'rules.patch')
 md5sums=('26bce2be0b9c1fa4e614f2f494edf388'
-         '10aa837f5521da213caa93e1ddc58c0e')
+         '10aa837f5521da213caa93e1ddc58c0e'
+         'da1102bfb02e67b3dfcb3947435a81e9')
 
 _scons-conf() {
   scons DEBUG=False \
@@ -29,13 +31,21 @@ _scons-conf() {
         COMPILE_FLAGS="$CFLAGS" $@
 }
 
-build() {
+prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
   # python2 fix
   patch -Np1 -i "$srcdir/python2-qt.patch"
 
-  # build!
+  # rule comments must be on their own line
+  # see https://bugs.archlinux.org/task/36949
+  # and http://subversion.ffado.org/ticket/373
+  patch -Np0 -i "$srcdir/rules.patch"
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
   if [ "$CARCH" = 'x86_64' ]; then
     _scons-conf ENABLE_OPTIMIZATIONS=True
   else
@@ -53,7 +63,7 @@ package() {
     "$pkgdir/usr/share/applications/ffadomixer.desktop"
 
   install -Dm644 support/xdg/hi64-apps-ffado.png \
-    "$pkgdir/usr/share/pixmaps/$pkgname.png"
+    "$pkgdir/usr/share/pixmaps/ffado.png"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/libffado/rules.patch b/extra/libffado/rules.patch
new file mode 100644
index 000000000..8e37c164a
--- /dev/null
+++ b/extra/libffado/rules.patch
@@ -0,0 +1,84 @@
+--- libffado/60-ffado.rules	
++++ libffado/60-ffado.rules	
+@@ -1,35 +1,58 @@ 
+ SUBSYSTEM!="firewire", GOTO="ffado_end"
+ 
+-ATTR{vendor}=="0x000166", GROUP="audio", ENV{ID_FFADO}="1" # TC GROUP A/S
+-ATTR{vendor}=="0x0001f2", GROUP="audio", ENV{ID_FFADO}="1" # Mark of the Unicorn, Inc. (aka MOTU)
+-ATTR{vendor}=="0x0003db", GROUP="audio", ENV{ID_FFADO}="1" # Apogee Electronics Corp.
+-ATTR{vendor}=="0x000595", GROUP="audio", ENV{ID_FFADO}="1" # Alesis Corporation
+-ATTR{vendor}=="0x0007f5", GROUP="audio", ENV{ID_FFADO}="1" # Bridgeco Co AG
+-ATTR{vendor}=="0x000a92", GROUP="audio", ENV{ID_FFADO}="1" # Presonus Corporation
+-ATTR{vendor}=="0x000aac", GROUP="audio", ENV{ID_FFADO}="1" # TerraTec Electronic GmbH
+-ATTR{vendor}=="0x000d6c", GROUP="audio", ENV{ID_FFADO}="1" # M-Audio
+-ATTR{vendor}=="0x000f1b", GROUP="audio", ENV{ID_FFADO}="1" # Ego Systems Inc.
+-ATTR{vendor}=="0x000ff2", GROUP="audio", ENV{ID_FFADO}="1" # Loud Technologies Inc.
+-ATTR{vendor}=="0x001260", GROUP="audio", ENV{ID_FFADO}="1" # Stanton Magnetics,inc.
+-ATTR{vendor}=="0x00130e", GROUP="audio", ENV{ID_FFADO}="1" # Focusrite Audio Engineering Limited
+-ATTR{vendor}=="0x001486", GROUP="audio", ENV{ID_FFADO}="1" # Echo Digital Audio Corporation
+-ATTR{vendor}=="0x001496", GROUP="audio", ENV{ID_FFADO}="1" # Phonic Corporation
+-ATTR{vendor}=="0x001564", GROUP="audio", ENV{ID_FFADO}="1" # BEHRINGER Spezielle Studiotechnik GmbH
+-ATTR{vendor}=="0x001c2d", GROUP="audio", ENV{ID_FFADO}="1" # FlexRadio Systems
+-ATTR{vendor}=="0x001c6a", GROUP="audio", ENV{ID_FFADO}="1" # Weiss Engineering Ltd.
+-ATTR{vendor}=="0x0040ab", GROUP="audio", ENV{ID_FFADO}="1" # ROLAND DG CORPORATION
+-ATTR{vendor}=="0x000f64", GROUP="audio", ENV{ID_FFADO}="1" # DnR
++# TC GROUP A/S
++ATTR{vendor}=="0x000166", GROUP="audio", ENV{ID_FFADO}="1"
++# Mark of the Unicorn, Inc. (aka MOTU)
++ATTR{vendor}=="0x0001f2", GROUP="audio", ENV{ID_FFADO}="1"
++# Apogee Electronics Corp.
++ATTR{vendor}=="0x0003db", GROUP="audio", ENV{ID_FFADO}="1"
++# Alesis Corporation
++ATTR{vendor}=="0x000595", GROUP="audio", ENV{ID_FFADO}="1"
++# Bridgeco Co AG
++ATTR{vendor}=="0x0007f5", GROUP="audio", ENV{ID_FFADO}="1"
++# Presonus Corporation
++ATTR{vendor}=="0x000a92", GROUP="audio", ENV{ID_FFADO}="1"
++# TerraTec Electronic GmbH
++ATTR{vendor}=="0x000aac", GROUP="audio", ENV{ID_FFADO}="1"
++# M-Audio
++ATTR{vendor}=="0x000d6c", GROUP="audio", ENV{ID_FFADO}="1"
++# Ego Systems Inc.
++ATTR{vendor}=="0x000f1b", GROUP="audio", ENV{ID_FFADO}="1"
++# Loud Technologies Inc.
++ATTR{vendor}=="0x000ff2", GROUP="audio", ENV{ID_FFADO}="1"
++# Stanton Magnetics,inc.
++ATTR{vendor}=="0x001260", GROUP="audio", ENV{ID_FFADO}="1"
++# Focusrite Audio Engineering Limited
++ATTR{vendor}=="0x00130e", GROUP="audio", ENV{ID_FFADO}="1"
++# Echo Digital Audio Corporation
++ATTR{vendor}=="0x001486", GROUP="audio", ENV{ID_FFADO}="1"
++# Phonic Corporation
++ATTR{vendor}=="0x001496", GROUP="audio", ENV{ID_FFADO}="1"
++# BEHRINGER Spezielle Studiotechnik GmbH
++ATTR{vendor}=="0x001564", GROUP="audio", ENV{ID_FFADO}="1"
++# FlexRadio Systems
++ATTR{vendor}=="0x001c2d", GROUP="audio", ENV{ID_FFADO}="1"
++# Weiss Engineering Ltd.
++ATTR{vendor}=="0x001c6a", GROUP="audio", ENV{ID_FFADO}="1"
++# ROLAND DG CORPORATION
++ATTR{vendor}=="0x0040ab", GROUP="audio", ENV{ID_FFADO}="1"
++# DnR
++ATTR{vendor}=="0x000f64", GROUP="audio", ENV{ID_FFADO}="1"
+ 
+ # The devices below are by vendors who make other firewire devices in
+ # addition to their audio interfaces.  They need more specific rules to
+ # ensure only audio interfaces are covered here.
+ 
+-ATTR{vendor}=="0x00022e", ATTR{model}=="0x010067", GROUP="audio", ENV{ID_FFADO}="1" # Tascam, a subsiduary of TEAC (the OUI is TEAC's)
++# Tascam, a subsiduary of TEAC (the OUI is TEAC's)
++ATTR{vendor}=="0x00022e", ATTR{model}=="0x010067", GROUP="audio", ENV{ID_FFADO}="1"
+ 
+ # The devices below abuse another Vendor's ID, and therefore we need more advanced rules for those.
+ 
+-ATTR{vendor}=="0x00000a", ATTR{model}=="0x030000", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1" # CME, Matrix K FW
+-ATTR{vendor}=="0x00000f", ATTR{model}=="0x01006?", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1" # Mackie, Onyx Firewire 
+-ATTR{vendor}=="0x000a35", ATTR{units}=="0x000a35:0x00000[12]", GROUP="audio", ENV{ID_FFADO}="1" # RME
++# CME, Matrix K FW
++ATTR{vendor}=="0x00000a", ATTR{model}=="0x030000", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1"
++# Mackie, Onyx Firewire 
++ATTR{vendor}=="0x00000f", ATTR{model}=="0x01006?", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1"
++# RME
++ATTR{vendor}=="0x000a35", ATTR{units}=="0x000a35:0x00000[12]", GROUP="audio", ENV{ID_FFADO}="1"
+ 
+ LABEL="ffado_end"