[arch-commits] Commit in libffado/trunk (3 files)
David Runge
dvzrv at archlinux.org
Tue Mar 6 16:54:17 UTC 2018
Date: Tuesday, March 6, 2018 @ 16:54:16
Author: dvzrv
Revision: 303153
upgpkg: libffado 2.4.1-1
Upgrading to 2.4.1, enabling python3 and python-pyqt5 (with an upstreamed patch for the latter).
Added:
libffado/trunk/libffado-fix-python3-pyqt5.diff
Modified:
libffado/trunk/PKGBUILD
Deleted:
libffado/trunk/python2.patch
---------------------------------+
PKGBUILD | 36 ++--
libffado-fix-python3-pyqt5.diff | 55 ++++++
python2.patch | 306 --------------------------------------
3 files changed, 73 insertions(+), 324 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-03-06 16:49:16 UTC (rev 303152)
+++ PKGBUILD 2018-03-06 16:54:16 UTC (rev 303153)
@@ -5,49 +5,49 @@
# Contributor: Jon Kristian Nilsen <jokr.nilsen at gmail.com>
pkgname=libffado
-pkgver=2.4.0
-pkgrel=3
+pkgver=2.4.1
+pkgrel=1
pkgdesc="Driver for FireWire audio devices"
arch=('x86_64')
url="http://www.ffado.org/"
license=('GPL')
-depends=('dbus-c++' 'jack' 'libavc1394' 'libconfig' 'libiec61883' 'libxml++' 'python2')
-makedepends=('python2-pyqt4' 'scons')
-optdepends=('python2-pyqt4: ffado-mixer')
+depends=('dbus-c++' 'jack' 'libavc1394' 'libconfig' 'libiec61883' 'libxml++' 'python-dbus')
+makedepends=('python-pyqt5' 'python-dbus' 'scons')
+optdepends=('python-pyqt5: ffado-mixer')
provides=('ffado')
source=("http://www.ffado.org/files/${pkgname}-${pkgver}.tgz"
- 'python2.patch'
+ "${pkgname}-fix-python3-pyqt5.diff"
)
-sha512sums=('7df37584925cc908cc284dba344609928d39e006f71ae4ede62e4531b2628271ebd0db00407418e943fb569b5b8b919a76c90aaeed03005cefbd3c1c16ee1627'
- '01365c0cd834692e21ba480f596b1eceed619a1b1ef8d77425c96aaf83b3343efa1da681a28c8f99152b5fa18b06370b03a4fc513f0bef822ace3ad35b9d1bb6')
+sha512sums=('0859f17b87c68108bbde726d1cf8ab0b99f6f7f02cbe36acd8b451e112688a4d1edc21134eb4a2edc8c92dcf5f5da52efeabb2ad0dc07804ed1aa664a3b38d74'
+ '39beb2399377d7ee13a43ddd7a80907eb94a2f8f146c5a94a4ba0e1471b3369d2b1519cb8b15c3e2352d9854048882cc037058a1992e6e87270fe9e17fdba91e')
prepare() {
cd "${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/python2.patch"
+ patch -Np1 -i "${srcdir}/${pkgname}-fix-python3-pyqt5.diff"
}
build() {
cd "${pkgname}-${pkgver}"
-
scons PREFIX=/usr \
DEBUG=no \
- MANDIR=/usr/share/man \
- UDEVDIR=/usr/lib/udev/rules.d
+ MANDIR='/usr/share/man' \
+ PYTHON_INTERPRETER='/usr/bin/python3' \
+ PYPKGDIR='/usr/lib/python3.6/site-packages' \
+ UDEVDIR='/usr/lib/udev/rules.d'
}
package() {
cd "${pkgname}-${pkgver}"
-
scons DESTDIR="${pkgdir}" WILL_DEAL_WITH_XDG_MYSELF="True" install
- install -Dm644 support/xdg/ffado.org-ffadomixer.desktop \
+ # XDG
+ install -vDm644 support/xdg/ffado.org-ffadomixer.desktop \
"${pkgdir}/usr/share/applications/ffadomixer.desktop"
-
- install -Dm644 support/xdg/hi64-apps-ffado.png \
+ install -vDm644 support/xdg/hi64-apps-ffado.png \
"${pkgdir}/usr/share/pixmaps/hi64-apps-ffado.png"
- install -Dm644 AUTHORS "${pkgdir}/usr/share/doc/${pkgname}/AUTHORS"
- install -Dm644 README "${pkgdir}/usr/share/doc/${pkgname}/README"
+ # docs
+ install -t "${pkgdir}/usr/share/doc/${pkgname}" -vDm644 {AUTHORS,README}
}
# vim:set ts=2 sw=2 et:
Added: libffado-fix-python3-pyqt5.diff
===================================================================
--- libffado-fix-python3-pyqt5.diff (rev 0)
+++ libffado-fix-python3-pyqt5.diff 2018-03-06 16:54:16 UTC (rev 303153)
@@ -0,0 +1,55 @@
+--- libffado-2.4.1-a/support/mixer-qt4/ffado/import_pyqt.py 2017-06-03 10:34:29.000000000 +0200
++++ libffado-2.4.1-b/support/mixer-qt4/ffado/import_pyqt.py 2018-03-06 17:19:15.024087729 +0100
+@@ -20,27 +20,37 @@
+ # along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #
+
++import sys
++ffado_python3 = sys.version_info >= (3,)
+ ffado_pyqt_version = 4
+
+-# This module handles the importing of PyQt modules for both PyQt4 and PyQt5.
+-# The idea is to first try importing PyQt4. If there's an import error it's
++# This module handles the importing of PyQt modules for both PyQt4 and PyQt5 on
++# python2 or python3.
++# Using python2 the first try is to import PyQt4. If there's an import error it's
+ # assumed PyQt5 is present instead and that is tried.
++# Using python3 PyQt5 is assumed (PyQt4 is missing the old APIs and can
++# therefore not be used).
+ #
+ # All modules used by any part of ffado-mixer are imported. This greatly
+ # simplifies the process. Otherwise the modules to import would be delivered
+ # by string variables, and there isn't a supported way to do this across
+ # Python2 and Python3.
+-try:
+- from PyQt4 import QtGui, QtCore, Qt, uic
+- from PyQt4.QtCore import QByteArray, QObject, QTimer, Qt, pyqtSignal, QString, pyqtSlot
+- from PyQt4.QtGui import *
+- ffado_pyqt_version = 4
+-except ImportError:
+- from PyQt5 import QtGui, Qt, QtCore, Qt, QtWidgets, uic
+- from PyQt5.QtCore import QByteArray, QObject, pyqtSignal, pyqtSlot, QTimer, Qt
+- from PyQt5.QtGui import *
+- from PyQt5.QtWidgets import *
+- ffado_pyqt_version = 5
++if ffado_python3:
++ from PyQt5 import QtGui, Qt, QtCore, Qt, QtWidgets, uic
++ from PyQt5.QtCore import QByteArray, QObject, pyqtSignal, pyqtSlot, QTimer, Qt
++ from PyQt5.QtGui import *
++ from PyQt5.QtWidgets import *
++ ffado_pyqt_version = 5
++else:
++ try:
++ from PyQt4 import QtGui, QtCore, Qt, uic
++ from PyQt4.QtCore import QByteArray, QObject, QTimer, Qt, pyqtSignal, QString, pyqtSlot
++ from PyQt4.QtGui import *
++ ffado_pyqt_version = 4
++ except ImportError:
++ from PyQt5 import QtGui, Qt, QtCore, Qt, QtWidgets, uic
++ from PyQt5.QtCore import QByteArray, QObject, pyqtSignal, pyqtSlot, QTimer, Qt
++ from PyQt5.QtGui import *
++ from PyQt5.QtWidgets import *
++ ffado_pyqt_version = 5
+
+-import sys
+-ffado_python3 = sys.version_info >= (3,)
Deleted: python2.patch
===================================================================
--- python2.patch 2018-03-06 16:49:16 UTC (rev 303152)
+++ python2.patch 2018-03-06 16:54:16 UTC (rev 303153)
@@ -1,306 +0,0 @@
-diff -baur libffado-2.4.0.orig/admin/dbus.py libffado-2.4.0/admin/dbus.py
---- libffado-2.4.0.orig/admin/dbus.py 2010-09-10 23:50:58.000000000 +0200
-+++ libffado-2.4.0/admin/dbus.py 2017-12-23 19:53:45.298791443 +0100
-@@ -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.4.0.orig/admin/doxygen.py libffado-2.4.0/admin/doxygen.py
---- libffado-2.4.0.orig/admin/doxygen.py 2017-11-06 10:54:30.000000000 +0100
-+++ libffado-2.4.0/admin/doxygen.py 2017-12-23 19:53:55.772030266 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2007-2008 Arnold Krille
- #
-diff -baur libffado-2.4.0.orig/admin/pkgconfig.py libffado-2.4.0/admin/pkgconfig.py
---- libffado-2.4.0.orig/admin/pkgconfig.py 2010-09-12 22:15:27.000000000 +0200
-+++ libffado-2.4.0/admin/pkgconfig.py 2017-12-23 19:54:07.335259008 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2007-2008 Arnold Krille
- #
-diff -baur libffado-2.4.0.orig/admin/pyuic4.py libffado-2.4.0/admin/pyuic4.py
---- libffado-2.4.0.orig/admin/pyuic4.py 2008-09-23 12:42:04.000000000 +0200
-+++ libffado-2.4.0/admin/pyuic4.py 2017-12-23 19:55:20.601257321 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2007-2008 Arnold Krille
- #
-@@ -31,7 +31,7 @@
- return "building '%s' from '%s'" % ( str(target[0]), str( source[0] ) )
-
- def PyQt4Check( context ):
-- context.Message( "Checking for pyuic4 (by checking for the python module pyqtconfig) " )
-+ context.Message( "Checking for pyuic4 (by checking for the python2 module pyqtconfig) " )
- ret = True
- try:
- imp.find_module( "pyqtconfig" )
-diff -baur libffado-2.4.0.orig/admin/pyuic5.py libffado-2.4.0/admin/pyuic5.py
---- libffado-2.4.0.orig/admin/pyuic5.py 2017-06-03 13:17:13.000000000 +0200
-+++ libffado-2.4.0/admin/pyuic5.py 2017-12-23 19:55:34.657794715 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2007-2008 Arnold Krille
- # Copyright (C) 2017 Jonathan Woithe
-@@ -32,7 +32,7 @@
- return "building '%s' from '%s'" % ( str(target[0]), str( source[0] ) )
-
- def PyQt5Check( context ):
-- context.Message( "Checking for pyuic5 (by checking for the python module pyqtconfig) " )
-+ context.Message( "Checking for pyuic5 (by checking for the python2 module pyqtconfig) " )
- ret = True
- try:
- imp.find_module( "pyqtconfig" )
-diff -baur libffado-2.4.0.orig/admin/pyuic.py libffado-2.4.0/admin/pyuic.py
---- libffado-2.4.0.orig/admin/pyuic.py 2008-01-20 11:29:17.000000000 +0100
-+++ libffado-2.4.0/admin/pyuic.py 2017-12-23 19:55:07.654709433 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2007-2008 Arnold Krille
- #
-@@ -31,7 +31,7 @@
- return "building '%s' from '%s'" % ( str(target[0]), str( source[0] ) )
-
- def PyQtCheck( context ):
-- context.Message( "Checking for pyuic (by checking for the python module pyqtconfig) " )
-+ context.Message( "Checking for pyuic (by checking for the python2 module pyqtconfig) " )
- ret = True
- try:
- imp.find_module( "pyqtconfig" )
-diff -baur libffado-2.4.0.orig/admin/scanreplace.py libffado-2.4.0/admin/scanreplace.py
---- libffado-2.4.0.orig/admin/scanreplace.py 2008-01-20 11:29:17.000000000 +0100
-+++ libffado-2.4.0/admin/scanreplace.py 2017-12-23 19:55:45.581027372 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2007-2008 Arnold Krille
- #
-diff -baur libffado-2.4.0.orig/doc/SConscript libffado-2.4.0/doc/SConscript
---- libffado-2.4.0.orig/doc/SConscript 2008-05-18 21:13:16.000000000 +0200
-+++ libffado-2.4.0/doc/SConscript 2017-12-23 20:06:55.697237554 +0100
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#! /usr/bin/env python2
-
- Import( 'env' )
-
-diff -baur libffado-2.4.0.orig/README libffado-2.4.0/README
---- libffado-2.4.0.orig/README 2017-12-23 11:42:59.000000000 +0100
-+++ libffado-2.4.0/README 2017-12-23 19:57:00.253624504 +0100
-@@ -301,7 +301,7 @@
- It is also possible to run it from the source tree:
-
- $ cd support/tools
-- $ python ffado-diag.py > ffado-diag.log
-+ $ python2 ffado-diag.py > ffado-diag.log
-
- It will check your system for basic problems and gather some information
- regarding your hardware configuration. This will allow us to diagnose
-diff -baur libffado-2.4.0.orig/SConstruct libffado-2.4.0/SConstruct
---- libffado-2.4.0.orig/SConstruct 2017-12-23 11:43:57.000000000 +0100
-+++ libffado-2.4.0/SConstruct 2017-12-23 20:08:33.212882126 +0100
-@@ -50,7 +50,7 @@
- PathVariable( "INCLUDEDIR", "Overwrite the directory where headers are installed to.", "$PREFIX/include", PathVariable.PathAccept ),
- PathVariable( "SHAREDIR", "Overwrite the directory where misc shared files are installed to.", "$PREFIX/share/libffado", PathVariable.PathAccept ),
- PathVariable( "MANDIR", "Overwrite the directory where manpages are installed", "$PREFIX/man", PathVariable.PathAccept ),
-- PathVariable( "PYPKGDIR", "The directory where the python modules get installed.",
-+ PathVariable( "PYPKGDIR", "The directory where the python2 modules get installed.",
- distutils.sysconfig.get_python_lib( prefix="$PREFIX" ), PathVariable.PathAccept ),
- PathVariable( "UDEVDIR", "Overwrite the directory where udev rules are installed to.", "/lib/udev/rules.d/", PathVariable.PathAccept ),
- BoolVariable( "ENABLE_BEBOB", "Enable/Disable support for the BeBoB platform.", True ),
-@@ -163,8 +163,8 @@
- return ret[0]
-
- def CheckForPyModule( context, module ):
-- context.Message( "Checking for the python module '" + module + "' " )
-- ret = context.TryAction( "python $SOURCE", "import %s" % module, ".py" )
-+ context.Message( "Checking for the python2 module '" + module + "' " )
-+ ret = context.TryAction( "python2 $SOURCE", "import %s" % module, ".py" )
- context.Result( ret[0] )
- return ret[0]
-
-@@ -395,9 +395,9 @@
-
- # PyQT checks
- if env['BUILD_MIXER'] != 'false':
-- have_dbus = (conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' ))
-- have_pyqt4 = (conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'PyQt4' ))
-- have_pyqt5 = (conf.CheckForApp( 'which pyuic5' ) and conf.CheckForPyModule( 'PyQt5' ))
-+ have_dbus = (conf.CheckForApp( 'which python2-pyuic4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' ))
-+ have_pyqt4 = (conf.CheckForApp( 'which python2-pyuic4' ) and conf.CheckForPyModule( 'PyQt4' ))
-+ have_pyqt5 = (conf.CheckForApp( 'which python2-pyuic5' ) and conf.CheckForPyModule( 'PyQt5' ))
- if ((have_pyqt4 or have_pyqt5) and have_dbus):
- env['BUILD_MIXER'] = 'true'
- elif not env.GetOption('clean'):
-diff -baur libffado-2.4.0.orig/support/dbus/SConscript libffado-2.4.0/support/dbus/SConscript
---- libffado-2.4.0.orig/support/dbus/SConscript 2017-11-08 11:45:42.000000000 +0100
-+++ libffado-2.4.0/support/dbus/SConscript 2017-12-23 19:57:34.466597349 +0100
-@@ -1,4 +1,4 @@
--#!/bin/env python
-+#!/bin/env python2
- #
- # Copyright (C) 2007,2008,2011 Arnold Krille
- # Copyright (C) 2007-2008 Pieter Palmers
-diff -baur libffado-2.4.0.orig/support/mixer-qt4/ffado/ffadowindow.py libffado-2.4.0/support/mixer-qt4/ffado/ffadowindow.py
---- libffado-2.4.0.orig/support/mixer-qt4/ffado/ffadowindow.py 2017-06-04 09:23:13.000000000 +0200
-+++ libffado-2.4.0/support/mixer-qt4/ffado/ffadowindow.py 2017-12-23 20:03:44.372640789 +0100
-@@ -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.4.0.orig/support/mixer-qt4/ffado-mixer.in libffado-2.4.0/support/mixer-qt4/ffado-mixer.in
---- libffado-2.4.0.orig/support/mixer-qt4/ffado-mixer.in 2012-04-19 01:16:02.000000000 +0200
-+++ libffado-2.4.0/support/mixer-qt4/ffado-mixer.in 2017-12-23 20:00:57.884474310 +0100
-@@ -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.4.0.orig/support/mixer-qt4/ffado-mixer-profiler.in libffado-2.4.0/support/mixer-qt4/ffado-mixer-profiler.in
---- libffado-2.4.0.orig/support/mixer-qt4/ffado-mixer-profiler.in 2012-04-19 01:16:02.000000000 +0200
-+++ libffado-2.4.0/support/mixer-qt4/ffado-mixer-profiler.in 2017-12-23 20:02:11.477004530 +0100
-@@ -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.4.0.orig/support/mixer-qt4/SConscript libffado-2.4.0/support/mixer-qt4/SConscript
---- libffado-2.4.0.orig/support/mixer-qt4/SConscript 2015-04-12 13:18:15.000000000 +0200
-+++ libffado-2.4.0/support/mixer-qt4/SConscript 2017-12-23 20:01:21.157566614 +0100
-@@ -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.4.0.orig/support/tools/ffado-diag.in libffado-2.4.0/support/tools/ffado-diag.in
---- libffado-2.4.0.orig/support/tools/ffado-diag.in 2017-06-03 13:17:13.000000000 +0200
-+++ libffado-2.4.0/support/tools/ffado-diag.in 2017-12-23 19:58:17.006150642 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
-
- #
-@@ -120,8 +120,8 @@
- 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 " PyQt5 (by pyuic5) . %s" % get_version_first_line('pyuic5 --version')
-+ print " PyQt4 (by pyuic4) . %s" % get_version_first_line('python2-pyuic4 --version')
-+ print " PyQt5 (by pyuic5) . %s" % get_version_first_line('python2-pyuic5 --version')
- print " jackd ............. %s" % get_version_first_line('jackd --version')
- print " path ............ %s" % get_command_path('jackd')
- print " flags ........... %s" % get_package_flags("jack")
-Only in libffado-2.4.0/support/tools: ffado-diag.in.orig
-diff -baur libffado-2.4.0.orig/support/tools/ffado-diag-static libffado-2.4.0/support/tools/ffado-diag-static
---- libffado-2.4.0.orig/support/tools/ffado-diag-static 2017-06-03 13:17:13.000000000 +0200
-+++ libffado-2.4.0/support/tools/ffado-diag-static 2017-12-23 19:27:53.417959063 +0100
-@@ -74,8 +74,8 @@
- # 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 " PyQt5 (by pyuic5) . %s" % get_version_first_line('pyuic5 --version')
-+ print " PyQt4 (by pyuic4) . %s" % get_version_first_line('python2-pyuic4 --version')
-+ print " PyQt5 (by pyuic5) . %s" % get_version_first_line('python2-pyuic5 --version')
- print " jackd ............. %s" % get_version_first_line('jackd --version')
- print " path ............ %s" % get_command_path('jackd')
- print " flags ........... %s" % get_package_flags("jack")
-Only in libffado-2.4.0/support/tools: ffado-diag-static.orig
-diff -baur libffado-2.4.0.orig/support/tools/ffado-sandbox-install.py libffado-2.4.0/support/tools/ffado-sandbox-install.py
---- libffado-2.4.0.orig/support/tools/ffado-sandbox-install.py 2017-03-27 11:52:30.000000000 +0200
-+++ libffado-2.4.0/support/tools/ffado-sandbox-install.py 2017-12-23 20:00:16.424904540 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
-
- #
-diff -baur libffado-2.4.0.orig/support/tools/listirqinfo.py libffado-2.4.0/support/tools/listirqinfo.py
---- libffado-2.4.0.orig/support/tools/listirqinfo.py 2017-03-27 12:39:34.000000000 +0200
-+++ libffado-2.4.0/support/tools/listirqinfo.py 2017-12-23 19:59:20.962148592 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
-
- #
-diff -baur libffado-2.4.0.orig/support/tools/SConscript libffado-2.4.0/support/tools/SConscript
---- libffado-2.4.0.orig/support/tools/SConscript 2017-11-08 11:45:42.000000000 +0100
-+++ libffado-2.4.0/support/tools/SConscript 2017-12-23 19:59:56.855108017 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2007-2008 Arnold Krille
- # Copyright (C) 2007-2008 Pieter Palmers
-@@ -42,11 +42,11 @@
-
- #
- # For the the ffado-diag tools
--e['PYTHONDIR'] = Template( os.path.join( e['SHAREDIR'], 'python' ) ).safe_substitute( e )
-+e['PYTHONDIR'] = Template( os.path.join( e['SHAREDIR'], 'python2' ) ).safe_substitute( e )
- # For the installation of the stuff
--e['pythondir'] = Template( os.path.join( e['sharedir'], 'python' ) ).safe_substitute( e )
-+e['pythondir'] = Template( os.path.join( e['sharedir'], 'python2' ) ).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.4.0.orig/tests/dbus_test.py libffado-2.4.0/tests/dbus_test.py
---- libffado-2.4.0.orig/tests/dbus_test.py 2017-03-27 11:52:30.000000000 +0200
-+++ libffado-2.4.0/tests/dbus_test.py 2017-12-23 20:09:02.045914530 +0100
-@@ -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.4.0.orig/tests/python/test-eap-ctrl.py libffado-2.4.0/tests/python/test-eap-ctrl.py
---- libffado-2.4.0.orig/tests/python/test-eap-ctrl.py 2017-03-27 11:52:30.000000000 +0200
-+++ libffado-2.4.0/tests/python/test-eap-ctrl.py 2017-12-23 20:09:54.382036296 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2005-2009 by Pieter Palmers
- #
-diff -baur libffado-2.4.0.orig/tests/python/test-echo-digital.py libffado-2.4.0/tests/python/test-echo-digital.py
---- libffado-2.4.0.orig/tests/python/test-echo-digital.py 2017-03-27 11:52:30.000000000 +0200
-+++ libffado-2.4.0/tests/python/test-echo-digital.py 2017-12-23 20:10:10.005207278 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
-
- '''
- This test is for checking a function to switch digital interface on devices
-diff -baur libffado-2.4.0.orig/tests/python/test-echo-routing.py libffado-2.4.0/tests/python/test-echo-routing.py
---- libffado-2.4.0.orig/tests/python/test-echo-routing.py 2017-03-27 11:52:30.000000000 +0200
-+++ libffado-2.4.0/tests/python/test-echo-routing.py 2017-12-23 20:10:41.498213755 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
-
- '''
- This test is for checking playback-routing of devices based on Echo Fireworks.
More information about the arch-commits
mailing list