[Lunar-commits] r19137 - in moonbase/trunk: . games/TORCS games/asteroids3D games/battalion games/bzflag games/celestia games/csmash games/foobillard games/gl-117 games/glaxium games/gltron games/kobodeluxe games/openuniverse games/tuxracer graphics graphics/evas graphics/gtkglarea graphics/gtkglarea2 graphics/plib libs/gle python/PyOpenGL science/celestia-gtk video/xine-lib x11/xplanet x11-apps/xlockmore x11-apps/xscreensaver x11-apps/xscreensaver-gtk1 x11-apps/xscreensaver-kde x11-wm/3ddesktop zbeta zbeta/linux-dri-x86
Jan Eidtmann
cmak at lunar-linux.org
Mon Mar 6 15:39:13 UTC 2006
Author: cmak
Date: 2006-03-06 15:39:11 +0000 (Mon, 06 Mar 2006)
New Revision: 19137
Added:
moonbase/trunk/graphics/freeglut/
Removed:
moonbase/trunk/zbeta/freeglut/
Modified:
moonbase/trunk/aliases
moonbase/trunk/games/TORCS/DEPENDS
moonbase/trunk/games/asteroids3D/DEPENDS
moonbase/trunk/games/battalion/DEPENDS
moonbase/trunk/games/bzflag/DEPENDS
moonbase/trunk/games/celestia/DEPENDS
moonbase/trunk/games/csmash/DEPENDS
moonbase/trunk/games/foobillard/DEPENDS
moonbase/trunk/games/gl-117/DEPENDS
moonbase/trunk/games/glaxium/DEPENDS
moonbase/trunk/games/gltron/DEPENDS
moonbase/trunk/games/kobodeluxe/DEPENDS
moonbase/trunk/games/openuniverse/DEPENDS
moonbase/trunk/games/tuxracer/DEPENDS
moonbase/trunk/graphics/evas/DEPENDS
moonbase/trunk/graphics/gtkglarea/DEPENDS
moonbase/trunk/graphics/gtkglarea2/DEPENDS
moonbase/trunk/graphics/plib/DEPENDS
moonbase/trunk/libs/gle/DEPENDS
moonbase/trunk/python/PyOpenGL/DEPENDS
moonbase/trunk/science/celestia-gtk/DEPENDS
moonbase/trunk/video/xine-lib/DEPENDS
moonbase/trunk/x11-apps/xlockmore/DEPENDS
moonbase/trunk/x11-apps/xscreensaver-gtk1/DEPENDS
moonbase/trunk/x11-apps/xscreensaver-kde/DEPENDS
moonbase/trunk/x11-apps/xscreensaver/DEPENDS
moonbase/trunk/x11-wm/3ddesktop/DEPENDS
moonbase/trunk/x11/xplanet/DEPENDS
moonbase/trunk/zbeta/linux-dri-x86/BUILD
Log:
adding alias for glut
Modified: moonbase/trunk/aliases
===================================================================
--- moonbase/trunk/aliases 2006-03-06 15:20:03 UTC (rev 19136)
+++ moonbase/trunk/aliases 2006-03-06 15:39:11 UTC (rev 19137)
@@ -8,3 +8,4 @@
%XMLRENDERER: libxml2 expat
%XSCREENSAVER:xscreensaver xscreensaver-gtk1 xscreensaver-kde
%SSL:openssl gnutls
+%GLUT:glut freeglut
Modified: moonbase/trunk/games/TORCS/DEPENDS
===================================================================
--- moonbase/trunk/games/TORCS/DEPENDS 2006-03-06 15:20:03 UTC (rev 19136)
+++ moonbase/trunk/games/TORCS/DEPENDS 2006-03-06 15:39:11 UTC (rev 19137)
@@ -1,3 +1,3 @@
depends plib &&
-depends glut &&
+depends %GLUT &&
depends libpng
Modified: moonbase/trunk/games/asteroids3D/DEPENDS
===================================================================
--- moonbase/trunk/games/asteroids3D/DEPENDS 2006-03-06 15:20:03 UTC (rev 19136)
+++ moonbase/trunk/games/asteroids3D/DEPENDS 2006-03-06 15:39:11 UTC (rev 19137)
@@ -1 +1 @@
-depends glut
+depends %GLUT
Modified: moonbase/trunk/games/battalion/DEPENDS
===================================================================
--- moonbase/trunk/games/battalion/DEPENDS 2006-03-06 15:20:03 UTC (rev 19136)
+++ moonbase/trunk/games/battalion/DEPENDS 2006-03-06 15:39:11 UTC (rev 19137)
@@ -1 +1 @@
-depends glut
+depends %GLUT
Modified: moonbase/trunk/games/bzflag/DEPENDS
===================================================================
--- moonbase/trunk/games/bzflag/DEPENDS 2006-03-06 15:20:03 UTC (rev 19136)
+++ moonbase/trunk/games/bzflag/DEPENDS 2006-03-06 15:39:11 UTC (rev 19137)
@@ -1,2 +1,2 @@
-depends glut &&
+depends %GLUT &&
depends SDL
Modified: moonbase/trunk/games/celestia/DEPENDS
===================================================================
--- moonbase/trunk/games/celestia/DEPENDS 2006-03-06 15:20:03 UTC (rev 19136)
+++ moonbase/trunk/games/celestia/DEPENDS 2006-03-06 15:39:11 UTC (rev 19137)
@@ -1,6 +1,6 @@
depends jpeg &&
depends libpng &&
-depends glut &&
+depends %GLUT &&
optional_depends "qt3" \
"--with-kde --without-gtk" \
"--without-kde --without-gtk" \
Modified: moonbase/trunk/games/csmash/DEPENDS
===================================================================
--- moonbase/trunk/games/csmash/DEPENDS 2006-03-06 15:20:03 UTC (rev 19136)
+++ moonbase/trunk/games/csmash/DEPENDS 2006-03-06 15:39:11 UTC (rev 19137)
@@ -1,5 +1,5 @@
depends gtk+-2 &&
-depends glut &&
+depends %GLUT &&
depends SDL_image &&
depends SDL_mixer &&
depends libvorbis
Modified: moonbase/trunk/games/foobillard/DEPENDS
===================================================================
--- moonbase/trunk/games/foobillard/DEPENDS 2006-03-06 15:20:03 UTC (rev 19136)
+++ moonbase/trunk/games/foobillard/DEPENDS 2006-03-06 15:39:11 UTC (rev 19137)
@@ -1,6 +1,6 @@
depends freetype2 &&
depends libpng &&
-depends glut &&
+depends %GLUT &&
optional_depends "NVIDIA" "--enable-bumpref=yes" "--enable-bumpref=no" \
"for extended NV OpenGL functions"
Modified: moonbase/trunk/games/gl-117/DEPENDS
===================================================================
--- moonbase/trunk/games/gl-117/DEPENDS 2006-03-06 15:20:03 UTC (rev 19136)
+++ moonbase/trunk/games/gl-117/DEPENDS 2006-03-06 15:39:11 UTC (rev 19137)
@@ -1,2 +1,2 @@
depends SDL_mixer &&
-depends glut
+depends %GLUT
Modified: moonbase/trunk/games/glaxium/DEPENDS
===================================================================
--- moonbase/trunk/games/glaxium/DEPENDS 2006-03-06 15:20:03 UTC (rev 19136)
+++ moonbase/trunk/games/glaxium/DEPENDS 2006-03-06 15:39:11 UTC (rev 19137)
@@ -1,2 +1,2 @@
-depends glut &&
+depends %GLUT &&
depends SDL_mixer
Modified: moonbase/trunk/games/gltron/DEPENDS
===================================================================
--- moonbase/trunk/games/gltron/DEPENDS 2006-03-06 15:20:03 UTC (rev 19136)
+++ moonbase/trunk/games/gltron/DEPENDS 2006-03-06 15:39:11 UTC (rev 19137)
@@ -1,2 +1,2 @@
-depends glut &&
+depends %GLUT &&
depends SDL_sound
Modified: moonbase/trunk/games/kobodeluxe/DEPENDS
===================================================================
--- moonbase/trunk/games/kobodeluxe/DEPENDS 2006-03-06 15:20:03 UTC (rev 19136)
+++ moonbase/trunk/games/kobodeluxe/DEPENDS 2006-03-06 15:39:11 UTC (rev 19137)
@@ -1,3 +1,3 @@
depends SDL_image &&
-optional_depends "glut" "--enable-gl" "" "For OpenGL support"
+optional_depends "%GLUT" "--enable-gl" "" "For OpenGL support"
Modified: moonbase/trunk/games/openuniverse/DEPENDS
===================================================================
--- moonbase/trunk/games/openuniverse/DEPENDS 2006-03-06 15:20:03 UTC (rev 19136)
+++ moonbase/trunk/games/openuniverse/DEPENDS 2006-03-06 15:39:11 UTC (rev 19137)
@@ -1,2 +1,2 @@
-depends glut
+depends %GLUT
#depends glui
Modified: moonbase/trunk/games/tuxracer/DEPENDS
===================================================================
--- moonbase/trunk/games/tuxracer/DEPENDS 2006-03-06 15:20:03 UTC (rev 19136)
+++ moonbase/trunk/games/tuxracer/DEPENDS 2006-03-06 15:39:11 UTC (rev 19137)
@@ -1,4 +1,4 @@
optional_depends NVIDIA "" "" "Needed if you have an Nvidia graphics card" &&
depends tk &&
-depends glut &&
+depends %GLUT &&
depends SDL_mixer
Modified: moonbase/trunk/graphics/evas/DEPENDS
===================================================================
--- moonbase/trunk/graphics/evas/DEPENDS 2006-03-06 15:20:03 UTC (rev 19136)
+++ moonbase/trunk/graphics/evas/DEPENDS 2006-03-06 15:39:11 UTC (rev 19137)
@@ -1,2 +1,2 @@
depends imlib2_loaders &&
-depends glut
+depends %GLUT
Copied: moonbase/trunk/graphics/freeglut (from rev 19135, moonbase/trunk/zbeta/freeglut)
Modified: moonbase/trunk/graphics/gtkglarea/DEPENDS
===================================================================
--- moonbase/trunk/graphics/gtkglarea/DEPENDS 2006-03-06 15:20:03 UTC (rev 19136)
+++ moonbase/trunk/graphics/gtkglarea/DEPENDS 2006-03-06 15:39:11 UTC (rev 19137)
@@ -1,2 +1,2 @@
depends gtk+ &&
-depends glut
+depends %GLUT
Modified: moonbase/trunk/graphics/gtkglarea2/DEPENDS
===================================================================
--- moonbase/trunk/graphics/gtkglarea2/DEPENDS 2006-03-06 15:20:03 UTC (rev 19136)
+++ moonbase/trunk/graphics/gtkglarea2/DEPENDS 2006-03-06 15:39:11 UTC (rev 19137)
@@ -1,2 +1,2 @@
depends gtk+ &&
-depends glut
+depends %GLUT
Modified: moonbase/trunk/graphics/plib/DEPENDS
===================================================================
--- moonbase/trunk/graphics/plib/DEPENDS 2006-03-06 15:20:03 UTC (rev 19136)
+++ moonbase/trunk/graphics/plib/DEPENDS 2006-03-06 15:39:11 UTC (rev 19137)
@@ -1 +1 @@
-depends glut
+depends %GLUT
Modified: moonbase/trunk/libs/gle/DEPENDS
===================================================================
--- moonbase/trunk/libs/gle/DEPENDS 2006-03-06 15:20:03 UTC (rev 19136)
+++ moonbase/trunk/libs/gle/DEPENDS 2006-03-06 15:39:11 UTC (rev 19137)
@@ -1 +1 @@
-depends glut
+depends %GLUT
Modified: moonbase/trunk/python/PyOpenGL/DEPENDS
===================================================================
--- moonbase/trunk/python/PyOpenGL/DEPENDS 2006-03-06 15:20:03 UTC (rev 19136)
+++ moonbase/trunk/python/PyOpenGL/DEPENDS 2006-03-06 15:39:11 UTC (rev 19137)
@@ -1,2 +1,2 @@
-depends glut &&
+depends %GLUT &&
depends numpy
Modified: moonbase/trunk/science/celestia-gtk/DEPENDS
===================================================================
--- moonbase/trunk/science/celestia-gtk/DEPENDS 2006-03-06 15:20:03 UTC (rev 19136)
+++ moonbase/trunk/science/celestia-gtk/DEPENDS 2006-03-06 15:39:11 UTC (rev 19137)
@@ -1,5 +1,5 @@
depends libpng &&
-depends glut &&
+depends %GLUT &&
depends gtkglext &&
depends lua
Modified: moonbase/trunk/video/xine-lib/DEPENDS
===================================================================
--- moonbase/trunk/video/xine-lib/DEPENDS 2006-03-06 15:20:03 UTC (rev 19136)
+++ moonbase/trunk/video/xine-lib/DEPENDS 2006-03-06 15:39:11 UTC (rev 19137)
@@ -1,5 +1,5 @@
depends libpng &&
-depends glut &&
+depends %GLUT &&
optional_depends "alsa-utils" "" "" "for ALSA sound support" &&
optional_depends "aalib" "" "" "for ascii art library support" &&
Modified: moonbase/trunk/x11/xplanet/DEPENDS
===================================================================
--- moonbase/trunk/x11/xplanet/DEPENDS 2006-03-06 15:20:03 UTC (rev 19136)
+++ moonbase/trunk/x11/xplanet/DEPENDS 2006-03-06 15:39:11 UTC (rev 19137)
@@ -1,2 +1,2 @@
depends automake &&
-depends glut
+depends %GLUT
Modified: moonbase/trunk/x11-apps/xlockmore/DEPENDS
===================================================================
--- moonbase/trunk/x11-apps/xlockmore/DEPENDS 2006-03-06 15:20:03 UTC (rev 19136)
+++ moonbase/trunk/x11-apps/xlockmore/DEPENDS 2006-03-06 15:39:11 UTC (rev 19137)
@@ -4,5 +4,5 @@
optional_depends "Linux-PAM" \
"--enable-pam" "--disable-pam" "for PAM support" &&
-optional_depends "glut" \
+optional_depends "%GLUT" \
"" "" "may be required to view some 3d screen hacks"
Modified: moonbase/trunk/x11-apps/xscreensaver/DEPENDS
===================================================================
--- moonbase/trunk/x11-apps/xscreensaver/DEPENDS 2006-03-06 15:20:03 UTC (rev 19136)
+++ moonbase/trunk/x11-apps/xscreensaver/DEPENDS 2006-03-06 15:39:11 UTC (rev 19137)
@@ -3,7 +3,7 @@
depends libxml2 &&
depends netpbm &&
depends bc &&
-depends glut &&
+depends %GLUT &&
depends perl &&
optional_depends "yelp" "" "" "help browser support in Gnome" &&
Modified: moonbase/trunk/x11-apps/xscreensaver-gtk1/DEPENDS
===================================================================
--- moonbase/trunk/x11-apps/xscreensaver-gtk1/DEPENDS 2006-03-06 15:20:03 UTC (rev 19136)
+++ moonbase/trunk/x11-apps/xscreensaver-gtk1/DEPENDS 2006-03-06 15:39:11 UTC (rev 19137)
@@ -3,7 +3,7 @@
depends libxml2 &&
depends netpbm &&
depends bc &&
-depends glut &&
+depends %GLUT &&
depends perl &&
optional_depends "control-center" "" "" "Gnome control-center support for xscreensaver" &&
Modified: moonbase/trunk/x11-apps/xscreensaver-kde/DEPENDS
===================================================================
--- moonbase/trunk/x11-apps/xscreensaver-kde/DEPENDS 2006-03-06 15:20:03 UTC (rev 19136)
+++ moonbase/trunk/x11-apps/xscreensaver-kde/DEPENDS 2006-03-06 15:39:11 UTC (rev 19137)
@@ -1,7 +1,7 @@
depends libxml2 &&
depends netpbm &&
depends bc &&
-depends glut &&
+depends %GLUT &&
depends perl &&
optional_depends "gle" "--with-gle" "--without-gle" "enable the use this library" &&
Modified: moonbase/trunk/x11-wm/3ddesktop/DEPENDS
===================================================================
--- moonbase/trunk/x11-wm/3ddesktop/DEPENDS 2006-03-06 15:20:03 UTC (rev 19136)
+++ moonbase/trunk/x11-wm/3ddesktop/DEPENDS 2006-03-06 15:39:11 UTC (rev 19137)
@@ -1,3 +1,3 @@
depends imlib2 &&
-depends glut &&
+depends %GLUT &&
depends gettext
Modified: moonbase/trunk/zbeta/linux-dri-x86/BUILD
===================================================================
--- moonbase/trunk/zbeta/linux-dri-x86/BUILD 2006-03-06 15:20:03 UTC (rev 19136)
+++ moonbase/trunk/zbeta/linux-dri-x86/BUILD 2006-03-06 15:39:11 UTC (rev 19137)
@@ -1,18 +1,17 @@
(
- sedit "s/usr\/X11R6/usr\/X11R7/" src/glw/Makefile &&
+ sedit "s/usr\/X11R6/usr\//" src/glw/Makefile &&
DRM_SOURCE_PATH="/usr/include/drm" make linux-dri-x86 OPT_FLAGS="$CFLAGS \
- -DDEFAULT_DRIVER_DIR=\\\"/usr/X11R7/lib/xorg/modules/dri\\\" -DSHM" \
+ -DDEFAULT_DRIVER_DIR=\\\"/usr/lib/xorg/modules/dri\\\" -DSHM" \
MKDEP="gcc -M" MKDEP_OPTIONS="-MF depend" \
- X11_INCLUDES="-I/usr/X11R7/include" DRI_DIRS="r200" \
- ASM_FLAGS="-DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_SSE_ASM" \
- EXTRA_LIB_PATH="-L/usr/X11R7/lib" &&
+ X11_INCLUDES="-I/usr/include" DRI_DIRS="r200" \
+ ASM_FLAGS="-DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_SSE_ASM" &&
prepare_install &&
- mkdir -p /usr/X11R7/lib/xorg/modules/dri &&
- cp lib/*_dri.so /usr/X11R7/lib/xorg/modules/dri/ &&
+ mkdir -p /usr/lib/xorg/modules/dri &&
+ cp lib/*_dri.so /usr/lib/xorg/modules/dri/ &&
DESTDIR=/usr make install
) > $C_FIFO 2>&1
More information about the Lunar-commits
mailing list