[Lunar-commits] <moonbase> qt4: phonon module now optional

[Michael 'v4hn' Goerner]

commit cc9afd66e39ea7df0529a23da57a7ff3cec49c63
Author: Michael 'v4hn' Goerner <v4hn at lunar-linux.org>
Date:   Tue Sep 28 15:00:24 2010 +0200

    qt4: phonon module now optional
    
    qt4-phonon depends hardly on gstreamer now,
    so build this only when gstreamer is selected.
---
 qt4-apps/qt4/BUILD   |    4 ++--
 qt4-apps/qt4/DEPENDS |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/qt4-apps/qt4/BUILD b/qt4-apps/qt4/BUILD
index 9882116..dccf3ef 100644
--- a/qt4-apps/qt4/BUILD
+++ b/qt4-apps/qt4/BUILD
@@ -23,7 +23,7 @@
     OPTS+=" -make examples -make demos -make tools -make docs -make translations"
   fi &&
 
-  OPTS+=" -largefile -phonon -multimedia -audio-backend -no-separate-debug-info -script -release -scripttools -accessibility -glib -optimized-qmake -xmlpatterns -fast -shared" &&
+  OPTS+=" -largefile -multimedia -audio-backend -no-separate-debug-info -script -release -scripttools -accessibility -glib -optimized-qmake -xmlpatterns -fast -shared" &&
 
   echo "yes" | ./configure                             \
                -prefix /usr                            \
@@ -44,7 +44,7 @@
 # It wants to point moc_location and uic_location to ${prefix}/src/qt-everywhere-opensource-src-4.7.0-beta2/bin
 # and after much fiddling cannot get it to point them to /usr/bin. So lets just sedit these rascals.
   for i in `ls /usr/lib/$MODULE/pkgconfig/Q*.pc` ; do sed -i "s:\${prefix}/src/qt-everywhere-opensource-src-$VERSION/:\${prefix}/:" $i ; done &&
-  sed -i "s:\${prefix}/src/qt-everywhere-opensource-src-$VERSION/:\${prefix}/:"  /usr/lib/$MODULE/pkgconfig/phonon.pc &&
+  sed -i "s:\${prefix}/src/qt-everywhere-opensource-src-$VERSION/:\${prefix}/:"  /usr/lib/$MODULE/pkgconfig/phonon.pc || true &&
 
   if [ "$MAKE_QDOC3" == "y" ]; then
      cd tools/qdoc3 &&
diff --git a/qt4-apps/qt4/DEPENDS b/qt4-apps/qt4/DEPENDS
index efae85c..5acb323 100644
--- a/qt4-apps/qt4/DEPENDS
+++ b/qt4-apps/qt4/DEPENDS
@@ -10,7 +10,7 @@ optional_depends  "cups"       "-cups"             "-no-cups"       "for printin
 optional_depends  "nas"        "-system-nas-sound" "-no-nas-sound"  "for Network Audio System support"
 optional_depends  "pulseaudio" ""                  ""               "for pulseaudio support"
 
-optional_depends  "gst-plugins-base"  ""  ""  "for gstreamer support"
+optional_depends  "gst-plugins-base"  "-phonon"  "-no-phonon"  "for gstreamer support / qt4-phonon module"
 
 optional_depends  "%JAVA_SDK"  "-javascript-jit"   "-no-javascript-jit" "for JIT support"