Source Mage code commit list

[Thomas Orgis <scm AT sourcemage.org>]

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

 audio-drivers/libffado/HISTORY                         |    6 +++
 audio-drivers/libffado/PRE_BUILD                       |    5 +-
 audio-drivers/libffado/libffado-dbus.mainloop.qt.patch |   15 ++++++++
 audio-drivers/libffado/libffado-env-vars.patch         |   29 
-----------------
 4 files changed, 24 insertions(+), 31 deletions(-)

New commits:
commit 4389ea52e0ffc59c773e21d1ba4362f3e5a7fc21
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    libffado: disable a check that does not work for us

commit 1bbe6e6baa832bb26c36a1bb1491fefce60fc614
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    libffado: does not need the env var patch anymore

diff --git a/audio-drivers/libffado/HISTORY b/audio-drivers/libffado/HISTORY
index 9e1de47..46e0b46 100644
--- a/audio-drivers/libffado/HISTORY
+++ b/audio-drivers/libffado/HISTORY
@@ -1,3 +1,9 @@
+2008-11-22 Thomas Orgis <sobukus AT sourcemage.org>
+       * PRE_BUILD, libffado-env-vars.patch:
+         removed that patch, current trunk got it covered
+       * PRE_BUILD, libffado-dbus.mainloop.qt.patch:
+         disable one (failing) module check so that the mixer can be 
installed
+
 2008-09-29 Thomas Orgis <sobukus AT sourcemage.org>
        * DEPENDS: needs scons
        * PRE_BUILD, libffado-env-vars.patch, libffado-pic.patch:
diff --git a/audio-drivers/libffado/PRE_BUILD 
b/audio-drivers/libffado/PRE_BUILD
index fe2fab5..572419f 100755
--- a/audio-drivers/libffado/PRE_BUILD
+++ b/audio-drivers/libffado/PRE_BUILD
@@ -1,7 +1,8 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
-message "${MESSAGE_COLOR}Patching build use our flags...$DEFAULT_COLOR" &&
-patch -p0 < "$SCRIPT_DIRECTORY/libffado-env-vars.patch" &&
+# detection does not work (yet) for us
+# see http://subversion.ffado.org/ticket/171
+patch -p0 < "$SCRIPT_DIRECTORY/libffado-dbus.mainloop.qt.patch" &&
 if [[ ${SMGL_COMPAT_ARCHS[1]} == alpha ]]; then
   message "${MESSAGE_COLOR}Aptching for portable atomic 
operations...$DEFAULT_COLOR" &&
   patch -p0 < "$SCRIPT_DIRECTORY/libffado-atomic_ops.patch"
diff --git a/audio-drivers/libffado/libffado-dbus.mainloop.qt.patch 
b/audio-drivers/libffado/libffado-dbus.mainloop.qt.patch
new file mode 100644
index 0000000..5887ef5
--- /dev/null
+++ b/audio-drivers/libffado/libffado-dbus.mainloop.qt.patch
@@ -0,0 +1,15 @@
+Index: SConstruct
+===================================================================
+--- SConstruct (Revision 1457)
++++ SConstruct (Arbeitskopie)
+@@ -290,7 +290,9 @@
+ 
+       # PyQT checks
+       build_mixer = False
+-      if conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 
'dbus' ) and conf.CheckForPyModule( 'PyQt4' ) and conf.CheckForPyModule( 
'dbus.mainloop.qt' ):
++      print "NOT testing for dbus.mainloop.qt since there is some issue 
with the test, see http://subversion.ffado.org/ticket/171";
++      if conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 
'dbus' ) and conf.CheckForPyModule( 'PyQt4' ):
++      # and conf.CheckForPyModule( 'dbus.mainloop.qt'):
+               env['PYUIC4'] = True
+               build_mixer = True
+       
diff --git a/audio-drivers/libffado/libffado-env-vars.patch 
b/audio-drivers/libffado/libffado-env-vars.patch
deleted file mode 100644
index 0650f41..0000000
--- a/audio-drivers/libffado/libffado-env-vars.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: SConstruct
-===================================================================
---- SConstruct (Revision 1352)
-+++ SConstruct (Arbeitskopie)
-@@ -535,6 +535,24 @@
- #
- env['top_srcdir'] = env.Dir( "." ).abspath
- 
-+# Be environmentally friendly...
-+import os
-+import SCons.Util
-+
-+if os.environ.has_key('CC'):
-+        env['CC'] = os.environ['CC']
-+if os.environ.has_key('CFLAGS'):
-+        env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
-+if os.environ.has_key('CXX'):
-+        env['CXX'] = os.environ['CXX']
-+if os.environ.has_key('CXXFLAGS'):
-+        env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
-+if os.environ.has_key('LDFLAGS'):
-+        env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
-+if os.environ.has_key('CPPFLAGS'):
-+        env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS'])
-+        env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS'])
-+
- #
- # Start building
- #