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

Perforce Review Daemon p4review at smee.org
Sun Apr 30 15:05:02 EDT 2006


Change 78697 by robin_cook at CuZnDragon-pheuri.wyrms.net on 2006/04/30 20:04:02

	Add xorg-modular support

Affected files ...

... //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/DEPENDS#5 edit
... //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/HISTORY#29 edit
... //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/INSTALL#10 edit

Differences ...

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


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

@@ -1,3 +1,9 @@
+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
+	  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
+
 2006-04-18 Juuso Alasuutari <iuso at sourcemage.org>
 	* INSTALL: Made sure that if the xorg.conf auto-edit option has 
 	  been selected once, it doesn't default to y on next cast.

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

@@ -1,12 +1,19 @@
-local e X                                                             &&
-if [[ $EXPERT == y ]]; then e='-e'; fi                                &&
-if [[ $XCONF == y ]]; then X='-X'; fi                                 &&
+local e X X_PRE X_MOD                                                     &&
+if [[ $EXPERT == y ]]; then e='-e'; fi                                    &&
+if [[ $XCONF == y ]]; then X='-X'; fi                                     &&
+
+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)"  &&
+else
+   X_PRE="${INSTALL_ROOT}/usr/X11R6"                                      &&
+   X_MOD="${INSTALL_ROOT}/usr/X11R6/lib/modules"                          &&
+fi                                                                        &&
 
-./nvidia-installer  $e $X -a -q --ui=none --no-runlevel-check         \
---no-rpms --no-network --x-prefix=$INSTALL_ROOT/usr/X11R6             \
---x-module-path=$INSTALL_ROOT/usr/X11R6/lib/modules                   \
---opengl-prefix=$INSTALL_ROOT/usr --utility-prefix=$INSTALL_ROOT/usr  \
---kernel-name=$(get_kernel_version)                                   &&
+./nvidia-installer  $e $X -a -q --ui=none --no-runlevel-check             \
+--no-rpms --no-network --x-prefix=$X_PRE --x-module-path=$X_MOD           \
+--opengl-prefix=$INSTALL_ROOT/usr --utility-prefix=$INSTALL_ROOT/usr      \
+--kernel-name=$(get_kernel_version)                                       &&
 
 # To make sure spell doesn't default to editing xorg.conf after it's 
 # already done once.



More information about the SM-Commit mailing list