sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] PERFORCE change 78785 by Robin Cook for review

From: Perforce Review Daemon <p4review AT smee.org>
To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
Subject: [SM-Commit] PERFORCE change 78785 by Robin Cook for review
Date: Tue, 2 May 2006 03:00:01 +0100 (BST)

Change 78785 by robin_cook AT CuZnDragon-pheuri.wyrms.net on 2006/05/02 02:59:28

radiusclient-ng: new
ser: new
mesalib: slight change in volatile
nvidia_driver: work with both monolithic and modular

Affected files ...

... //sgl/grimoires/devel/net/radiusclient-ng/BUILD#1 add
... //sgl/grimoires/devel/net/radiusclient-ng/CONFIGURE#1 add
... //sgl/grimoires/devel/net/radiusclient-ng/DEPENDS#1 add
... //sgl/grimoires/devel/net/radiusclient-ng/DETAILS#1 add
... //sgl/grimoires/devel/net/radiusclient-ng/HISTORY#1 add
...
//sgl/grimoires/devel/net/radiusclient-ng/radiusclient-ng-0.5.3.tar.gz.sig#1
add
... //sgl/grimoires/devel/telephony/ser/BUILD#1 add
... //sgl/grimoires/devel/telephony/ser/DEPENDS#1 add
... //sgl/grimoires/devel/telephony/ser/DETAILS#1 add
... //sgl/grimoires/devel/telephony/ser/HISTORY#1 add
... //sgl/grimoires/devel/telephony/ser/INSTALL#1 add
... //sgl/grimoires/devel/telephony/ser/PRE_BUILD#1 add
... //sgl/grimoires/devel/telephony/ser/ser-0.9.6_src.tar.gz.sig#1 add
... //sgl/grimoires/devel/telephony/ser/ser-install.patch#1 add
... //sgl/grimoires/devel/telephony/serweb/serweb-0.9.4.tar.gz.sig#1 add
... //sgl/grimoires/xorg-modular/xorg-extras/mesalib/HISTORY#12 edit
... //sgl/grimoires/xorg-modular/xorg-extras/mesalib/volatiles#2 edit
... //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/HISTORY#31 edit
... //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/POST_REMOVE#2 edit
... //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/PRE_BUILD#6 edit
... //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/volatiles#2 edit

Differences ...

==== //sgl/grimoires/xorg-modular/xorg-extras/mesalib/HISTORY#12 (text) ====

@@ -1,3 +1,6 @@
+2006-05-01 Robin Cook <rcook AT wyrms.net>
+ * volatiles: modified for the libGL.so.* files
+
2006-04-30 Robin Cook <rcook AT wyrms.net>
* volatiles: added for the files nvidia_driver installs

==== //sgl/grimoires/xorg-modular/xorg-extras/mesalib/volatiles#2 (xtext) ====

@@ -2,7 +2,5 @@
^/usr/include/GL/gl.h
^/usr/include/GL/glxext.h
^/usr/include/GL/glx.h
-^/usr/lib/libGL.so
-^/usr/lib/libGL.so.1
-^/usr/lib/libGL.so.1.2
+^/usr/lib/libGL.so.*

==== //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/HISTORY#31 (text) ====

@@ -1,3 +1,10 @@
+2006-05-01 Robin Cook <rcook AT wyrms.net>
+ * PRE_BUILD: set GL_LIB depending on mesalib installed
+ check for file existence before moving
+ * POST_REMOVE: set GL_LIB depending on mesalib installed
+ check for file existence before moving
+ * volatiles: added for xorg-modular location
+
2006-04-30 Robin Cook <rcook AT wyrms.net>
* DEPENDS: uncommented the X11-SERVER depends
* INSTALL: added X_PRE and X_MOD to local variables

==== //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/POST_REMOVE#2 (xtext)
====

@@ -1,15 +1,24 @@
-local i X_DIR GL_DIR GL_LIB &&
-X_DIR=$INSTALL_ROOT/usr/include/GL/x &&
-GL_DIR=$INSTALL_ROOT/usr/include/GL/ &&
-GL_LIB=$INSTALL_ROOT/usr/lib/ &&
+local i X_DIR GL_DIR GL_LIB &&
+X_DIR=$INSTALL_ROOT/usr/include/GL/x &&
+GL_DIR=$INSTALL_ROOT/usr/include/GL/ &&
+
+if spell_ok mesalib; then
+ GL_LIB=$INSTALL_ROOT/usr/lib
+else
+ GL_LIB=$INSTALL_ROOT/usr/X11R6/lib
+fi &&

message "${MESSAGE_COLOR}Restoring X/mesalib headers and libs${SPELL_COLOR}"
&&

-for i in gl.h glext.h glx.h glxext.h; do
- mv -v $X_DIR/$i $GL_DIR
+for i in gl.h glext.h glx.h glxext.h; do
+ if [ -e $X_DIR/$i ]; then
+ mv -v $X_DIR/$i $GL_DIR
+ fi
done &&
-for i in libGL.so libGL.so.1 libGL.so.1.2; do
- mv -v $X_DIR/$i $GL_LIB
-done &&
+for i in $X-DIR/libGL.so.*; do
+ if [ -e $i ]; then
+ mv -v $i $GL_LIB
+ fi
+done &&

rm -rf $X_DIR

==== //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/PRE_BUILD#6 (xtext)
====

@@ -1,22 +1,31 @@
message "${MESSAGE_COLOR}Backing up existing X/mesalib headers and
libs${DEFAULT_COLOR}" &&

-local i X_DIR GL_DIR GL_LIB &&
-X_DIR=$INSTALL_ROOT/usr/include/GL/x &&
-GL_DIR=$INSTALL_ROOT/usr/include/GL &&
-GL_LIB=$INSTALL_ROOT/usr/lib &&
-mkdir -p $X_DIR &&
+local i X_DIR GL_DIR GL_LIB &&
+X_DIR=$INSTALL_ROOT/usr/include/GL/x &&
+GL_DIR=$INSTALL_ROOT/usr/include/GL &&
+
+if spell_ok mesalib; then
+ GL_LIB=$INSTALL_ROOT/usr/lib
+else
+ GL_LIB=$INSTALL_ROOT/usr/X11R6/lib
+fi &&
+
+mkdir -p $X_DIR &&

if ! [[ -f $X_DIR/done ]]; then
- for i in gl.h glext.h glx.h glxext.h; do
- mv -v $GL_DIR/$i $X_DIR
- touch $X_DIR/done
+ for i in gl.h glext.h glx.h glxext.h; do
+ if [ -e $GL_DIR/$i ]; then
+ mv -v $GL_DIR/$i $X_DIR &&
+ fi
done
- for i in libGL.so libGL.so.1 libGL.so.1.2; do
- mv -v $GL_LIB/$i $X_DIR &&
- touch $X_DIR/done
+ for i in $GL_LIB/libGL.so.*; do
+ if [ -e $i ]; then
+ mv -v $i $X_DIR &&
+ fi
done
+ touch $X_DIR/done
else
- message "${SPELL_COLOR}X headers already backed up${DEFAULT_COLOR}"
+ message "${SPELL_COLOR}X/mesalib headers and libs already backed
up${DEFAULT_COLOR}"
fi &&

sh $SOURCE_CACHE/$SOURCE --extract-only \

==== //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/volatiles#2 (xtext)
====

@@ -1,1 +1,6 @@
^/lib/modules/*/modules.*
+^/usr/lib/libGL.so.*
+^/usr/include/GL/gl.h
+^/usr/include/GL/glext.h
+^/usr/include/GL/glx.h
+^/usr/include/GL/glxext.h

[SM-Commit] PERFORCE change 78785 by Robin Cook for review, Perforce Review Daemon, 05/01/2006