[SM-Commit] PERFORCE change 78343 by Juuso Alasuutari for review

Perforce Review Daemon p4review at smee.org
Mon Apr 24 15:50:01 EDT 2006


Change 78343 by juuso_alasuutari at juuso_alasuutari-kamayuq on 2006/04/24 20:49:53

	config_query_multi for mplayer/xine-lib/gst-plugins to test

Affected files ...

... //sgl/grimoires/test/video/kmplayer/BUILD#1 branch
... //sgl/grimoires/test/video/kmplayer/CONFIGURE#1 branch
... //sgl/grimoires/test/video/kmplayer/DEPENDS#3 integrate
... //sgl/grimoires/test/video/kmplayer/HISTORY#20 integrate

Differences ...

==== //sgl/grimoires/test/video/kmplayer/DEPENDS#3 (xtext) ====

@@ -1,20 +1,23 @@
-depends  mplayer  &&
 depends  kdelibs  &&
 
+if list_find "$BACKENDS" "mplayer"; then
+  depends  mplayer
+fi  &&
+if list_find "$BACKENDS" "xine"; then
+  depends  xine-lib
+fi  &&
+if list_find "$BACKENDS" "gstreamer"; then
+  depends  gst-plugins
+fi  &&
+
 optional_depends arts  ""  "--without-arts"  "for arts support"  &&
-optional_depends gst-plugins "" "--without-gstreamer" "for gstreamer backend" &&
 
-optional_depends  koffice                     \
-                  ""                          \
-                  "--disable-koffice-plugin"  \
-                  "for koffice integration"   &&
-
 optional_depends  LIBAVCODEC                    \
                   ""                            \
                   ""                            \
                   "for recording using ffmpeg"  &&
 
-optional_depends  xine-lib            \
-                  ""                  \
-                  "--without-xine"    \
-                  "for xine backend"
+optional_depends  koffice                     \
+                  ""                          \
+                  "--disable-koffice-plugin"  \
+                  "for koffice integration"

==== //sgl/grimoires/test/video/kmplayer/HISTORY#20 (text) ====

@@ -1,4 +1,11 @@
-2006-04-22Treeve Jelbert <treeve01 at pi.be>
+2006-04-24 Juuso Alasuutari <iuso at sourcemage.org>
+	* CONFIGURE: Added, uses config_query_multi to select mplayer / 
+	  xine / gstreamer backends.
+	* DEPENDS: Removed depends mplayer, added conditionals for 
+	  depends mplayer / xine-lib / gst-plugins
+	* BUILD: Added, adds stuff in $OPTS for mentioned choices
+
+2006-04-22 Treeve Jelbert <treeve01 at pi.be>
 	* DETAILS: version 0.9.2
 
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>



More information about the SM-Commit mailing list