Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (56d3467fa103119f211c39c73784b32659f4d791)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (56d3467fa103119f211c39c73784b32659f4d791)
  • Date: Mon, 24 Nov 2008 05:20:32 -0600

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

audio-drivers/libffado/HISTORY | 3 +++
audio-drivers/libffado/PRE_BUILD | 3 ---
audio-drivers/libffado/libffado-dbus.mainloop.qt.patch | 15 ---------------
3 files changed, 3 insertions(+), 18 deletions(-)

New commits:
commit 31c449ff8a7c6ac048850fb7444f71a64eaf5c75
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

libffado: dbus qt module check works now via upstream, patch not needed

diff --git a/audio-drivers/libffado/HISTORY b/audio-drivers/libffado/HISTORY
index 46e0b46..9e7745c 100644
--- a/audio-drivers/libffado/HISTORY
+++ b/audio-drivers/libffado/HISTORY
@@ -1,3 +1,6 @@
+2008-11-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD, libffado-dbus.mainloop.qt.patch: patch not needed anymore
+
2008-11-22 Thomas Orgis <sobukus AT sourcemage.org>
* PRE_BUILD, libffado-env-vars.patch:
removed that patch, current trunk got it covered
diff --git a/audio-drivers/libffado/PRE_BUILD
b/audio-drivers/libffado/PRE_BUILD
index 572419f..67a8686 100755
--- a/audio-drivers/libffado/PRE_BUILD
+++ b/audio-drivers/libffado/PRE_BUILD
@@ -1,8 +1,5 @@
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
deleted file mode 100644
index 5887ef5..0000000
--- a/audio-drivers/libffado/libffado-dbus.mainloop.qt.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
-



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (56d3467fa103119f211c39c73784b32659f4d791), Thomas Orgis, 11/24/2008

Archive powered by MHonArc 2.6.24.

Top of Page