diff options
| author | Thomas Orgis | 2008-11-24 12:17:31 +0100 |
|---|---|---|
| committer | Thomas Orgis | 2008-11-24 12:17:31 +0100 |
| commit | 31c449ff8a7c6ac048850fb7444f71a64eaf5c75 (patch) | |
| tree | c5ad5cbbc875865c7d8157ce7c1eb0f6d79d2e59 /audio-drivers/libffado | |
| parent | 87737998d426f808f4ecde88eccb3c69e600e1d4 (diff) | |
libffado: dbus qt module check works now via upstream, patch not needed
Diffstat (limited to 'audio-drivers/libffado')
| -rw-r--r-- | audio-drivers/libffado/HISTORY | 3 | ||||
| -rwxr-xr-x | audio-drivers/libffado/PRE_BUILD | 3 | ||||
| -rw-r--r-- | audio-drivers/libffado/libffado-dbus.mainloop.qt.patch | 15 |
3 files changed, 3 insertions, 18 deletions
diff --git a/audio-drivers/libffado/HISTORY b/audio-drivers/libffado/HISTORY index 46e0b46368..9e7745cbbb 100644 --- a/audio-drivers/libffado/HISTORY +++ b/audio-drivers/libffado/HISTORY @@ -1,3 +1,6 @@ +2008-11-24 Thomas Orgis <sobukus@sourcemage.org> + * PRE_BUILD, libffado-dbus.mainloop.qt.patch: patch not needed anymore + 2008-11-22 Thomas Orgis <sobukus@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 572419f1eb..67a868655b 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 5887ef566a..0000000000 --- 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 - |