![](https://seccdn.libravatar.org/avatar/af22e20b6884acbc89be6d7736c43e92.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package 3ddiag checked in at Thu Nov 23 16:10:58 CET 2006. -------- --- 3ddiag/3ddiag.changes 2006-08-30 17:51:34.000000000 +0200 +++ 3ddiag/3ddiag.changes 2006-11-23 04:31:52.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 23 04:30:38 CET 2006 - sndirsch@suse.de + +- switch2nv: + * check for nvidia driver also in new X.Org 7 module path + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ 3ddiag.spec ++++++ --- /var/tmp/diff_new_pack.e1CZ4g/_old 2006-11-23 16:09:48.000000000 +0100 +++ /var/tmp/diff_new_pack.e1CZ4g/_new 2006-11-23 16:09:48.000000000 +0100 @@ -12,11 +12,11 @@ Name: 3ddiag BuildRequires: hwinfo-devel -License: GPL +License: GNU General Public License (GPL) Group: System/Base Autoreqprov: on Version: 0.738 -Release: 1 +Release: 27 Summary: A Tool to Verify the 3D Configuration Source: 3Ddiag-%{version}.tar.gz Source5: switch2nv @@ -70,6 +70,9 @@ /usr/bin/switch2nvidia %changelog -n 3ddiag +* Thu Nov 23 2006 - sndirsch@suse.de +- switch2nv: + * check for nvidia driver also in new X.Org 7 module path * Wed Aug 30 2006 - sndirsch@suse.de - fixed nvidia driver detection (X.Org 7 driver path related) * Wed Aug 30 2006 - ro@suse.de @@ -346,16 +349,16 @@ * some cleanups * Mon Jul 23 2001 - sndirsch@suse.de - update to release 0.354: added options for 3Ddiag ---devel verify full OpenGL Development configuration ---dri verify DRI/XFree86 4.x configuration ---help, -h display this help and exit ---ignoredb search for configurations of untested/unsuccesfull + --devel verify full OpenGL Development configuration + --dri verify DRI/XFree86 4.x configuration + --help, -h display this help and exit + --ignoredb search for configurations of untested/unsuccesfull tested hardware ---mesaglide verify Mesa/Glide configuration ---mesasoft verify 'Mesa Software Rendering' configuration ---nvidia_glx verify 'nVidia GLX/XFree86 4.x' configuration ---runtime verify GLU/glut Runtime configuration ---utah-glx verify Utah-GLX/XFree86 3.3 configuration + --mesaglide verify Mesa/Glide configuration + --mesasoft verify 'Mesa Software Rendering' configuration + --nvidia_glx verify 'nVidia GLX/XFree86 4.x' configuration + --runtime verify GLU/glut Runtime configuration + --utah-glx verify Utah-GLX/XFree86 3.3 configuration * Fri Jun 22 2001 - sndirsch@suse.de - added scripts switch2nv/switch2nvidia to switch easily between nv/nvidia driver; these scripts execute switch2mesasoft/ ++++++ switch2nv ++++++ --- 3ddiag/switch2nv 2005-12-08 16:20:12.000000000 +0100 +++ 3ddiag/switch2nv 2006-11-23 04:30:08.000000000 +0100 @@ -29,16 +29,19 @@ libdir="lib" test "$(arch)" == "x86_64" && libdir="lib64" -strings /usr/X11R6/$libdir/modules/drivers/nvidia_drv.so | \ - grep -q "NVIDIA dlloader X Driver" -if [ $? -eq 0 ]; then - echo "warning: NVIDIA driver installed. Uninstalling NVIDIA driver first." - echo -n "warning: Running \"/usr/bin/nvidia-installer --uninstall -s\" ... " - /usr/bin/tiny-nvidia-installer --uninstall -s - echo "done" - echo - depmod -a &> /dev/null -fi +for file in /usr/X11R6/$libdir/modules/drivers/nvidia_drv.so \ + /usr/$libdir/xorg/modules/drivers/nvidia_drv.so; do + if [ -r $file ]; then + if strings $file | grep -q "NVIDIA dlloader X Driver"; then + echo "warning: NVIDIA driver installed. Uninstalling NVIDIA driver first." + echo -n "warning: Running \"/usr/bin/nvidia-installer --uninstall -s\" ... " + /usr/bin/tiny-nvidia-installer --uninstall -s + echo "done" + echo + depmod -a &> /dev/null + fi + fi +done echo -n "Patching /etc/X11/xorg.conf ... " sed -e '/[ \t]*Driver[ \t]*"nvidia"/s/nvidia/nv/g' \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@suse.de