[arch-commits] Commit in libffado/repos (4 files)

Sat Nov 19 21:35:53 UTC 2011

Date: Saturday, November 19, 2011 @ 16:35:53
  Author: schiv
Revision: 142989

db-move: moved libffado from [testing] to [extra] (x86_64)

Added:
  libffado/repos/extra-x86_64/60-ffado.rules
    (from rev 142987, libffado/repos/testing-x86_64/60-ffado.rules)
  libffado/repos/extra-x86_64/PKGBUILD
    (from rev 142987, libffado/repos/testing-x86_64/PKGBUILD)
Deleted:
  libffado/repos/extra-x86_64/PKGBUILD
  libffado/repos/testing-x86_64/

----------------+
 60-ffado.rules |   27 +++++++++++
 PKGBUILD       |  126 +++++++++++++++++++++++++++++--------------------------
 2 files changed, 94 insertions(+), 59 deletions(-)

Copied: libffado/repos/extra-x86_64/60-ffado.rules (from rev 142987, libffado/repos/testing-x86_64/60-ffado.rules)
===================================================================

--- extra-x86_64/60-ffado.rules	                        (rev 0)
+++ extra-x86_64/60-ffado.rules	2011-11-19 21:35:53 UTC (rev 142989)
@@ -0,0 +1,27 @@
+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.
+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}=="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
+
+# 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
+
+LABEL="ffado_end"

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2011-11-19 21:35:52 UTC (rev 142988)
+++ extra-x86_64/PKGBUILD	2011-11-19 21:35:53 UTC (rev 142989)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer: Ray Rashif <schivmeister at gmail.com>
-# Contributor: galiyosha at gmail.com
-# Contributor: Jon Kristian Nilsen <jokr.nilsen at gmail.com>
-
-pkgname=libffado
-pkgver=2.0.1
-pkgrel=3
-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')
-makedepends=('scons' 'python2-qt')
-optdepends=('python2-qt: mixer applet')
-provides=('ffado')
-source=(http://www.ffado.org/files/$pkgname-$pkgver.tar.gz)
-md5sums=('786f31facd417e6207e429f50af0e15e')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # hack to use CFLAGS without optimising
-  sed -i 's/-O2//g' SConstruct
-
-  if [ "$CARCH" = "x86_64" ]; then
-    sed -i "s/-m64/-m64 $CFLAGS/g" SConstruct
-  else
-    sed -i "s/-m32/-m32 $CFLAGS/g" SConstruct
-  fi
-
-  # python2 fix
-  sed -i 's:python $SOURCE:python2 $SOURCE:' SConstruct
-  sed -i 's:python support/tools:python2 support/tools:' \
-    support/tools/SConscript
-
-  scons PREFIX=/usr #ENABLE_OPTIMIZATIONS=True
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  scons DESTDIR="$pkgdir/" WILL_DEAL_WITH_XDG_MYSELF="True" install
-
-  # python2 fix
-  for i in $(grep '^#!.*bin.*python' -R "$pkgdir" | sed 's/:.*//'); do
-    sed -i 's:^#!.*bin.*python:#!/usr/bin/python2:' "$i"
-  done
-
-  # desktop files & icons
-  install -Dm644 support/xdg/ffado.org-ffadomixer.desktop \
-    "$pkgdir/usr/share/applications/ffadomixer.desktop"
-
-  install -Dm644 support/xdg/hi64-apps-ffado.png \
-	      "$pkgdir/usr/share/pixmaps/$pkgname.png"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: libffado/repos/extra-x86_64/PKGBUILD (from rev 142987, libffado/repos/testing-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2011-11-19 21:35:53 UTC (rev 142989)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Ray Rashif <schiv at archlinux.org>
+# Contributor: galiyosha at gmail.com
+# Contributor: Jon Kristian Nilsen <jokr.nilsen at gmail.com>
+
+pkgname=libffado
+pkgver=2.0.1
+pkgrel=5
+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')
+makedepends=('scons' 'python2-qt')
+optdepends=('python2: ffado-diag'
+            'python2-qt: mixer applet')
+provides=('ffado')
+source=("http://www.ffado.org/files/$pkgname-$pkgver.tar.gz"
+        '60-ffado.rules')
+md5sums=('786f31facd417e6207e429f50af0e15e'
+         'f03a3e950801c4405b8934084651bca8')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # hack to use CFLAGS without optimising
+  sed -i 's/-O2//g' SConstruct
+
+  if [ "$CARCH" = "x86_64" ]; then
+    sed -i "s/-m64/-m64 $CFLAGS/g" SConstruct
+  else
+    sed -i "s/-m32/-m32 $CFLAGS/g" SConstruct
+  fi
+
+  # python2 fix
+  sed -i 's:python $SOURCE:python2 $SOURCE:' SConstruct
+  sed -i 's:python support/tools:python2 support/tools:' \
+    support/tools/SConscript
+
+  scons PREFIX=/usr #ENABLE_OPTIMIZATIONS=True
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  scons DESTDIR="$pkgdir" WILL_DEAL_WITH_XDG_MYSELF="True" install
+
+  # 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"
+
+  # python2 fix
+  for i in $(grep '^#!.*bin.*python' -R "$pkgdir" | sed 's/:.*//'); do
+    sed -i 's:^#!.*bin.*python:#!/usr/bin/python2:' "$i"
+  done
+
+  # desktop files & icons
+  install -Dm644 support/xdg/ffado.org-ffadomixer.desktop \
+    "$pkgdir/usr/share/applications/ffadomixer.desktop"
+
+  install -Dm644 support/xdg/hi64-apps-ffado.png \
+	      "$pkgdir/usr/share/pixmaps/$pkgname.png"
+}
+
+# vim:set ts=2 sw=2 et:


