summaryrefslogtreecommitdiffstats
path: root/audio-drivers/libffado
diff options
context:
space:
mode:
authorThomas Orgis2008-11-22 20:44:04 +0100
committerThomas Orgis2008-11-22 20:44:04 +0100
commit4389ea52e0ffc59c773e21d1ba4362f3e5a7fc21 (patch)
tree54e0f61d7137106472df3c445b6370a1ab8be61a /audio-drivers/libffado
parent1bbe6e6baa832bb26c36a1bb1491fefce60fc614 (diff)
libffado: disable a check that does not work for us
Diffstat (limited to 'audio-drivers/libffado')
-rw-r--r--audio-drivers/libffado/HISTORY2
-rwxr-xr-xaudio-drivers/libffado/PRE_BUILD3
-rw-r--r--audio-drivers/libffado/libffado-dbus.mainloop.qt.patch15
3 files changed, 20 insertions, 0 deletions
diff --git a/audio-drivers/libffado/HISTORY b/audio-drivers/libffado/HISTORY
index 88f5681776..46e0b46368 100644
--- a/audio-drivers/libffado/HISTORY
+++ b/audio-drivers/libffado/HISTORY
@@ -1,6 +1,8 @@
2008-11-22 Thomas Orgis <sobukus@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@sourcemage.org>
* DEPENDS: needs scons
diff --git a/audio-drivers/libffado/PRE_BUILD b/audio-drivers/libffado/PRE_BUILD
index 67a868655b..572419f1eb 100755
--- a/audio-drivers/libffado/PRE_BUILD
+++ b/audio-drivers/libffado/PRE_BUILD
@@ -1,5 +1,8 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
+# 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 0000000000..5887ef566a
--- /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
+