Hello community, here is the log from the commit of package ffado for openSUSE:Factory checked in at 2017-12-06 08:57:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ffado (Old) and /work/SRC/openSUSE:Factory/.ffado.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ffado" Wed Dec 6 08:57:46 2017 rev:32 rq:548111 version:2.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ffado/ffado.changes 2017-11-29 10:50:46.140766290 +0100 +++ /work/SRC/openSUSE:Factory/.ffado.new/ffado.changes 2017-12-06 08:57:48.702692509 +0100 @@ -1,0 +2,7 @@ +Mon Dec 4 13:56:01 UTC 2017 - [email protected] + +- Extend libffado-SConstruct-py3.patch: convert more of the build + tools to python3. This allows us not to pull a different version + of python into buildroot than is not already used by SCons. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ffado.spec: same change ++++++ libffado-SConstruct-py3.patch ++++++ --- /var/tmp/diff_new_pack.Ge5LwF/_old 2017-12-06 08:57:50.866613300 +0100 +++ /var/tmp/diff_new_pack.Ge5LwF/_new 2017-12-06 08:57:50.866613300 +0100 @@ -1,7 +1,7 @@ Index: admin/doxygen.py =================================================================== ---- admin/doxygen.py.orig 2008-01-20 12:29:17.000000000 +0200 -+++ admin/doxygen.py 2017-11-24 12:08:14.637543479 +0200 +--- admin/doxygen.py.orig ++++ admin/doxygen.py @@ -43,6 +43,7 @@ import os import os.path import glob @@ -51,8 +51,8 @@ + return env.Detect("doxygen") Index: SConstruct =================================================================== ---- SConstruct.orig 2017-11-24 12:08:14.609542455 +0200 -+++ SConstruct 2017-11-24 15:09:56.225366772 +0200 +--- SConstruct.orig ++++ SConstruct @@ -92,8 +92,8 @@ env = Environment( tools=['default','sca custom_flags = False @@ -101,7 +101,13 @@ Help( """ For building ffado you can set different options as listed below. You have to -@@ -169,19 +169,20 @@ def CheckForPyModule( context, module ): +@@ -164,24 +164,25 @@ def CheckForApp( context, app ): + + def CheckForPyModule( context, module ): + context.Message( "Checking for the python module '" + module + "' " ) +- ret = context.TryAction( "python $SOURCE", "import %s" % module, ".py" ) ++ ret = context.TryAction( "python3 $SOURCE", "import %s" % module, ".py" ) + context.Result( ret[0] ) return ret[0] def CompilerCheck( context ): @@ -503,8 +509,8 @@ def CleanAction( action ): Index: src/SConscript =================================================================== ---- src/SConscript.orig 2015-05-05 14:36:47.000000000 +0200 -+++ src/SConscript 2017-11-24 12:08:14.637543479 +0200 +--- src/SConscript.orig ++++ src/SConscript @@ -284,16 +284,16 @@ if env['ENABLE_GENERICAVC']: if not env.GetOption( "clean" ): @@ -529,8 +535,8 @@ libname_versioned_short = "libffado.so.%s" % libenv['VERSION'].split('.')[0] Index: support/alsa/SConscript =================================================================== ---- support/alsa/SConscript.orig 2009-11-02 23:48:55.000000000 +0200 -+++ support/alsa/SConscript 2017-11-24 12:08:14.637543479 +0200 +--- support/alsa/SConscript.orig ++++ support/alsa/SConscript @@ -37,6 +37,6 @@ env.PrependUnique( LIBS=["ffado"] ) sources = ["alsa_plugin.cpp"] @@ -541,8 +547,8 @@ alsaplugin = env.SharedLibrary( "asound_module_pcm_ffado", sources ) Index: support/dbus/SConscript =================================================================== ---- support/dbus/SConscript.orig 2012-06-13 03:39:07.000000000 +0200 -+++ support/dbus/SConscript 2017-11-24 12:08:14.637543479 +0200 +--- support/dbus/SConscript.orig ++++ support/dbus/SConscript @@ -37,11 +37,11 @@ env.PrependUnique( LIBPATH=[env['build_b env.PrependUnique( LIBS=["ffado", "pthread"] ) @@ -584,8 +590,8 @@ if static_env['BUILD_STATIC_TOOLS']: Index: support/firmware/SConscript =================================================================== ---- support/firmware/SConscript.orig 2012-03-27 16:06:15.000000000 +0200 -+++ support/firmware/SConscript 2017-11-24 12:08:14.637543479 +0200 +--- support/firmware/SConscript.orig ++++ support/firmware/SConscript @@ -30,10 +30,10 @@ env.AppendUnique( CPPPATH=["#/", "#/src" if not env.GetOption( "clean" ): @@ -602,8 +608,8 @@ Index: support/mixer-qt4/SConscript =================================================================== ---- support/mixer-qt4/SConscript.orig 2015-04-12 13:18:15.000000000 +0200 -+++ support/mixer-qt4/SConscript 2017-11-24 12:08:14.637543479 +0200 +--- support/mixer-qt4/SConscript.orig ++++ support/mixer-qt4/SConscript @@ -38,7 +38,7 @@ if env['BUILD_MIXER'] == 'true': arg.append( os.path.join( dirname, name ) ) @@ -615,8 +621,8 @@ e.Depends( "ffado/config.py", "#/SConstruct" ) Index: support/tools/SConscript =================================================================== ---- support/tools/SConscript.orig 2013-05-17 14:37:50.000000000 +0200 -+++ support/tools/SConscript 2017-11-24 12:08:14.637543479 +0200 +--- support/tools/SConscript.orig ++++ support/tools/SConscript @@ -33,7 +33,7 @@ e = env.Clone() e.MergeFlags( "-I#/ -I#/src -L%ssrc -lffado" % env['build_base'] ) if not e.GetOption( "clean" ): @@ -626,10 +632,19 @@ else: e.PrependUnique( LIBS=["expat"] ) +@@ -43,7 +43,7 @@ e['PYTHONDIR'] = Template( os.path.join( + # 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", "python3 support/tools/ffado-diag-static > $TARGET" ) + + e.ScanReplace( "ffado-diag.in" ) + Index: tests/SConscript =================================================================== ---- tests/SConscript.orig 2012-05-02 02:38:14.000000000 +0200 -+++ tests/SConscript 2017-11-24 12:08:14.637543479 +0200 +--- tests/SConscript.orig ++++ tests/SConscript @@ -29,10 +29,10 @@ env.MergeFlags( "-I#/ -I#/src -L%ssrc -l if not env.GetOption( "clean" ): @@ -655,8 +670,8 @@ apps.update( { "test-enhanced-mixer" : "test-enhanced-mixer.cpp" } ) Index: tests/systemtests/SConscript =================================================================== ---- tests/systemtests/SConscript.orig 2010-01-04 18:09:43.000000000 +0200 -+++ tests/systemtests/SConscript 2017-11-24 12:08:14.637543479 +0200 +--- tests/systemtests/SConscript.orig ++++ tests/systemtests/SConscript @@ -30,7 +30,7 @@ env.PrependUnique( LIBPATH=[env['build_b env.PrependUnique( LIBS=["ffado"] ) @@ -666,3 +681,111 @@ env.MergeFlags( "-lrt -lpthread" ) static_env = env.Clone() +Index: support/tools/ffado-diag-static +=================================================================== +--- support/tools/ffado-diag-static.orig ++++ support/tools/ffado-diag-static +@@ -26,7 +26,7 @@ import sys + + # Add the path of the installed dependent files + import os +-import commands ++import subprocess + import re + import logging + +@@ -55,11 +55,11 @@ log = logging.getLogger('staticdiag') + ## main program + if __name__== '__main__': + +- print welcome_msg ++ print(welcome_msg) + + num_args = len(sys.argv) + if num_args not in [1,2]: +- print help ++ print(help) + sys.exit(0) + + if num_args == 2: +@@ -69,23 +69,23 @@ if __name__== '__main__': + elif loglevel == 2: + logging.getLogger('staticdiag').setLevel(logging.DEBUG) + +- print "=== CHECK ===" ++ print("=== CHECK ===") + + # 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 " jackd ............. %s" % get_version_first_line('jackd --version') +- print " path ............ %s" % get_command_path('jackd') +- print " flags ........... %s" % get_package_flags("jack") +- print " libraw1394 ........ %s" % get_package_version("libraw1394") +- print " flags ........... %s" % get_package_flags("libraw1394") +- print " libavc1394 ........ %s" % get_package_version("libavc1394") +- print " flags ........... %s" % get_package_flags("libavc1394") +- print " libiec61883 ....... %s" % get_package_version("libiec61883") +- print " flags ........... %s" % get_package_flags("libiec61883") +- print " libxml++-2.6 ...... %s" % get_package_version("libxml++-2.6") +- print " flags ........... %s" % get_package_flags("libxml++-2.6") +- print " dbus-1 ............ %s" % get_package_version("dbus-1") +- print " flags ........... %s" % get_package_flags("dbus-1") ++ 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(" jackd ............. %s" % get_version_first_line('jackd --version')) ++ print(" path ............ %s" % get_command_path('jackd')) ++ print(" flags ........... %s" % get_package_flags("jack")) ++ print(" libraw1394 ........ %s" % get_package_version("libraw1394")) ++ print(" flags ........... %s" % get_package_flags("libraw1394")) ++ print(" libavc1394 ........ %s" % get_package_version("libavc1394")) ++ print(" flags ........... %s" % get_package_flags("libavc1394")) ++ print(" libiec61883 ....... %s" % get_package_version("libiec61883")) ++ print(" flags ........... %s" % get_package_flags("libiec61883")) ++ print(" libxml++-2.6 ...... %s" % get_package_version("libxml++-2.6")) ++ print(" flags ........... %s" % get_package_flags("libxml++-2.6")) ++ print(" dbus-1 ............ %s" % get_package_version("dbus-1")) ++ print(" flags ........... %s" % get_package_flags("dbus-1")) + +Index: support/tools/ffado_diag_helpers.py +=================================================================== +--- support/tools/ffado_diag_helpers.py.orig ++++ support/tools/ffado_diag_helpers.py +@@ -21,7 +21,7 @@ + import sys + + import os +-import commands ++import subprocess + import re + import logging + +@@ -63,7 +63,7 @@ def check_for_module_loaded(modulename, + def check_for_module_present(modulename): + log.info("Checking if module '%s' is present... " % modulename) + kver = get_kernel_version() +- (exitstatus, outtext) = commands.getstatusoutput("find \"/lib/modules/%s/\" -name '%s.ko' | grep '%s'" % \ ++ (exitstatus, outtext) = subprocess.getstatusoutput("find \"/lib/modules/%s/\" -name '%s.ko' | grep '%s'" % \ + (kver, modulename, modulename) ) + log.debug("find outputs: %s" % outtext) + if outtext == "": +@@ -126,7 +126,7 @@ def check_1394oldstack_devnode_permissio + return False + + def run_command(cmd): +- (exitstatus, outtext) = commands.getstatusoutput(cmd) ++ (exitstatus, outtext) = subprocess.getstatusoutput(cmd) + log.debug("%s outputs: %s" % (cmd, outtext)) + return outtext + +@@ -162,7 +162,7 @@ def list_host_controllers(): + if len(tmp) > 0: + tmp + cmd = lspci_cmd + " -vv -nn -s %s" % tmp[0] +- print run_command(cmd) ++ print(run_command(cmd)) + + def get_juju_permissions(): + return run_command('ls -lh /dev/fw*')
