[SM-Commit] GIT changes to master z-rejected grimoire by Andraž Levstik (d062888c90ea7b2d93f1cb27b37b9e4588c07907)

Andraž Levstik scm at sourcemage.org
Mon Feb 9 03:18:51 EST 2009


GIT changes to master z-rejected grimoire by Andraž Levstik <ruskie at codemages.net>:

 .glselect/ati-filelist                              |   11 +
 .glselect/mesa-filelist                             |   14 ++
 .glselect/nvidia-filelist                           |   12 +
 ChangeLog                                           |    5 
 FUNCTIONS                                           |    2 
 glselect.function                                   |  137 ++++++++++++++++++++
 z-kernels/ati-fglrx/DEPENDS                         |    3 
 z-kernels/ati-fglrx/FINAL                           |    1 
 z-kernels/ati-fglrx/HISTORY                         |    7 +
 z-kernels/ati-fglrx/POST_RESURRECT                  |    1 
 z-kernels/ati-fglrx/PRE_REMOVE                      |    1 
 z-kernels/ati-fglrx/REPAIR^all^PRE_REMOVE           |    1 
 z-kernels/nvidia_driver/DEPENDS                     |    1 
 z-kernels/nvidia_driver/FINAL                       |    2 
 z-kernels/nvidia_driver/HISTORY                     |    7 +
 z-kernels/nvidia_driver/POST_RESURRECT              |    1 
 z-kernels/nvidia_driver/PRE_REMOVE                  |    1 
 z-kernels/nvidia_driver/REPAIR^all^PRE_REMOVE       |    1 
 z-kernels/nvidia_legacy/DEPENDS                     |    1 
 z-kernels/nvidia_legacy/FINAL                       |    1 
 z-kernels/nvidia_legacy/HISTORY                     |    7 +
 z-kernels/nvidia_legacy/POST_RESURRECT              |    1 
 z-kernels/nvidia_legacy/PRE_REMOVE                  |    1 
 z-kernels/nvidia_legacy/REPAIR^all^PRE_REMOVE       |    1 
 z-kernels/nvidia_legacy_173xx/DEPENDS               |    1 
 z-kernels/nvidia_legacy_173xx/FINAL                 |    1 
 z-kernels/nvidia_legacy_173xx/HISTORY               |    7 +
 z-kernels/nvidia_legacy_173xx/POST_RESURRECT        |    1 
 z-kernels/nvidia_legacy_173xx/PRE_REMOVE            |    1 
 z-kernels/nvidia_legacy_173xx/REPAIR^all^PRE_REMOVE |    1 
 z-kernels/nvidia_legacy_96xx/DEPENDS                |    1 
 z-kernels/nvidia_legacy_96xx/FINAL                  |    1 
 z-kernels/nvidia_legacy_96xx/HISTORY                |    7 +
 z-kernels/nvidia_legacy_96xx/POST_RESURRECT         |    1 
 z-kernels/nvidia_legacy_96xx/PRE_REMOVE             |    1 
 z-kernels/nvidia_legacy_96xx/REPAIR^all^PRE_REMOVE  |    1 
 36 files changed, 238 insertions(+), 6 deletions(-)

New commits:
commit 111381abb3c49b2ecceff7a2c2a225cae3d76ace
Author: Andraž 'ruskie' Levstik <ruskie at codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie at codemages.net>

    nvidia_legacy_96xx: added POST_RESURRECT

commit 7fda94044adfb7b6c6cc8a70a6e273b352f306c1
Author: Andraž 'ruskie' Levstik <ruskie at codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie at codemages.net>

    nvidia_legacy_173xx: added POST_RESURRECT

commit f9078cd2d68d76e0e96b579207ff44f52c799bc8
Author: Andraž 'ruskie' Levstik <ruskie at codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie at codemages.net>

    nvidia_legacy: added POST_RESURRECT

commit db15d4bc54d90bd3a592b80a773bf58d612d3846
Author: Andraž 'ruskie' Levstik <ruskie at codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie at codemages.net>

    nvidia_driver: added POST_RESURRECT

commit 3dea7a263cdc0122cd1046e852f4f6e92fc15144
Author: Andraž 'ruskie' Levstik <ruskie at codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie at codemages.net>

    ati-fglrx: added POST_RESURRECT

commit 8263ae13bf62d551219710b065a549d70fe35320
Author: Andraž 'ruskie' Levstik <ruskie at codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie at codemages.net>

    nvidia_legacy_173xx: switch to internal glselect

commit 4445d9c1db1ce29f48d32d286947615fc387a933
Author: Andraž 'ruskie' Levstik <ruskie at codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie at codemages.net>

    nvidia_legacy_96xx: switch to internal glselect

commit d7d7a011ac86cbd656e02425781f9bca9491c02f
Author: Andraž 'ruskie' Levstik <ruskie at codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie at codemages.net>

    nvidia_legacy: switch to internal glselect

commit a946cffb513bb60f343646e6cf8002a17bdbf742
Author: Andraž 'ruskie' Levstik <ruskie at codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie at codemages.net>

    nvidia_driver: switch to internal glselect

commit 17e831c2e87aaecd41876de477e92e24e4d06109
Author: Andraž 'ruskie' Levstik <ruskie at codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie at codemages.net>

    ati-fglrx: switch to internal glselect

commit 04faf38ed9bc92f1fc666a000e2a3e0afce97d6c
Author: Andraž 'ruskie' Levstik <ruskie at codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie at codemages.net>

    glselect: added

diff --git a/.glselect/ati-filelist b/.glselect/ati-filelist
new file mode 100644
index 0000000..007df47
--- /dev/null
+++ b/.glselect/ati-filelist
@@ -0,0 +1,11 @@
+/usr/lib/ati/libGL.so
+/usr/lib/ati/libGL.so.1.2
+/usr/lib/xorg/modules/extensions/ati/libdri.so
+/usr/lib/xorg/modules/extensions/ati/libglx.so
+/usr/lib/xorg/modules/mesa/libwfb.la
+/usr/lib/xorg/modules/mesa/libwfb.so
+/usr/include/GL/mesa/gl.h
+/usr/include/GL/mesa/glext.h
+/usr/include/GL/mesa/glx.h
+/usr/include/GL/mesa/glxext.h
+
diff --git a/.glselect/mesa-filelist b/.glselect/mesa-filelist
new file mode 100644
index 0000000..3e0a4dc
--- /dev/null
+++ b/.glselect/mesa-filelist
@@ -0,0 +1,14 @@
+/usr/include/GL/mesa/gl.h
+/usr/include/GL/mesa/glext.h
+/usr/include/GL/mesa/glx.h
+/usr/include/GL/mesa/glxext.h
+/usr/lib/mesa/libGL.so
+/usr/lib/mesa/libGL.so.1
+/usr/lib/mesa/libGL.so.1.2
+/usr/lib/xorg/modules/extensions/mesa/libdri.la
+/usr/lib/xorg/modules/extensions/mesa/libdri.so
+/usr/lib/xorg/modules/extensions/mesa/libglx.la
+/usr/lib/xorg/modules/extensions/mesa/libglx.so
+/usr/lib/xorg/modules/mesa/libwfb.la
+/usr/lib/xorg/modules/mesa/libwfb.so
+
diff --git a/.glselect/nvidia-filelist b/.glselect/nvidia-filelist
new file mode 100644
index 0000000..ac5f24a
--- /dev/null
+++ b/.glselect/nvidia-filelist
@@ -0,0 +1,12 @@
+/usr/include/GL/nvidia/gl.h
+/usr/include/GL/nvidia/glext.h
+/usr/include/GL/nvidia/glx.h
+/usr/include/GL/nvidia/glxext.h
+/usr/lib/nvidia/libGL.so
+/usr/lib/nvidia/libGL.so.1
+/usr/lib/xorg/modules/extensions/mesa/libdri.la
+/usr/lib/xorg/modules/extensions/mesa/libdri.so
+/usr/lib/xorg/modules/extensions/nvidia/libglx.so
+/usr/lib/xorg/modules/nvidia/libnvidia-wfb.so
+/usr/lib/xorg/modules/nvidia/libwfb.so
+
diff --git a/ChangeLog b/ChangeLog
index 1d4c351..1fbcd36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-09 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* .glselect/{nvidia,ati,mesa}-filelist: added from gl_select
+	* glselect.function: gl_select as a function
+	* FUNCTIONS: source glselect.function
+
 2009-01-05 Julien "_kaze_" ROZO <julien at rozo.org>
 	* z-utils/geekbench: new spell, a set of benchmarks
 
diff --git a/FUNCTIONS b/FUNCTIONS
index 979f710..cb878ad 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -615,3 +615,5 @@ function get_kernel_config()
     get_sorcery_kernel_config "$1" || get_running_kernel_config "$1"
   fi
 }
+
+. $GRIMOIRE/glselect.function
diff --git a/glselect.function b/glselect.function
new file mode 100755
index 0000000..d075850
--- /dev/null
+++ b/glselect.function
@@ -0,0 +1,137 @@
+#---
+## glselect - select default libGL provider
+## rewritten from smgl-gl_select
+##
+## this is run in FINAL and will always set the provider
+## based on the final spell cast that calls this.
+## If one wants to have this settable runtime then
+## there's the smgl-gl_select tool to do so
+##
+#---
+
+function glselect(){
+  # get all available GL providers
+  local gl_libs="$(ls -1 --color=none ${TRACK_ROOT}/usr/lib/*/libGL.so \
+                   | awk -F"/" '{print $4}' 2> /dev/null )"
+  # where to store the filelists
+  local gl_filelist_dir="$GRIMOIRE/.glselect"
+  local orig_file new_file
+  local gl_lib=$1
+  if ! grep -q "$gl_lib" <<< "$gl_libs"
+  then
+    message "Error $gl_lib is not a valid GL Library"
+    exit 1
+  fi
+  message "Selecting $gl_lib as the default system GL library"
+  if [[ -L ${INSTALL_ROOT}/usr/lib/libGL.so ]] ||
+     [[ ! -e ${INSTALL_ROOT}/usr/lib/libGL.so ]]
+  then
+    message "Cleaning all previous GL providers..."
+    for orig_file in $(grep "/ati" $gl_filelist_dir/ati-filelist)
+    do
+      new_file=${orig_file/\/ati}
+      rm -f $new_file
+      echo -n "."
+    done
+    echo -n "."
+    orig_file=""
+    for orig_file in $(grep "/mesa" $gl_filelist_dir/mesa-filelist)
+    do
+      new_file=${orig_file/\/mesa}
+      rm -f $new_file
+      echo -n "."
+    done
+    echo -n "."
+    orig_file=""
+    for orig_file in $(grep "/nvidia" $gl_filelist_dir/nvidia-filelist)
+    do
+      new_file=${orig_file/\/nvidia}
+      rm -f $new_file
+      echo -n "."
+    done
+    orig_file=""
+    echo ""
+    message "Done."
+    message "Setting up new GL provider $gl_lib..."
+    case "$1" in
+       ati)
+            for orig_file in $(grep "/mesa" $gl_filelist_dir/ati-filelist)
+            do
+              new_file=${orig_file/\/mesa}
+              ln -sf ${INSTALL_ROOT}${orig_file} \
+                     ${INSTALL_ROOT}${new_file} 2>/dev/null
+              echo -n "."
+            done
+            orig_file=""
+            for orig_file in $(grep "/ati" $gl_filelist_dir/ati-filelist)
+            do
+              new_file=${orig_file/\/ati}
+              ln -sf ${INSTALL_ROOT}${orig_file} \
+                     ${INSTALL_ROOT}${new_file} 2>/dev/null
+              echo -n "."
+            done
+            ;;
+      mesa) 
+            for orig_file in $(cat $gl_filelist_dir/mesa-filelist)
+            do
+              new_file=${orig_file/\/mesa}
+              ln -sf ${INSTALL_ROOT}${orig_file} \
+                     ${INSTALL_ROOT}${new_file} 2>/dev/null
+              echo -n "."
+            done
+            ;;
+    nvidia) 
+            for orig_file in $(grep "/mesa" $gl_filelist_dir/nvidia-filelist)
+            do
+              new_file=${orig_file/\/mesa}
+              ln -sf ${INSTALL_ROOT}${orig_file} \
+                     ${INSTALL_ROOT}${new_file} 2>/dev/null
+              echo -n "."
+            done
+            orig_file=""
+            for orig_file in $(grep "/nvidia" $gl_filelist_dir/nvidia-filelist)
+            do
+              new_file=${orig_file/\/nvidia}
+              ln -sf ${INSTALL_ROOT}${orig_file} \
+                     ${INSTALL_ROOT}${new_file} 2>/dev/null
+              echo -n "."
+            done
+            ;;
+         *) message "Unknown secondary files so I only linked the libGL.so"
+            for orig_file in $(cat $gl_filelist_dir/mesa-filelist)
+            do
+              new_file=${orig_file/\/mesa}
+              ln -sf ${INSTALL_ROOT}${orig_file} \
+                     ${INSTALL_ROOT}${new_file} 2>/dev/null
+              echo -n "."
+            done
+            ln -fs ${INSTALL_ROOT}/usr/lib/$gl_lib/libGL.so* \
+                   ${INSTALL_ROOT}/usr/lib/ 2>/dev/null
+            ;;
+      esac
+    echo -e "\nDone."
+    message "You can manage the libGL providers at runtime by using"
+    message "either smgl-gl_select or manually by symlinking the files"
+    message "from their respective directories i.e.:"
+    message "/usr/lib/[nvidia|ati|mesa]/libGL.so"
+    message "/usr/xorg/modules/extensions/[nvidia,ati,mesa]/lib{glx,dri}.so"
+    message "/usr/include/GL/[nvidia|mesa]/gl{x,xext,ext}.h"
+    message ""
+    message "To:"
+    message "/usr/lib/libGL.so"
+    message "/usr/xorg/modules/extensions/lib{glx,dri}.so"
+    message "/usr/include/GL/gl{x,xext,ext}.h"
+    message ""
+    return 0
+  else
+    message "Error ${INSTALL_ROOT}/usr/lib/libGL.so is not a symlink"
+    message "unable to proceed!!!"
+    message "Please recast:"
+    message "mesalib, xorg-server and whatever GL driver you use."
+    message ""
+    message "If this continues to happen please file a bug."
+    message ""
+    return 1
+  fi
+}
+
diff --git a/z-kernels/ati-fglrx/DEPENDS b/z-kernels/ati-fglrx/DEPENDS
index 391fb67..9c8aa5b 100755
--- a/z-kernels/ati-fglrx/DEPENDS
+++ b/z-kernels/ati-fglrx/DEPENDS
@@ -1,2 +1 @@
-depends xorg-server  &&
-depends smgl-gl_select
+depends xorg-server
diff --git a/z-kernels/ati-fglrx/FINAL b/z-kernels/ati-fglrx/FINAL
new file mode 100755
index 0000000..a851806
--- /dev/null
+++ b/z-kernels/ati-fglrx/FINAL
@@ -0,0 +1 @@
+glselect ati
diff --git a/z-kernels/ati-fglrx/HISTORY b/z-kernels/ati-fglrx/HISTORY
index ca5c7ba..b5c5948 100644
--- a/z-kernels/ati-fglrx/HISTORY
+++ b/z-kernels/ati-fglrx/HISTORY
@@ -1,3 +1,10 @@
+2009-02-09 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DEPENDS: removed smgl-gl_select, now uses internal
+	* FINAL: run internal glselect
+	* PRE_REMOVE: return back to mesa on dispel
+	* REPAIR^all^PRE_REMOVE: return back to mesa on dispel
+	* POST_RESURRECT: added for glselect
+
 2009-02-08 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DETAILS: updated spell to 9.1, patchlevel++
 	* DEPENDS: use xorg-server, smgl-gl_select
diff --git a/z-kernels/ati-fglrx/POST_RESURRECT b/z-kernels/ati-fglrx/POST_RESURRECT
new file mode 100755
index 0000000..a851806
--- /dev/null
+++ b/z-kernels/ati-fglrx/POST_RESURRECT
@@ -0,0 +1 @@
+glselect ati
diff --git a/z-kernels/ati-fglrx/PRE_REMOVE b/z-kernels/ati-fglrx/PRE_REMOVE
new file mode 100755
index 0000000..1895a77
--- /dev/null
+++ b/z-kernels/ati-fglrx/PRE_REMOVE
@@ -0,0 +1 @@
+glselect mesa
diff --git a/z-kernels/ati-fglrx/REPAIR^all^PRE_REMOVE b/z-kernels/ati-fglrx/REPAIR^all^PRE_REMOVE
new file mode 100755
index 0000000..1895a77
--- /dev/null
+++ b/z-kernels/ati-fglrx/REPAIR^all^PRE_REMOVE
@@ -0,0 +1 @@
+glselect mesa
diff --git a/z-kernels/nvidia_driver/DEPENDS b/z-kernels/nvidia_driver/DEPENDS
index eb530e1..446ebb0 100755
--- a/z-kernels/nvidia_driver/DEPENDS
+++ b/z-kernels/nvidia_driver/DEPENDS
@@ -1,3 +1,2 @@
 depends  xorg-server  &&
-depends  smgl-gl_select  &&
 depends  which
diff --git a/z-kernels/nvidia_driver/FINAL b/z-kernels/nvidia_driver/FINAL
index 1851270..c76fb89 100755
--- a/z-kernels/nvidia_driver/FINAL
+++ b/z-kernels/nvidia_driver/FINAL
@@ -1 +1,3 @@
+glselect nvidia  &&
 message "${MESSAGE_COLOR}NOTICE: You can run nvidia-xconfig to auto-configure X for nvidia_driver.${DEFAULT_COLOR}"
+
diff --git a/z-kernels/nvidia_driver/HISTORY b/z-kernels/nvidia_driver/HISTORY
index 674fffb..01e4e94 100644
--- a/z-kernels/nvidia_driver/HISTORY
+++ b/z-kernels/nvidia_driver/HISTORY
@@ -1,3 +1,10 @@
+2009-02-09 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DEPENDS: removed smgl-gl_select, now uses internal
+	* FINAL: run internal glselect
+	* PRE_REMOVE: return back to mesa on dispel
+	* REPAIR^all^PRE_REMOVE: return back to mesa on dispel
+	* POST_RESURRECT: added for glselect
+
 2009-02-08 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DEPENDS: xorg-server
 	* DETAILS: patchlevel by default is 0, ARCHIVE even if binary,
diff --git a/z-kernels/nvidia_driver/POST_RESURRECT b/z-kernels/nvidia_driver/POST_RESURRECT
new file mode 100755
index 0000000..7c7887f
--- /dev/null
+++ b/z-kernels/nvidia_driver/POST_RESURRECT
@@ -0,0 +1 @@
+glselect nvidia
diff --git a/z-kernels/nvidia_driver/PRE_REMOVE b/z-kernels/nvidia_driver/PRE_REMOVE
new file mode 100755
index 0000000..1895a77
--- /dev/null
+++ b/z-kernels/nvidia_driver/PRE_REMOVE
@@ -0,0 +1 @@
+glselect mesa
diff --git a/z-kernels/nvidia_driver/REPAIR^all^PRE_REMOVE b/z-kernels/nvidia_driver/REPAIR^all^PRE_REMOVE
new file mode 100755
index 0000000..1895a77
--- /dev/null
+++ b/z-kernels/nvidia_driver/REPAIR^all^PRE_REMOVE
@@ -0,0 +1 @@
+glselect mesa
diff --git a/z-kernels/nvidia_legacy/DEPENDS b/z-kernels/nvidia_legacy/DEPENDS
index eb530e1..446ebb0 100755
--- a/z-kernels/nvidia_legacy/DEPENDS
+++ b/z-kernels/nvidia_legacy/DEPENDS
@@ -1,3 +1,2 @@
 depends  xorg-server  &&
-depends  smgl-gl_select  &&
 depends  which
diff --git a/z-kernels/nvidia_legacy/FINAL b/z-kernels/nvidia_legacy/FINAL
index 1851270..fd99e7e 100755
--- a/z-kernels/nvidia_legacy/FINAL
+++ b/z-kernels/nvidia_legacy/FINAL
@@ -1 +1,2 @@
+glselect nvidia &&
 message "${MESSAGE_COLOR}NOTICE: You can run nvidia-xconfig to auto-configure X for nvidia_driver.${DEFAULT_COLOR}"
diff --git a/z-kernels/nvidia_legacy/HISTORY b/z-kernels/nvidia_legacy/HISTORY
index 9089751..5868453 100644
--- a/z-kernels/nvidia_legacy/HISTORY
+++ b/z-kernels/nvidia_legacy/HISTORY
@@ -1,3 +1,10 @@
+2009-02-09 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DEPENDS: removed smgl-gl_select, now uses internal
+	* FINAL: run internal glselect
+	* PRE_REMOVE: return back to mesa on dispel
+	* REPAIR^all^PRE_REMOVE: return back to mesa on dispel
+	* POST_RESURRECT: added for glselect
+
 2009-02-08 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DETAILS: drop archive=off and other such useless stuff,
 	  updated to latest version
diff --git a/z-kernels/nvidia_legacy/POST_RESURRECT b/z-kernels/nvidia_legacy/POST_RESURRECT
new file mode 100755
index 0000000..7c7887f
--- /dev/null
+++ b/z-kernels/nvidia_legacy/POST_RESURRECT
@@ -0,0 +1 @@
+glselect nvidia
diff --git a/z-kernels/nvidia_legacy/PRE_REMOVE b/z-kernels/nvidia_legacy/PRE_REMOVE
new file mode 100755
index 0000000..1895a77
--- /dev/null
+++ b/z-kernels/nvidia_legacy/PRE_REMOVE
@@ -0,0 +1 @@
+glselect mesa
diff --git a/z-kernels/nvidia_legacy/REPAIR^all^PRE_REMOVE b/z-kernels/nvidia_legacy/REPAIR^all^PRE_REMOVE
new file mode 100755
index 0000000..1895a77
--- /dev/null
+++ b/z-kernels/nvidia_legacy/REPAIR^all^PRE_REMOVE
@@ -0,0 +1 @@
+glselect mesa
diff --git a/z-kernels/nvidia_legacy_173xx/DEPENDS b/z-kernels/nvidia_legacy_173xx/DEPENDS
index eb530e1..446ebb0 100755
--- a/z-kernels/nvidia_legacy_173xx/DEPENDS
+++ b/z-kernels/nvidia_legacy_173xx/DEPENDS
@@ -1,3 +1,2 @@
 depends  xorg-server  &&
-depends  smgl-gl_select  &&
 depends  which
diff --git a/z-kernels/nvidia_legacy_173xx/FINAL b/z-kernels/nvidia_legacy_173xx/FINAL
index 1851270..fd99e7e 100755
--- a/z-kernels/nvidia_legacy_173xx/FINAL
+++ b/z-kernels/nvidia_legacy_173xx/FINAL
@@ -1 +1,2 @@
+glselect nvidia &&
 message "${MESSAGE_COLOR}NOTICE: You can run nvidia-xconfig to auto-configure X for nvidia_driver.${DEFAULT_COLOR}"
diff --git a/z-kernels/nvidia_legacy_173xx/HISTORY b/z-kernels/nvidia_legacy_173xx/HISTORY
index 48f5b5e..666de19 100644
--- a/z-kernels/nvidia_legacy_173xx/HISTORY
+++ b/z-kernels/nvidia_legacy_173xx/HISTORY
@@ -1,3 +1,10 @@
+2009-02-09 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DEPENDS: removed smgl-gl_select, now uses internal
+	* FINAL: run internal glselect
+	* PRE_REMOVE: return back to mesa on dispel
+	* REPAIR^all^PRE_REMOVE: return back to mesa on dispel
+	* POST_RESURRECT: added for glselect
+
 2009-02-08 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DEPENDS: use xorg-server and smgl-gl_select
 	* DETAILS: updated beta to .16
diff --git a/z-kernels/nvidia_legacy_173xx/POST_RESURRECT b/z-kernels/nvidia_legacy_173xx/POST_RESURRECT
new file mode 100755
index 0000000..7c7887f
--- /dev/null
+++ b/z-kernels/nvidia_legacy_173xx/POST_RESURRECT
@@ -0,0 +1 @@
+glselect nvidia
diff --git a/z-kernels/nvidia_legacy_173xx/PRE_REMOVE b/z-kernels/nvidia_legacy_173xx/PRE_REMOVE
new file mode 100755
index 0000000..1895a77
--- /dev/null
+++ b/z-kernels/nvidia_legacy_173xx/PRE_REMOVE
@@ -0,0 +1 @@
+glselect mesa
diff --git a/z-kernels/nvidia_legacy_173xx/REPAIR^all^PRE_REMOVE b/z-kernels/nvidia_legacy_173xx/REPAIR^all^PRE_REMOVE
new file mode 100755
index 0000000..1895a77
--- /dev/null
+++ b/z-kernels/nvidia_legacy_173xx/REPAIR^all^PRE_REMOVE
@@ -0,0 +1 @@
+glselect mesa
diff --git a/z-kernels/nvidia_legacy_96xx/DEPENDS b/z-kernels/nvidia_legacy_96xx/DEPENDS
index eb530e1..446ebb0 100755
--- a/z-kernels/nvidia_legacy_96xx/DEPENDS
+++ b/z-kernels/nvidia_legacy_96xx/DEPENDS
@@ -1,3 +1,2 @@
 depends  xorg-server  &&
-depends  smgl-gl_select  &&
 depends  which
diff --git a/z-kernels/nvidia_legacy_96xx/FINAL b/z-kernels/nvidia_legacy_96xx/FINAL
index 1851270..fd99e7e 100755
--- a/z-kernels/nvidia_legacy_96xx/FINAL
+++ b/z-kernels/nvidia_legacy_96xx/FINAL
@@ -1 +1,2 @@
+glselect nvidia &&
 message "${MESSAGE_COLOR}NOTICE: You can run nvidia-xconfig to auto-configure X for nvidia_driver.${DEFAULT_COLOR}"
diff --git a/z-kernels/nvidia_legacy_96xx/HISTORY b/z-kernels/nvidia_legacy_96xx/HISTORY
index 6e30327..39b7dab 100644
--- a/z-kernels/nvidia_legacy_96xx/HISTORY
+++ b/z-kernels/nvidia_legacy_96xx/HISTORY
@@ -1,3 +1,10 @@
+2009-02-09 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DEPENDS: removed smgl-gl_select, now uses internal
+	* FINAL: run internal glselect
+	* PRE_REMOVE: return back to mesa on dispel
+	* REPAIR^all^PRE_REMOVE: return back to mesa on dispel
+	* POST_RESURRECT: added for glselect
+
 2009-02-08 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DEPENDS: use xorg-server and added smgl-gl_select
 	* DETAILS: updated to .10
diff --git a/z-kernels/nvidia_legacy_96xx/POST_RESURRECT b/z-kernels/nvidia_legacy_96xx/POST_RESURRECT
new file mode 100755
index 0000000..7c7887f
--- /dev/null
+++ b/z-kernels/nvidia_legacy_96xx/POST_RESURRECT
@@ -0,0 +1 @@
+glselect nvidia
diff --git a/z-kernels/nvidia_legacy_96xx/PRE_REMOVE b/z-kernels/nvidia_legacy_96xx/PRE_REMOVE
new file mode 100755
index 0000000..1895a77
--- /dev/null
+++ b/z-kernels/nvidia_legacy_96xx/PRE_REMOVE
@@ -0,0 +1 @@
+glselect mesa
diff --git a/z-kernels/nvidia_legacy_96xx/REPAIR^all^PRE_REMOVE b/z-kernels/nvidia_legacy_96xx/REPAIR^all^PRE_REMOVE
new file mode 100755
index 0000000..1895a77
--- /dev/null
+++ b/z-kernels/nvidia_legacy_96xx/REPAIR^all^PRE_REMOVE
@@ -0,0 +1 @@
+glselect mesa



More information about the SM-Commit mailing list