compiled/added programs needed by xbmc: Moved some programs out of community into extra.

libmpeg2
pm-utils
afpfs-ng
fluidsynth
libmodplug
libnfs
libshairport
dbus-c__
doxygen
libocnfig
libffado
libimobiledevice
libmicrothttpd
sdl_image
sdl_mixer
smpeg
upower
usbmuxd
vdpau-video

5 files changed, 270 insertions, 183 deletions

diff --git a/abs/extra/libffado/60-ffado.rules b/abs/extra/libffado/60-ffado.rules
deleted file mode 100644
index 6ab8ef8..0000000
--- a/abs/extra/libffado/60-ffado.rules
+++ /dev/null
@@ -1,27 +0,0 @@
-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"
diff --git a/abs/extra/libffado/PKGBUILD b/abs/extra/libffado/PKGBUILD
index 772ebec..d1a0915 100644
--- a/abs/extra/libffado/PKGBUILD
+++ b/abs/extra/libffado/PKGBUILD
@@ -1,49 +1,46 @@
-# $Id: PKGBUILD 157813 2012-04-30 03:19:10Z heftig $
+# $Id: PKGBUILD 168113 2012-10-06 05:43:33Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: galiyosha@gmail.com
 # Contributor: Jon Kristian Nilsen <jokr.nilsen@gmail.com>
 
 pkgname=libffado
-pkgver=2.0.1
-pkgrel=7
+pkgver=2.1.0
+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-pyqt')
+depends=('libiec61883' 'libavc1394' 'dbus-c++'
+         'libxml++' 'alsa-lib' '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.tar.gz"
-        "libffado-gcc47.patch" "fix-segfault-on-close.patch" '60-ffado.rules')
-md5sums=('786f31facd417e6207e429f50af0e15e'
-         '287bb3f506e31626c4b8f91f0e1d9407'
-         'ac9763cb2dc2f3eb4e1894e30645c6f1'
-         'f03a3e950801c4405b8934084651bca8')
+source=("http://www.ffado.org/files/$pkgname-$pkgver.tgz"
+        'python2-qt.patch')
+md5sums=('26bce2be0b9c1fa4e614f2f494edf388'
+         '10aa837f5521da213caa93e1ddc58c0e')
+
+_scons-conf() {
+  scons DEBUG=False \
+        PREFIX=/usr \
+        MANDIR=/usr/share/man \
+        UDEVDIR=/usr/lib/udev/rules.d \
+        COMPILE_FLAGS="$CFLAGS" $@
+}
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  patch -p1 -i "$srcdir"/libffado-gcc47.patch
-  patch -p3 -i "$srcdir"/fix-segfault-on-close.patch
-
-  # hack to use CFLAGS without optimising
-  sed -i 's/-O2//g' SConstruct
+  # python2 fix
+  patch -Np1 -i "$srcdir/python2-qt.patch"
 
-  if [ "$CARCH" = "x86_64" ]; then
-    sed -i "s/-m64/-m64 $CFLAGS/g" SConstruct
+  # build!
+  if [ "$CARCH" = 'x86_64' ]; then
+    _scons-conf ENABLE_OPTIMIZATIONS=True
   else
-    sed -i "s/-m32/-m32 $CFLAGS/g" SConstruct
+    _scons-conf
   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
 }
 
 package() {
@@ -51,16 +48,6 @@ package() {
 
   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/usr/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"
diff --git a/abs/extra/libffado/fix-segfault-on-close.patch b/abs/extra/libffado/fix-segfault-on-close.patch
deleted file mode 100644
index c81b97e..0000000
--- a/abs/extra/libffado/fix-segfault-on-close.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Index: /trunk/libffado/src/debugmodule/debugmodule.h

-===================================================================

---- /trunk/libffado/src/debugmodule/debugmodule.h (revision 1763)

-+++ /trunk/libffado/src/debugmodule/debugmodule.h (revision 1999)

-@@ -283,6 +283,10 @@

- void hexDumpQuadlets( quadlet_t *data_start, unsigned int length );

- 

-+class DebugModuleManager;

-+

- class DebugModule {

- public:

-+    friend class DebugModuleManager;

-+

-     enum {

-         eDL_Message      = DEBUG_LEVEL_MESSAGE,

-@@ -333,4 +337,5 @@

-     std::string   m_name;

-     debug_level_t m_level;

-+    DebugModuleManager* m_manager;

- };

- 

-Index: /trunk/libffado/src/debugmodule/debugmodule.cpp

-===================================================================

---- /trunk/libffado/src/debugmodule/debugmodule.cpp (revision 1763)

-+++ /trunk/libffado/src/debugmodule/debugmodule.cpp (revision 1999)

-@@ -84,5 +84,6 @@

- //              << endl;

- //     }

--    if ( !DebugModuleManager::instance()->unregisterModule( *this ) ) {

-+

-+    if (m_manager && !m_manager->unregisterModule( *this ) ) {

-         cerr << "Could not unregister DebugModule at DebugModuleManager"

-              << endl;

-@@ -263,12 +264,9 @@

- DebugModuleManager::~DebugModuleManager()

- {

--    // cleanin up leftover modules

--    for ( DebugModuleVectorIterator it = m_debugModules.begin();

--          it != m_debugModules.end();

--          ++it )

-+    // cleaning up leftover modules

-+    while (!m_debugModules.empty())

-     {

--        fprintf(stderr,"Cleaning up leftover debug module: %s\n",(*it)->getName().c_str());

--        m_debugModules.erase( it );

--        delete *it;

-+        DebugModule *mod = m_debugModules.back();

-+        unregisterModule(*mod);

-     }

- 

-@@ -455,4 +453,6 @@

-     } else {

-         m_debugModules.push_back( &debugModule );

-+        if (debugModule.m_manager == NULL)

-+                debugModule.m_manager = this;

-     }

-     return true;

-@@ -469,4 +469,6 @@

-         if ( *it == &debugModule ) {

-             m_debugModules.erase( it );

-+            if (debugModule.m_manager == this)

-+                debugModule.m_manager = NULL;

-             return true;

-         }

diff --git a/abs/extra/libffado/libffado-gcc47.patch b/abs/extra/libffado/libffado-gcc47.patch
deleted file mode 100644
index f296956..0000000
--- a/abs/extra/libffado/libffado-gcc47.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-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"
diff --git a/abs/extra/libffado/python2-qt.patch b/abs/extra/libffado/python2-qt.patch
new file mode 100644
index 0000000..042aa26
--- /dev/null
+++ b/abs/extra/libffado/python2-qt.patch
@@ -0,0 +1,246 @@
+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" )
++    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' ):
++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
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ # Copyright (C) 2007-2008 Arnold Krille
+ # Copyright (C) 2007-2008 Pieter Palmers
+diff -baur libffado-2.1.0.orig/admin/doxygen.py libffado-2.1.0/admin/doxygen.py
+--- libffado-2.1.0.orig/admin/doxygen.py	2012-09-19 14:18:53.857448419 +0800
++++ libffado-2.1.0/admin/doxygen.py	2012-09-19 14:19:02.957399122 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ # Copyright (C) 2007-2008 Arnold Krille
+ #
+diff -baur libffado-2.1.0.orig/admin/pkgconfig.py libffado-2.1.0/admin/pkgconfig.py
+--- libffado-2.1.0.orig/admin/pkgconfig.py	2012-09-19 14:18:53.857448419 +0800
++++ libffado-2.1.0/admin/pkgconfig.py	2012-09-19 14:19:02.957399123 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ # Copyright (C) 2007-2008 Arnold Krille
+ #
+diff -baur libffado-2.1.0.orig/admin/pyuic.py libffado-2.1.0/admin/pyuic.py
+--- libffado-2.1.0.orig/admin/pyuic.py	2012-09-19 14:18:53.857448419 +0800
++++ libffado-2.1.0/admin/pyuic.py	2012-09-19 14:19:02.957399123 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ # Copyright (C) 2007-2008 Arnold Krille
+ #
+diff -baur libffado-2.1.0.orig/admin/pyuic4.py libffado-2.1.0/admin/pyuic4.py
+--- libffado-2.1.0.orig/admin/pyuic4.py	2012-09-19 14:18:53.857448419 +0800
++++ libffado-2.1.0/admin/pyuic4.py	2012-09-19 14:19:02.957399123 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ # Copyright (C) 2007-2008 Arnold Krille
+ #
+@@ -21,10 +21,8 @@
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ #
+ 
+-import imp
+-
+ def pyuic4_action( target, source, env ):
+-	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) " )
+ 	ret = True
+ 	try:
+-		imp.find_module( "pyqtconfig" )
++		import PyQt4.pyqtconfig
+ 	except ImportError:
+ 		ret = False
+ 	context.Result( ret )
+diff -baur libffado-2.1.0.orig/admin/scanreplace.py libffado-2.1.0/admin/scanreplace.py
+--- libffado-2.1.0.orig/admin/scanreplace.py	2012-09-19 14:18:53.857448419 +0800
++++ libffado-2.1.0/admin/scanreplace.py	2012-09-19 14:19:02.957399123 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ # Copyright (C) 2007-2008 Arnold Krille
+ #
+diff -baur libffado-2.1.0.orig/doc/SConscript libffado-2.1.0/doc/SConscript
+--- libffado-2.1.0.orig/doc/SConscript	2012-09-19 14:18:53.857448419 +0800
++++ libffado-2.1.0/doc/SConscript	2012-09-19 14:19:02.957399123 +0800
+@@ -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
+@@ -1,4 +1,4 @@
+-#!/bin/env python
++#!/usr/bin/python2
+ #
+ # Copyright (C) 2007,2008,2011 Arnold Krille
+ # Copyright (C) 2007-2008 Pieter Palmers
+diff -baur libffado-2.1.0.orig/support/mixer-qt4/SConscript libffado-2.1.0/support/mixer-qt4/SConscript
+--- libffado-2.1.0.orig/support/mixer-qt4/SConscript	2012-09-19 14:18:53.830781898 +0800
++++ libffado-2.1.0/support/mixer-qt4/SConscript	2012-09-19 14:19:02.957399123 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ # Copyright (C) 2007-2009 Arnold Krille
+ # Copyright (C) 2007-2008 Pieter Palmers
+diff -baur libffado-2.1.0.orig/support/mixer-qt4/ffado/ffadowindow.py libffado-2.1.0/support/mixer-qt4/ffado/ffadowindow.py
+--- libffado-2.1.0.orig/support/mixer-qt4/ffado/ffadowindow.py	2012-09-19 14:18:53.830781898 +0800
++++ libffado-2.1.0/support/mixer-qt4/ffado/ffadowindow.py	2012-09-19 14:19:02.957399123 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ # Copyright (C) 2005-2008 by Pieter Palmers
+ #               2007-2009 by Arnold Krille
+diff -baur libffado-2.1.0.orig/support/mixer-qt4/ffado-mixer-profiler.in libffado-2.1.0/support/mixer-qt4/ffado-mixer-profiler.in
+--- libffado-2.1.0.orig/support/mixer-qt4/ffado-mixer-profiler.in	2012-09-19 14:18:53.830781898 +0800
++++ libffado-2.1.0/support/mixer-qt4/ffado-mixer-profiler.in	2012-09-19 14:19:02.957399123 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ # Copyright (C) 2005-2009 by Pieter Palmers
+ #               2007-2009 by Arnold Krille
+diff -baur libffado-2.1.0.orig/support/mixer-qt4/ffado-mixer.in libffado-2.1.0/support/mixer-qt4/ffado-mixer.in
+--- libffado-2.1.0.orig/support/mixer-qt4/ffado-mixer.in	2012-09-19 14:18:53.834115214 +0800
++++ libffado-2.1.0/support/mixer-qt4/ffado-mixer.in	2012-09-19 14:19:02.957399123 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ # Copyright (C) 2005-2008 by Pieter Palmers
+ #               2007-2009 by Arnold Krille
+diff -baur libffado-2.1.0.orig/support/tools/SConscript libffado-2.1.0/support/tools/SConscript
+--- libffado-2.1.0.orig/support/tools/SConscript	2012-09-19 14:18:53.830781898 +0800
++++ libffado-2.1.0/support/tools/SConscript	2012-09-19 14:20:51.970141882 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ # Copyright (C) 2007-2008 Arnold Krille
+ # Copyright (C) 2007-2008 Pieter Palmers
+@@ -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
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ 
+ #
+@@ -74,7 +74,7 @@
+     # check libraries
+     print "   gcc ............... %s" % get_version_first_line('gcc --version')
+     print "   g++ ............... %s" % get_version_first_line('g++ --version')
+-    print "   PyQt4 (by pyuic4) . %s" % get_version_first_line('pyuic4 --version')
++    print "   PyQt4 (by pyuic4) . %s" % get_version_first_line('python2-pyuic4 --version')
+     print "   jackd ............. %s" % get_version_first_line('jackd --version')
+     print "     path ............ %s" % get_command_path('jackd')
+     print "     flags ........... %s" % get_package_flags("jack")
+diff -baur libffado-2.1.0.orig/support/tools/ffado-diag.in libffado-2.1.0/support/tools/ffado-diag.in
+--- libffado-2.1.0.orig/support/tools/ffado-diag.in	2012-09-19 14:18:53.830781898 +0800
++++ libffado-2.1.0/support/tools/ffado-diag.in	2012-09-19 14:19:02.957399123 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ 
+ #
+@@ -120,7 +120,7 @@
+     print " Prerequisites (dynamic at run-time)..."
+     print "   gcc ............... %s" % get_version_first_line('gcc --version')
+     print "   g++ ............... %s" % get_version_first_line('g++ --version')
+-    print "   PyQt4 (by pyuic4) . %s" % get_version_first_line('pyuic4 --version')
++    print "   PyQt4 (by pyuic4) . %s" % get_version_first_line('python2-pyuic4 --version')
+     print "   jackd ............. %s" % get_version_first_line('jackd --version')
+     print "     path ............ %s" % get_command_path('jackd')
+     print "     flags ........... %s" % get_package_flags("jack")
+diff -baur libffado-2.1.0.orig/support/tools/ffado-sandbox-install.py libffado-2.1.0/support/tools/ffado-sandbox-install.py
+--- libffado-2.1.0.orig/support/tools/ffado-sandbox-install.py	2012-09-19 14:18:53.830781898 +0800
++++ libffado-2.1.0/support/tools/ffado-sandbox-install.py	2012-09-19 14:19:02.957399123 +0800
+@@ -1,4 +1,4 @@
+-#!/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
++++ libffado-2.1.0/support/tools/listirqinfo.py	2012-09-19 14:19:02.957399123 +0800
+@@ -1,4 +1,4 @@
+-#!/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
++++ libffado-2.1.0/tests/dbus_test.py	2012-09-19 14:19:02.957399123 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ # Copyright (C) 2005-2007 by Pieter Palmers
+ #               2007-2008 by Arnold Krille
+diff -baur libffado-2.1.0.orig/tests/python/test-eap-ctrl.py libffado-2.1.0/tests/python/test-eap-ctrl.py
+--- libffado-2.1.0.orig/tests/python/test-eap-ctrl.py	2012-09-19 14:18:53.837448529 +0800
++++ libffado-2.1.0/tests/python/test-eap-ctrl.py	2012-09-19 14:19:02.957399123 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ # Copyright (C) 2005-2009 by Pieter Palmers
+ #