[Lunar-commits] r26933 - in moonbase/trunk: . video video/MPlayer video/xine-lib x11-apps/xscreensaver

[Stefan Wold]

Author: ratler
Date: 2007-11-26 20:05:37 +0100 (Mon, 26 Nov 2007)
New Revision: 26933

Removed:
   moonbase/trunk/video/libXvMCW/
Modified:
   moonbase/trunk/aliases
   moonbase/trunk/video/MPlayer/DEPENDS
   moonbase/trunk/video/xine-lib/DEPENDS
   moonbase/trunk/x11-apps/xscreensaver/BUILD
   moonbase/trunk/x11-apps/xscreensaver/DEPENDS
Log:
* Removing libXvMCW, duplicate of libXvMC
* Updated xine-lib and MPlayer to use libXcMC instead
* Added %GLX:mesa-lib mesa-glu alias

xscreensaver
* Removing gle and dependency on %GLUT since freeglut suck
* Added gl and %GLX for opengl support
* Cleaned up BUILD and added a few more default options


Modified: moonbase/trunk/aliases
===================================================================
--- moonbase/trunk/aliases	2007-11-26 15:39:22 UTC (rev 26932)
+++ moonbase/trunk/aliases	2007-11-26 19:05:37 UTC (rev 26933)
@@ -11,3 +11,4 @@
 %SSL:openssl gnutls
 %XMLRENDERER:libxml2 expat
 %X:XOrg7 XOrg6
+%GLX:mesa-lib mesa-glu

Modified: moonbase/trunk/video/MPlayer/DEPENDS
===================================================================
--- moonbase/trunk/video/MPlayer/DEPENDS	2007-11-26 15:39:22 UTC (rev 26932)
+++ moonbase/trunk/video/MPlayer/DEPENDS	2007-11-26 19:05:37 UTC (rev 26933)
@@ -37,7 +37,7 @@
                  "--disable-theora"  \
                  "for OGG/Theora Video Playback" 
 
-optional_depends "libXvMCW" 			       \
+optional_depends "libXvMC" 			       \
 		 "--enable-xvmc --with-xvmclib=XvMCW"  \
 		 ""				       \
 		 "for hardware XvMC acceleration"

Modified: moonbase/trunk/video/xine-lib/DEPENDS
===================================================================
--- moonbase/trunk/video/xine-lib/DEPENDS	2007-11-26 15:39:22 UTC (rev 26932)
+++ moonbase/trunk/video/xine-lib/DEPENDS	2007-11-26 19:05:37 UTC (rev 26933)
@@ -10,7 +10,7 @@
                   "--disable-aalib" \
                   "for ascii art library support"
 
-optional_depends  "libXvMCW" \
+optional_depends  "libXvMC" \
                   "" \
                   "" \
                   "for hw accelerated playback on supported cards"

Modified: moonbase/trunk/x11-apps/xscreensaver/BUILD
===================================================================
--- moonbase/trunk/x11-apps/xscreensaver/BUILD	2007-11-26 15:39:22 UTC (rev 26932)
+++ moonbase/trunk/x11-apps/xscreensaver/BUILD	2007-11-26 19:05:37 UTC (rev 26933)
@@ -2,17 +2,18 @@
 
   # Now lets do the PAM stuff the proper way
   if module_installed Linux-PAM; then
-    OPTS="$OPTS --with-pam --without-shadow"
+    OPTS+=" --with-pam --without-shadow"
   fi
 
-  # Force disable of kerberos
-  OPTS="$OPTS --without-kerberos"
+  OPTS+=" --without-kerberos \
+          --without-gle \
+          --with-xml \
+          --with-dpms-ext \
+          --with-xf86vmode-ext \
+          --with-xf86gamma-ext \
+          --with-proc-interrupts \
+          --enable-locking"
 
-  OPTS="$OPTS --with-xml"
-
-  # Enable locking abilities of xscreensaver
-  OPTS="$OPTS --enable-locking"
-  
   default_build  &&
 
   rm -fR /xscreensaver

Modified: moonbase/trunk/x11-apps/xscreensaver/DEPENDS
===================================================================
--- moonbase/trunk/x11-apps/xscreensaver/DEPENDS	2007-11-26 15:39:22 UTC (rev 26932)
+++ moonbase/trunk/x11-apps/xscreensaver/DEPENDS	2007-11-26 19:05:37 UTC (rev 26933)
@@ -1,7 +1,6 @@
 depends libxml2
 depends netpbm
 depends bc
-depends %GLUT
 depends perl
 
 optional_depends "gettext"  "--enable-nls" "--disable-nls"  \
@@ -10,9 +9,6 @@
 optional_depends "gtk+-2"  "--with-gtk"  "--without-gtk" \
                  "to build the configuration manager"
 
-optional_depends "gle" "--with-gle" "--without-gle" \
-                 "required for some of the screensavers"
-
 optional_depends "fortune"  "--with-fortune=/usr/games/fortune"  ""  \
                  "allow fortune to be used as a text source in screensavers"
 
@@ -21,3 +17,9 @@
 
 optional_depends "xsnow"  ""  ""  \
                  "to allow xsnow to be used as a screensaver"
+
+optional_depends "%GLX" "--with-gl" "--without-gl" \
+                 "for OpenGL screensaver support"
+
+optional_depends "jpeg" "--with-jpeg" "--without-jpeg" \
+                 "for Jpeg support"