[Lunar-commits] <moonbase> kde4/utils: Some adjustments to phonon and its backends BUILD/DEPENDS.

[Dennis `stumbles` Veatch]

commit bd2f6f72fe22f2889db7be723a3c2bd2b3f04cfe
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Tue May 10 16:20:52 2011 -0400

    kde4/utils: Some adjustments to phonon and its backends BUILD/DEPENDS.
---
 kde4/utils/phonon-backend-gstreamer/BUILD |   10 +++-------
 kde4/utils/phonon-backend-xine/BUILD      |   10 +++-------
 kde4/utils/phonon-backend-xine/DEPENDS    |    2 ++
 kde4/utils/phonon/BUILD                   |   10 +++-------
 kde4/utils/phonon/DEPENDS                 |    6 +++---
 5 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/kde4/utils/phonon-backend-gstreamer/BUILD b/kde4/utils/phonon-backend-gstreamer/BUILD
index 0ca415a..d064572 100644
--- a/kde4/utils/phonon-backend-gstreamer/BUILD
+++ b/kde4/utils/phonon-backend-gstreamer/BUILD
@@ -2,16 +2,12 @@
 
   export CFLAGS="$CFLAGS -fPIC" &&
 
-  OOSB_DIR="$SOURCE_DIRECTORY/$MODULE-build" &&
-
   source /etc/profile.d/qt4.rc   &&
   source /etc/profile.d/kde4.rc  &&
 
-  mkdir $OOSB_DIR  &&
-  cd $OOSB_DIR     &&
-
-  cmake $SOURCE_DIRECTORY/ -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX  \
-                           -DCMAKE_BUILD_TYPE=RELEASE            &&
+  cmake -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX  \
+        -DCMAKE_BUILD_TYPE=RELEASE             \
+        $OPTS .                               &&
 
   default_make
 
diff --git a/kde4/utils/phonon-backend-xine/BUILD b/kde4/utils/phonon-backend-xine/BUILD
index 0ca415a..d064572 100644
--- a/kde4/utils/phonon-backend-xine/BUILD
+++ b/kde4/utils/phonon-backend-xine/BUILD
@@ -2,16 +2,12 @@
 
   export CFLAGS="$CFLAGS -fPIC" &&
 
-  OOSB_DIR="$SOURCE_DIRECTORY/$MODULE-build" &&
-
   source /etc/profile.d/qt4.rc   &&
   source /etc/profile.d/kde4.rc  &&
 
-  mkdir $OOSB_DIR  &&
-  cd $OOSB_DIR     &&
-
-  cmake $SOURCE_DIRECTORY/ -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX  \
-                           -DCMAKE_BUILD_TYPE=RELEASE            &&
+  cmake -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX  \
+        -DCMAKE_BUILD_TYPE=RELEASE             \
+        $OPTS .                               &&
 
   default_make
 
diff --git a/kde4/utils/phonon-backend-xine/DEPENDS b/kde4/utils/phonon-backend-xine/DEPENDS
index fd98634..d540c29 100644
--- a/kde4/utils/phonon-backend-xine/DEPENDS
+++ b/kde4/utils/phonon-backend-xine/DEPENDS
@@ -1,2 +1,4 @@
 depends phonon
 depends "%XINELIB"
+
+optional_depends libxcb "-DWITH_XCB=ON" "-DWITH_XCB=OFF" "for X Window System protocol support"
diff --git a/kde4/utils/phonon/BUILD b/kde4/utils/phonon/BUILD
index de852d9..b7ddf7c 100644
--- a/kde4/utils/phonon/BUILD
+++ b/kde4/utils/phonon/BUILD
@@ -2,16 +2,12 @@
 
   export CFLAGS="$CFLAGS -fPIC" &&
 
-  OOSB_DIR="$SOURCE_DIRECTORY/$MODULE-build" &&
-
   source /etc/profile.d/qt4.rc   &&
   source /etc/profile.d/kde4.rc  &&
 
-  mkdir $OOSB_DIR  &&
-  cd $OOSB_DIR     &&
-
-  cmake $SOURCE_DIRECTORY/ -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX  \
-                           -DCMAKE_BUILD_TYPE=RELEASE            &&
+  cmake -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX  \
+        -DCMAKE_BUILD_TYPE=RELEASE             \
+        $OPTS .                               &&
 
   default_make  
 
diff --git a/kde4/utils/phonon/DEPENDS b/kde4/utils/phonon/DEPENDS
index e92ea82..5e6bf25 100644
--- a/kde4/utils/phonon/DEPENDS
+++ b/kde4/utils/phonon/DEPENDS
@@ -2,6 +2,6 @@ depends qt4
 depends makeobj
 depends automoc
 
-optional_depends "gst-plugins-base"  ""  "" "for gstreamer audio support"
-optional_depends "%XINELIB"          ""  "" "for xine multimedia support"
-optional_depends "libqzeitgeist"     ""  "" "for logging of activities and events"
+optional_depends "glib-2"        "-DWITH_GLIB2=ON"       "-DWITH_GLIB2=OFF"      "for glib-2 support"
+optional_depends "pulseaudio"    "-DWITH_PulseAudio=ON"  "-DWITH_PulseAudio=OFF" "for pulseaudio audio support"
+optional_depends "libqzeitgeist" "-DWITH_QZeitgeist=ON"  "-DWITH_QZeitgeist=OFF" "for logging of activities and events"