[arch-commits] Commit in libffado/trunk (PKGBUILD python2-qt.patch rules.patch)
Ray Rashif
schiv at nymeria.archlinux.org
Thu Jun 5 20:22:32 UTC 2014
Date: Thursday, June 5, 2014 @ 22:22:32
Author: schiv
Revision: 214309
upgpkg: libffado 2.2.1-1
upstream release
Modified:
libffado/trunk/PKGBUILD
libffado/trunk/python2-qt.patch
Deleted:
libffado/trunk/rules.patch
------------------+
PKGBUILD | 24 +++++----------
python2-qt.patch | 36 +++++++++-------------
rules.patch | 84 -----------------------------------------------------
3 files changed, 23 insertions(+), 121 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-06-05 18:50:41 UTC (rev 214308)
+++ PKGBUILD 2014-06-05 20:22:32 UTC (rev 214309)
@@ -4,24 +4,22 @@
# Contributor: Jon Kristian Nilsen <jokr.nilsen at gmail.com>
pkgname=libffado
-pkgver=2.1.0
-pkgrel=4
+pkgver=2.2.1
+pkgrel=1
pkgdesc="Driver for FireWire audio devices"
arch=('i686' 'x86_64')
url="http://www.ffado.org/"
license=('GPL')
depends=('libiec61883' 'libavc1394' 'dbus-c++'
- 'libxml++' 'alsa-lib' 'libsigc++' 'libconfig')
+ 'libxml++' 'jack' 'libsigc++' 'libconfig')
makedepends=('scons' 'subversion' 'python2-pyqt')
optdepends=('python2: ffado-diag'
'python2-pyqt: mixer applet')
provides=('ffado')
source=("http://www.ffado.org/files/$pkgname-$pkgver.tgz"
- 'python2-qt.patch'
- 'rules.patch')
-md5sums=('26bce2be0b9c1fa4e614f2f494edf388'
- '10aa837f5521da213caa93e1ddc58c0e'
- 'da1102bfb02e67b3dfcb3947435a81e9')
+ 'python2-qt.patch')
+md5sums=('e113d828835051f835fb4a329cb0cbd4'
+ 'acb6e0dca1239850c7862bf2e1443fd7')
_scons-conf() {
scons DEBUG=False \
@@ -34,13 +32,8 @@
prepare() {
cd "$srcdir/$pkgname-$pkgver"
- # python2 fix
+ msg2 "Applying Python 2 compatibility patch (downstream)"
patch -Np1 -i "$srcdir/python2-qt.patch"
-
- # 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() {
@@ -47,7 +40,7 @@
cd "$srcdir/$pkgname-$pkgver"
if [ "$CARCH" = 'x86_64' ]; then
- _scons-conf ENABLE_OPTIMIZATIONS=True
+ _scons-conf ENABLE_OPTIMIZATIONS=True # SSE et al. not suitable for i686
else
_scons-conf
fi
@@ -58,7 +51,6 @@
scons DESTDIR="$pkgdir" WILL_DEAL_WITH_XDG_MYSELF="True" install
- # desktop files & icons
install -Dm644 support/xdg/ffado.org-ffadomixer.desktop \
"$pkgdir/usr/share/applications/ffadomixer.desktop"
Modified: python2-qt.patch
===================================================================
--- python2-qt.patch 2014-06-05 18:50:41 UTC (rev 214308)
+++ python2-qt.patch 2014-06-05 20:22:32 UTC (rev 214309)
@@ -1,14 +1,8 @@
diff -baur libffado-2.1.0.orig/SConstruct libffado-2.1.0/SConstruct
--- libffado-2.1.0.orig/SConstruct 2012-09-19 14:18:53.827448582 +0800
+++ libffado-2.1.0/SConstruct 2012-09-19 14:20:01.670414379 +0800
-@@ -1,4 +1,4 @@
--#! /usr/bin/python
-+#!/usr/bin/python2
- # -*- coding: utf-8 -*-
- #
- # Copyright (C) 2007, 2008, 2010 Arnold Krille
@@ -134,7 +134,7 @@
-
+
def CheckForPyModule( context, module ):
context.Message( "Checking for the python module '" + module + "' " )
- ret = context.TryAction( "python $SOURCE", "import %s" % module, ".py" )
@@ -15,9 +9,9 @@
+ ret = context.TryAction( "python2 $SOURCE", "import %s" % module, ".py" )
context.Result( ret[0] )
return ret[0]
-
+
@@ -351,7 +351,7 @@
-
+
# PyQT checks
build_mixer = False
-if conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'PyQt4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' ):
@@ -24,7 +18,7 @@
+if conf.CheckForApp( 'which python2-pyuic4' ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'PyQt4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' ):
env['PYUIC4'] = True
build_mixer = True
-
+
diff -baur libffado-2.1.0.orig/admin/dbus.py libffado-2.1.0/admin/dbus.py
--- libffado-2.1.0.orig/admin/dbus.py 2012-09-19 14:18:53.857448419 +0800
+++ libffado-2.1.0/admin/dbus.py 2012-09-19 14:19:02.957399122 +0800
@@ -73,7 +67,7 @@
@@ -21,10 +21,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-
+
-import imp
-
def pyuic4_action( target, source, env ):
@@ -80,7 +74,7 @@
- env.Execute( "pyuic4 " + str( source[0] ) + " > " + str( target[0] ) )
+ env.Execute( "python2-pyuic4 " + str( source[0] ) + " > " + str( target[0] ) )
return 0
-
+
def pyuic4_string( target, source, env ):
@@ -34,7 +32,7 @@
context.Message( "Checking for pyuic4 (by checking for the python module pyqtconfig) " )
@@ -106,9 +100,9 @@
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#!/usr/bin/python2
-
+
Import( 'env' )
-
+
diff -baur libffado-2.1.0.orig/support/dbus/SConscript libffado-2.1.0/support/dbus/SConscript
--- libffado-2.1.0.orig/support/dbus/SConscript 2012-09-19 14:18:53.827448582 +0800
+++ libffado-2.1.0/support/dbus/SConscript 2012-09-19 14:19:02.957399123 +0800
@@ -166,12 +160,12 @@
@@ -43,7 +43,7 @@
# For the installation of the stuff
e['pythondir'] = Template( os.path.join( e['sharedir'], 'python' ) ).safe_substitute( e )
-
+
-e.Command( "static_info.txt", "#/SConstruct", "python support/tools/ffado-diag-static > $TARGET" )
+e.Command( "static_info.txt", "#/SConstruct", "python2 support/tools/ffado-diag-static > $TARGET" )
-
+
e.ScanReplace( "ffado-diag.in" )
-
+
diff -baur libffado-2.1.0.orig/support/tools/ffado-diag-static libffado-2.1.0/support/tools/ffado-diag-static
--- libffado-2.1.0.orig/support/tools/ffado-diag-static 2012-09-19 14:18:53.830781898 +0800
+++ libffado-2.1.0/support/tools/ffado-diag-static 2012-09-19 14:19:02.957399123 +0800
@@ -179,7 +173,7 @@
-#!/usr/bin/python
+#!/usr/bin/python2
#
-
+
#
@@ -74,7 +74,7 @@
# check libraries
@@ -197,7 +191,7 @@
-#!/usr/bin/python
+#!/usr/bin/python2
#
-
+
#
@@ -120,7 +120,7 @@
print " Prerequisites (dynamic at run-time)..."
@@ -215,7 +209,7 @@
-#!/usr/bin/python
+#!/usr/bin/python2
#
-
+
#
diff -baur libffado-2.1.0.orig/support/tools/listirqinfo.py libffado-2.1.0/support/tools/listirqinfo.py
--- libffado-2.1.0.orig/support/tools/listirqinfo.py 2012-09-19 14:18:53.830781898 +0800
@@ -224,7 +218,7 @@
-#!/usr/bin/python
+#!/usr/bin/python2
#
-
+
#
diff -baur libffado-2.1.0.orig/tests/dbus_test.py libffado-2.1.0/tests/dbus_test.py
--- libffado-2.1.0.orig/tests/dbus_test.py 2012-09-19 14:18:53.837448529 +0800
Deleted: rules.patch
===================================================================
--- rules.patch 2014-06-05 18:50:41 UTC (rev 214308)
+++ rules.patch 2014-06-05 20:22:32 UTC (rev 214309)
@@ -1,84 +0,0 @@
---- 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"
More information about the arch-commits
mailing list