sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] PERFORCE change 78718 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>, "Ladislav Hagara" <ladislav.hagara AT unob.cz>, "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>, "vladimir_marek" <vlmarek AT volny.cz>
Subject: [SM-Commit] PERFORCE change 78718 by Robin Cook for review
Date: Sun, 30 Apr 2006 22:30:01 +0100 (BST)

Change 78718 by robin_cook AT CuZnDragon-pheuri.wyrms.net on 2006/04/30 22:29:32

added the x/mesalib file save to nvidia_driver as the new installer
installs the headers now. The nvidia_headers spell needs to be
depricated
unless the installer can be forced to not install them.

Affected files ...

... //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/HISTORY#30 edit
... //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/INSTALL#11 edit
... //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/POST_REMOVE#1 add
... //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/PRE_BUILD#5 edit

Differences ...

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

@@ -3,6 +3,8 @@
* INSTALL: added X_PRE and X_MOD to local variables
added if to test for xorg-modular and set X_PRE and X_MOD
changed nvidia_install command to use X_PRE and X_MOD
+ * PRE_BUILD: added moving of the x/mesalib headers and libs
+ * POST_REMOVE: added to restore the x/mesalib headers and libs

2006-04-18 Juuso Alasuutari <iuso AT sourcemage.org>
* INSTALL: Made sure that if the xorg.conf auto-edit option has

==== //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/INSTALL#11 (xtext)
====

@@ -4,10 +4,10 @@

if test "$(get_spell_provider $SPELL X11-SERVER)" = xorg-server; then
X_PRE="${INSTALL_ROOT}$(pkg-config --variable=prefix xorg-server)" &&
- X_MOD="${INSTALL_ROOT}$(pkg-config --variable=moduledir xorg-server)" &&
+ X_MOD="${INSTALL_ROOT}$(pkg-config --variable=moduledir xorg-server)"
else
X_PRE="${INSTALL_ROOT}/usr/X11R6" &&
- X_MOD="${INSTALL_ROOT}/usr/X11R6/lib/modules" &&
+ X_MOD="${INSTALL_ROOT}/usr/X11R6/lib/modules"
fi &&

./nvidia-installer $e $X -a -q --ui=none --no-runlevel-check \

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

@@ -1,3 +1,24 @@
+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 &&
+
+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
+ 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
+ done
+else
+ message "${SPELL_COLOR}X headers already backed up${DEFAULT_COLOR}"
+fi &&
+
sh $SOURCE_CACHE/$SOURCE --extract-only \
--target $SOURCE_DIRECTORY &&
cd $SOURCE_DIRECTORY &&
@@ -18,3 +39,4 @@
sedit "s/NVreg_EnableAGPFW = 0;/NVreg_EnableAGPFW = 1;/" \
usr/src/nv/os-registry.c
fi
+

[SM-Commit] PERFORCE change 78718 by Robin Cook for review, Perforce Review Daemon, 04/30/2006