File libffado-SConstruct-py3.patch of Package ffado

Overview Repositories Revisions Requests Users Attributes Meta

File libffado-SConstruct-py3.patch of Package ffado (Revision 35cd751ac7cbd5d6f4f2269882d10ec5)

Currently displaying revision 35cd751ac7cbd5d6f4f2269882d10ec5 , Show latest

Index: admin/doxygen.py
===================================================================
--- admin/doxygen.py.orig	2018-02-08 11:49:26.735790055 +0200
+++ admin/doxygen.py	2018-02-08 11:49:34.648117432 +0200
@@ -115,6 +115,9 @@ def DoxyfileParse(file_contents):
    for k in to_pop:
       data.pop(k)
 
+   for k in to_pop:
+      data.pop(k)
+
    return data
 
 def DoxySourceScan(node, env, path):
Index: SConstruct
===================================================================
--- SConstruct.orig	2018-02-08 11:49:26.735790055 +0200
+++ SConstruct	2018-02-08 16:49:01.283564374 +0200
@@ -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 ):
-    context.Message( "Checking for a working C-compiler " )
-    ret = context.TryRun( """
+    return True # FIXME: The following TryRun fails on Python3
+    context.Message("Checking for a working c compiler")
+    ret = context.TryRun("""
 #include <stdio.h>
 
-int main() {
-    printf( "Hello World!" );
+int main{
+    printf( "Hello World");
     return 0;
-}""", '.c' )[0]
+}""",".c")[0]
     context.Result( ret )
     if ret == 0:
         return False;
-    context.Message( "Checking for a working C++-compiler " )
-    ret = context.TryRun( """
+    context.Message("Checking for a working c++ compiler")
+    ret = context.TryRun("""
 #include <iostream>
 
 int main() {
@@ -283,7 +284,7 @@ if not env.GetOption('clean'):
         if not('libxml++-3.0' in pkgs):
             pkgs['libxml++-2.6'] = '2.13.0'
 
-    # Provide a way for users to compile newer libffado which will work 
+    # Provide a way for users to compile newer libffado which will work
     # against older jack installations which will not accept the new API
     # version reported at runtime.
     have_jack = conf.CheckPKG('jack')
@@ -372,19 +373,20 @@ results above get rechecked.
     # might not be the best way of testing for these but it's the only
     # way which seems to work properly.  CheckFunc() fails due to
     # argument count problems.
+    # conf.CheckLibWithHeader doesn't work with python3 yet.
     if 'CFLAGS' in env:
         oldcf = env['CFLAGS']
     else:
         oldcf = ""
     env.Append(CFLAGS = '-std=c99')
-    if conf.CheckLibWithHeader( "m", "math.h", "c", "lrint(3.2);" ):
-        HAVE_LRINT = 1
-    else:
-        HAVE_LRINT = 0
-    if conf.CheckLibWithHeader( "m", "math.h", "c", "lrintf(3.2);" ):
-        HAVE_LRINTF = 1
-    else:
-        HAVE_LRINTF = 0
+    #if conf.CheckLibWithHeader( "m", "math.h", "c", "none" ):
+    HAVE_LRINT = 1
+    #else:
+    #    HAVE_LRINT = 0
+    #if conf.CheckLibWithHeader( "m", "math.h", "c", "none" ):
+    HAVE_LRINTF = 1
+   # else:
+    #    HAVE_LRINTF = 0
     env['HAVE_LRINT'] = HAVE_LRINT;
     env['HAVE_LRINTF'] = HAVE_LRINTF;
     env.Replace(CFLAGS=oldcf)
@@ -395,9 +397,9 @@ results above get rechecked.
 
 # 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 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' ))
     if ((have_pyqt4 or have_pyqt5) and have_dbus):
         env['BUILD_MIXER'] = 'true'
     elif not env.GetOption('clean'):
@@ -553,7 +555,7 @@ config = config_guess.split ("-")
 
 needs_fPIC = False
 
-#=== Begin Revised CXXFLAGS ========================================= 
+#=== Begin Revised CXXFLAGS =========================================
 def outputof(*cmd):
     """Run a command without running a shell, return cmd's stdout
     """
@@ -688,7 +690,7 @@ def is_userspace_32bit(cpuinfo):
     # run a completely 32-bit system on a 64-bit capable CPU.
     answer = None
 
-    # If setting DIST_TARGET to i686 on a 64-bit CPU to facilitate 
+    # If setting DIST_TARGET to i686 on a 64-bit CPU to facilitate
     # compilation of a multilib environment, force 32-bit.
     if env['DIST_TARGET'] == 'i686':
         return True
@@ -892,8 +894,8 @@ env.Depends( "config.h", "SConstruct" )
 env.Depends( "config.h", 'cache/options.cache' )
 
 # update version.h whenever the version or SVN revision changes
-env.Depends( "version.h", env.Value(env['REVISION']))
-env.Depends( "version.h", env.Value(env['VERSION']))
+#env.Depends( "version.h", env.Value(env['REVISION'])) # FIXME
+#env.Depends( "version.h", env.Value(env['VERSION'])) # FIXME
 
 env.Depends( "libffado.pc", "SConstruct" )
 pkgconfig = env.ScanReplace( "libffado.pc.in" )
Index: support/mixer-qt4/SConscript
===================================================================
--- support/mixer-qt4/SConscript.orig	2018-02-08 11:49:26.735790055 +0200
+++ support/mixer-qt4/SConscript	2018-02-08 11:49:34.648117432 +0200
@@ -38,7 +38,7 @@ if env['BUILD_MIXER'] == 'true':
                 arg.append( os.path.join( dirname, name ) )
 
     pythonfiles = [ 'ffado/config.py' ]
-    os.path.walk( "ffado", findfiles, pythonfiles )
+    os.walk( "ffado", findfiles, pythonfiles )
 
     e.ScanReplace( "ffado/config.py.in" )
     e.Depends( "ffado/config.py", "#/SConstruct" )
Index: support/tools/SConscript
===================================================================
--- support/tools/SConscript.orig	2018-02-08 11:49:26.735790055 +0200
+++ support/tools/SConscript	2018-02-08 14:58:52.046598793 +0200
@@ -32,13 +32,13 @@ e = env.Clone()
 # Needed to build ffado-set-nickname
 e.MergeFlags( "-I#/ -I#/src -L%ssrc -lffado" % env['build_base'] )
 if not e.GetOption( "clean" ):
-        if not env['SERIALIZE_USE_EXPAT']:
-            if 'LIBXML30_FLAGS' in env :
+	if env['SERIALIZE_USE_EXPAT']:
+		e.PrependUnique( LIBS=["expat"] )
+
+	if 'LIBXML30_FLAGS' in env :
 		e.MergeFlags( env['LIBXML30_FLAGS'].decode() )
-            if not('LIBXML30_FLAGS' in env) :
-                e.MergeFlags( env['LIBXML26_FLAGS'].decode() )
-        else:
-                e.PrependUnique( LIBS=["expat"] )
+	if not('LIBXML30_FLAGS' in env) :
+		e.MergeFlags( env['LIBXML26_FLAGS'].decode() )
 
 #
 # For the the ffado-diag tools
@@ -46,7 +46,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: support/tools/ffado-diag-static
===================================================================
--- support/tools/ffado-diag-static.orig	2018-02-08 11:49:26.735790055 +0200
+++ support/tools/ffado-diag-static	2018-02-08 15:13:32.730894937 +0200
@@ -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,24 +69,24 @@ 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 "   PyQt5 (by pyuic5) . %s" % get_version_first_line('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")
-    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( "   PyQt5 (by pyuic5) . %s" % get_version_first_line('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"))
+    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: src/SConscript
===================================================================
--- src/SConscript.orig	2018-02-08 11:49:26.735790055 +0200
+++ src/SConscript	2018-02-08 14:46:29.086469679 +0200
@@ -284,19 +284,20 @@ if env['ENABLE_GENERICAVC']:
 
 if not env.GetOption( "clean" ):
 	libenv.MergeFlags( "-lrt -lpthread" )
-	libenv.MergeFlags( env['LIBRAW1394_FLAGS'].decode() )
-	libenv.MergeFlags( env['LIBIEC61883_FLAGS'].decode() )
-	libenv.MergeFlags( env['LIBCONFIG_FLAGS'].decode() )
-	if not env['SERIALIZE_USE_EXPAT']:
-            if 'LIBXML30_FLAGS' in env :
-		libenv.MergeFlags( env['LIBXML30_FLAGS'].decode() )
-            if not('LIBXML30_FLAGS' in env) :
-		libenv.MergeFlags( env['LIBXML26_FLAGS'].decode() )
-	else:
+	libenv.MergeFlags( env['LIBRAW1394_FLAGS'].decode())
+	libenv.MergeFlags( env['LIBIEC61883_FLAGS'].decode())
+	libenv.MergeFlags( env['LIBCONFIG_FLAGS'].decode())
+	if env['SERIALIZE_USE_EXPAT']:
 		libenv.PrependUnique( LIBS=["expat"] )
-		libenv.MergeFlags( "-DSERIALIZE_USE_EXPAT" )
+		ibenv.MergeFlags( "-DSERIALIZE_USE_EXPAT" )
+
+	if 'LIBXML30_FLAGS' in env :
+		libenv.MergeFlags( env['LIBXML30_FLAGS'].decode())
+	else:
+		libenv.MergeFlags( env['LIBXML26_FLAGS'].decode())
+
 	if env['REQUIRE_LIBAVC']:
-		libenv.MergeFlags( env['LIBAVC1394_FLAGS'].decode() )
+		libenv.MergeFlags( env['LIBAVC1394_FLAGS'].decode())
 
 libname_versioned = "libffado.so.%s" % libenv['VERSION']
 libname_versioned_short = "libffado.so.%s" % libenv['VERSION'].split('.')[0]
Index: tests/SConscript
===================================================================
--- tests/SConscript.orig	2018-02-08 11:49:26.735790055 +0200
+++ tests/SConscript	2018-02-08 15:05:15.811053582 +0200
@@ -31,13 +31,12 @@ if not env.GetOption( "clean" ):
 	env.MergeFlags( "-lpthread" )
 	env.MergeFlags( env['LIBIEC61883_FLAGS'].decode() )
 	env.MergeFlags( env['LIBRAW1394_FLAGS'].decode() )
-	if not env['SERIALIZE_USE_EXPAT']:
-            if 'LIBXML30_FLAGS' in env :
+	if env['SERIALIZE_USE_EXPAT']:
+		env.PrependUnique( LIBS=["expat"] )
+	if 'LIBXML30_FLAGS' in env :
 		env.MergeFlags( env['LIBXML30_FLAGS'].decode() )
-            if not('LIBXML30_FLAGS' in env) :
+	if not('LIBXML30_FLAGS' in env) :
 		env.MergeFlags( env['LIBXML26_FLAGS'].decode() )
-	else:
-		env.PrependUnique( LIBS=["expat"] )
 
 static_env = env.Clone()

Places

File libffado-SConstruct-py3.patch of Package ffado (Revision 35cd751ac7cbd5d6f4f2269882d10ec5)

Places