[pkg-nvidia-devel] r393 - in /packages/nvidia-graphics-drivers/trunk: debian.binary/ debian.binary/patches/ debian/ patches/

rdonald at users.alioth.debian.org rdonald at users.alioth.debian.org
Wed Jun 4 03:43:25 UTC 2008


Author: rdonald
Date: Wed Jun  4 03:43:25 2008
New Revision: 393

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=393
Log:
prepapring new upstream 173.14.05

Added:
    packages/nvidia-graphics-drivers/trunk/patches/xen.patch
Removed:
    packages/nvidia-graphics-drivers/trunk/debian.binary/patches/xen.patch
    packages/nvidia-graphics-drivers/trunk/patches/NVIDIA_kernel-169.12-2286310.diff
Modified:
    packages/nvidia-graphics-drivers/trunk/debian.binary/changelog
    packages/nvidia-graphics-drivers/trunk/debian.binary/conf.mk
    packages/nvidia-graphics-drivers/trunk/debian.binary/rules
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/control
    packages/nvidia-graphics-drivers/trunk/debian/copyright
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.links
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.preinst
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.links
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.override
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.docs
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.examples
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.init
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.override
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.README.Debian
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.docs
    packages/nvidia-graphics-drivers/trunk/debian/upstream_info

Modified: packages/nvidia-graphics-drivers/trunk/debian.binary/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian.binary/changelog?rev=393&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian.binary/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian.binary/changelog Wed Jun  4 03:43:25 2008
@@ -1,3 +1,9 @@
+nvidia-kernel (169.12-4) unstable; urgency=low
+
+  * Fix permissions on kernel patches directory (closes: #483074) 
+
+ -- Randall Donald <rdonald at debian.org>  Tue, 27 May 2008 20:24:29 -0700
+
 nvidia-kernel (169.12-3) unstable; urgency=low
 
   * Make sure wfb diversion is removed. (closes: #482995)

Modified: packages/nvidia-graphics-drivers/trunk/debian.binary/conf.mk
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian.binary/conf.mk?rev=393&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian.binary/conf.mk (original)
+++ packages/nvidia-graphics-drivers/trunk/debian.binary/conf.mk Wed Jun  4 03:43:25 2008
@@ -103,8 +103,7 @@
 	if [ "$(kernel_arch)" = "x86_64" ]; then \
 		cp $(CURDIR)/nv-kernel.o.x86_64 $(CURDIR)/nv-kernel.o ; \
 	fi
-	#patch for XEN
-	patch -p3 < $(CURDIR)/debian/patches/xen.patch
+
 	
 	touch configure-stamp
 

Modified: packages/nvidia-graphics-drivers/trunk/debian.binary/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian.binary/rules?rev=393&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian.binary/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian.binary/rules Wed Jun  4 03:43:25 2008
@@ -145,7 +145,7 @@
 	   dpatch deapply-all ; \
 	   rm -rf patch-stamp debian/patched ; \
 	fi
-	patch -R -p3 < $(CURDIR)/debian/patches/xen.patch
+
 	
 	   
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=393&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Wed Jun  4 03:43:25 2008
@@ -1,3 +1,11 @@
+nvidia-graphics-drivers (173.14.05-1) UNRELEASED; urgency=low
+
+  * New upstream. (closes: #483619)
+  * move xen patch to source build patches.
+  * remove 2.6.25 patch, now is upstream.
+
+ -- Randall Donald <rdonald at debian.org>  Tue, 03 Jun 2008 20:28:25 -0700
+
 nvidia-graphics-drivers (169.12-4) unstable; urgency=low
 
   * Fix permissions on kernel patches directory (closes: #483074) 

Modified: packages/nvidia-graphics-drivers/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/control?rev=393&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control Wed Jun  4 03:43:25 2008
@@ -11,8 +11,8 @@
 
 Package: nvidia-glx-ia32
 Architecture: amd64
-Depends: nvidia-kernel-169.12, ia32-libs, ${shlibs:Depends}
-Suggests: nvidia-settings, nvidia-kernel-source (>= 169.12)
+Depends: nvidia-kernel-173.14.05, ia32-libs, ${shlibs:Depends}
+Suggests: nvidia-settings, nvidia-kernel-source (>= 173.14.05)
 Conflicts: nvidia-glx-src
 Replaces: nvidia-glx-src
 Description: NVIDIA binary XFree86 4.x driver
@@ -65,8 +65,8 @@
 
 Package: nvidia-glx
 Architecture: i386 amd64
-Depends: nvidia-kernel-169.12, x11-common (>= 1:7.0.0), ${shlibs:Depends}
-Suggests: nvidia-settings, nvidia-kernel-source (>= 169.12)
+Depends: nvidia-kernel-173.14.05, x11-common (>= 1:7.0.0), ${shlibs:Depends}
+Suggests: nvidia-settings, nvidia-kernel-source (>= 173.14.05)
 Conflicts: nvidia-glx-src, nvidia-glx-dev (<< 1.0.8774-5)
 Provides: xserver-xorg-video-2
 Replaces: nvidia-glx-src
@@ -123,9 +123,9 @@
  
 Package: nvidia-glx-dev
 Architecture: i386 amd64
-Depends: nvidia-glx (>= 169.12)
+Depends: nvidia-glx (>= 173.14.05)
 Provides: libgl-dev
-Conflicts: nvidia-glx (>= 169.13), libgl-dev, mesa-common-dev
+Conflicts: nvidia-glx (>= 173.14.06), libgl-dev, mesa-common-dev
 Replaces: libgl-dev
 Description: NVIDIA binary Xorg driver development files
  This package contains the NVIDIA binary Xorg driver
@@ -137,7 +137,7 @@
 Package: nvidia-kernel-source
 Architecture: i386 amd64
 Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0)
-Recommends: nvidia-glx (>= 169.12), kernel-package (>= 8.082), devscripts
+Recommends: nvidia-glx (>= 173.14.05), kernel-package (>= 8.082), devscripts
 Conflicts: nvidia-kernel-src
 Replaces: nvidia-kernel-src
 Description: NVIDIA binary kernel module source

Modified: packages/nvidia-graphics-drivers/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/copyright?rev=393&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/copyright (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/copyright Wed Jun  4 03:43:25 2008
@@ -2,7 +2,7 @@
 Mon, 31 Mar 2003 23:40:05 -0800.
 
 It was downloaded from
-ftp://download.nvidia.com/XFree86/Linux-x86_64/169.12/NVIDIA-Linux-x86_64-169.12-pkg2.run
+ftp://download.nvidia.com/XFree86/Linux-x86_64/173.14.05/NVIDIA-Linux-x86_64-173.14.05-pkg2.run
 
 Upstream Author: NVIDIA <linux-bugs at nvidia.com>
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.links
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.links?rev=393&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.links (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.links Wed Jun  4 03:43:25 2008
@@ -1,2 +1,2 @@
-#usr/lib/libGL.so.169.12 usr/lib/libGL.so
+#usr/lib/libGL.so.173.14.05 usr/lib/libGL.so
 usr/share/nvidia/include /usr/share/doc/nvidia-glx-dev/include

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.preinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.preinst?rev=393&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.preinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.preinst Wed Jun  4 03:43:25 2008
@@ -70,7 +70,7 @@
 #	dpkg-divert --add --rename --package nvidia-glx-dev --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
 #	rm /usr/lib/libGL.so || true
 	
-#	ln -s /usr/lib/libGL.so.169.12 /usr/lib/libGL.so || true
+#	ln -s /usr/lib/libGL.so.173.14.05 /usr/lib/libGL.so || true
 	
 	
 #	dpkg-divert --add --rename --package nvidia-glx-dev --divert /usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.links
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.links?rev=393&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.links (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.links Wed Jun  4 03:43:25 2008
@@ -1,5 +1,5 @@
-emul/ia32-linux/usr/lib/libGL.so.169.12 emul/ia32-linux/usr/lib/libGL.so.1
-emul/ia32-linux/usr/lib/libGL.so.169.12 emul/ia32-linux/usr/lib/libGL.so
-emul/ia32-linux/usr/lib/libGLcore.so.169.12 emul/ia32-linux/usr/lib/libGLcore.so
-emul/ia32-linux/usr/lib/libnvidia-tls.so.169.12 emul/ia32-linux/usr/lib/libnvidia-tls.so.1
-emul/ia32-linux/usr/lib/libcuda.so.169.12  emul/ia32-linux/usr/lib/libcuda.so
+emul/ia32-linux/usr/lib/libGL.so.173.14.05 emul/ia32-linux/usr/lib/libGL.so.1
+emul/ia32-linux/usr/lib/libGL.so.173.14.05 emul/ia32-linux/usr/lib/libGL.so
+emul/ia32-linux/usr/lib/libGLcore.so.173.14.05 emul/ia32-linux/usr/lib/libGLcore.so
+emul/ia32-linux/usr/lib/libnvidia-tls.so.173.14.05 emul/ia32-linux/usr/lib/libnvidia-tls.so.1
+emul/ia32-linux/usr/lib/libcuda.so.173.14.05  emul/ia32-linux/usr/lib/libcuda.so

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.override
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.override?rev=393&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.override (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.override Wed Jun  4 03:43:25 2008
@@ -1,9 +1,9 @@
-nvidia-glx-ia32: library-not-linked-against-libc ./emul/ia32-linux/usr/lib/libGL.so.169.12
+nvidia-glx-ia32: library-not-linked-against-libc ./emul/ia32-linux/usr/lib/libGL.so.173.14.05
 
-nvidia-glx-ia32: shared-lib-without-dependency-information ./emul/ia32-linux/usr/lib/libGLcore.so.169.12
+nvidia-glx-ia32: shared-lib-without-dependency-information ./emul/ia32-linux/usr/lib/libGLcore.so.173.14.05
 
 
-nvidia-glx-ia32: shlib-with-non-pic-code emul/ia32-linux/usr/lib/libGL.so.169.12
-nvidia-glx-ia32: shlib-with-non-pic-code emul/ia32-linux/usr/lib/libGLcore.so.169.12
+nvidia-glx-ia32: shlib-with-non-pic-code emul/ia32-linux/usr/lib/libGL.so.173.14.05
+nvidia-glx-ia32: shlib-with-non-pic-code emul/ia32-linux/usr/lib/libGLcore.so.173.14.05
 
-nvidia-glx-ia32: non-dev-pkg-with-shlib-symlink emul/ia32-linux/usr/lib/libGL.so.169.12 emul/ia32-linux/usr/lib/libGL.so
+nvidia-glx-ia32: non-dev-pkg-with-shlib-symlink emul/ia32-linux/usr/lib/libGL.so.173.14.05 emul/ia32-linux/usr/lib/libGL.so

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.docs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.docs?rev=393&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.docs (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.docs Wed Jun  4 03:43:25 2008
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86_64-169.12-pkg2/usr/share/doc/NVIDIA_Changelog
-NVIDIA-Linux-x86_64-169.12-pkg2/usr/share/doc/README.txt
+NVIDIA-Linux-x86_64-173.14.05-pkg2/usr/share/doc/NVIDIA_Changelog
+NVIDIA-Linux-x86_64-173.14.05-pkg2/usr/share/doc/README.txt

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.examples
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.examples?rev=393&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.examples (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.examples Wed Jun  4 03:43:25 2008
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86_64-169.12-pkg2/usr/share/doc/XF86Config.sample
+NVIDIA-Linux-x86_64-173.14.05-pkg2/usr/share/doc/XF86Config.sample
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.init
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.init?rev=393&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.init (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.init Wed Jun  4 03:43:25 2008
@@ -28,7 +28,7 @@
 
 setup_links () {
   # check if all the symlinks are in place
-  if [ "$(readlink -f /usr/lib/tls/libnvidia-tls.so.1)" != /usr/lib/nvidia/libnvidia-tls.so.169.12 ]
+  if [ "$(readlink -f /usr/lib/tls/libnvidia-tls.so.1)" != /usr/lib/nvidia/libnvidia-tls.so.173.14.05 ]
   then
     echo -n "Creating NVIDIA TLS links..."
     # remove the symlinks
@@ -43,7 +43,7 @@
     rm -f /usr/lib/tls/libGLcore.so.1
     rm -f /usr/lib/tls/libGLcore.so.*
     # create the symlinks
-    ln -s /usr/lib/nvidia/libnvidia-tls.so.169.12 /usr/lib/tls/libnvidia-tls.so.169.12
+    ln -s /usr/lib/nvidia/libnvidia-tls.so.173.14.05 /usr/lib/tls/libnvidia-tls.so.173.14.05
     # reconfigure dynamic linker run-time bindings
     ldconfig
     echo " done."
@@ -52,7 +52,7 @@
 
 remove_links () {
   # check if all the symlinks are gone or correct
-  if [  -e /usr/lib/tls/libnvidia-tls.so.169.12 \
+  if [  -e /usr/lib/tls/libnvidia-tls.so.173.14.05 \
 	-o -e /usr/lib/tls/libnvidia-tls.so \
 	-o -e /usr/lib/tls/libnvidia-tls.so.1 ]
   then
@@ -84,7 +84,7 @@
     	ln -s /usr/lib/nvidia/libGL.so.1.2.xlibmesa /usr/lib/libGL.so
     fi
     if [ -d /usr/share/doc/nvidia-glx-dev ] ; then
-        ln -s /usr/lib/libGL.so.169.12 /usr/lib/libGL.so
+        ln -s /usr/lib/libGL.so.173.14.05 /usr/lib/libGL.so
     fi
     ;;
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links?rev=393&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links Wed Jun  4 03:43:25 2008
@@ -1,8 +1,7 @@
-usr/lib/libGL.so.169.12 usr/lib/libGL.so.1
-usr/lib/libGLcore.so.169.12 usr/lib/libGLcore.so.1
-usr/lib/libnvidia-tls.so.169.12 usr/lib/libnvidia-tls.so.1
-usr/lib/xorg/modules/extensions/libglx.so.169.12 usr/lib/xorg/modules/extensions/libglx.so
-usr/lib/libXvMCNVIDIA.so.169.12 usr/lib/libXvMCNVIDIA.so.1
-usr/lib/libXvMCNVIDIA.so.169.12 usr/lib/libXvMCNVIDIA_dynamic.so.1
-usr/lib/xorg/modules/libnvidia-wfb.so.169.12 usr/lib/xorg/modules/libwfb.so
-usr/lib/libcuda.so.169.12			usr/lib/libcuda.so
+usr/lib/libGL.so.173.14.05 usr/lib/libGL.so.1
+usr/lib/libGLcore.so.173.14.05 usr/lib/libGLcore.so.1
+usr/lib/libnvidia-tls.so.173.14.05 usr/lib/libnvidia-tls.so.1
+usr/lib/xorg/modules/extensions/libglx.so.173.14.05 usr/lib/xorg/modules/extensions/libglx.so
+usr/lib/libXvMCNVIDIA.so.173.14.05 usr/lib/libXvMCNVIDIA.so.1
+usr/lib/libXvMCNVIDIA.so.173.14.05 usr/lib/libXvMCNVIDIA_dynamic.so.1
+usr/lib/libcuda.so.173.14.05			usr/lib/libcuda.so

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.override
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.override?rev=393&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.override (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.override Wed Jun  4 03:43:25 2008
@@ -1,14 +1,14 @@
-nvidia-glx: library-not-linked-against-libc ./usr/lib/libGL.so.169.12
+nvidia-glx: library-not-linked-against-libc ./usr/lib/libGL.so.173.14.05
 
-nvidia-glx: shared-lib-without-dependency-information ./usr/lib/libGLcore.so.169.12
+nvidia-glx: shared-lib-without-dependency-information ./usr/lib/libGLcore.so.173.14.05
 
-nvidia-glx: library-not-linked-against-libc ./usr/lib/xorg/modules/extensions/libglx.so.169.12
+nvidia-glx: library-not-linked-against-libc ./usr/lib/xorg/modules/extensions/libglx.so.173.14.05
 
-nvidia-glx: shlib-with-non-pic-code usr/lib/libGL.so.169.12
-nvidia-glx: shlib-with-non-pic-code usr/lib/libGLcore.so.169.12
-nvidia-glx: shlib-with-non-pic-code usr/lib/xorg/modules/extensions/libglx.so.169.12
-nvidia-glx: shlib-with-non-pic-code usr/lib/xorg/libXvMCNVIDIA.so.169.12
-nvidia-glx: shlib-with-non-pic-code usr/lib/xorg/libXvMCNVIDIA.so.169.12
+nvidia-glx: shlib-with-non-pic-code usr/lib/libGL.so.173.14.05
+nvidia-glx: shlib-with-non-pic-code usr/lib/libGLcore.so.173.14.05
+nvidia-glx: shlib-with-non-pic-code usr/lib/xorg/modules/extensions/libglx.so.173.14.05
+nvidia-glx: shlib-with-non-pic-code usr/lib/xorg/libXvMCNVIDIA.so.173.14.05
+nvidia-glx: shlib-with-non-pic-code usr/lib/xorg/libXvMCNVIDIA.so.173.14.05
 
-nvidia-glx: non-dev-pkg-with-shlib-symlink usr/lib/libGL.so.169.12 usr/lib/libGL.so
-nvidia-glx: non-dev-pkg-with-shlib-symlink usr/lib/xorg/modules/extensions/libglx.so.169.12 usr/lib/xorg/modules/extensions/libglx.so
+nvidia-glx: non-dev-pkg-with-shlib-symlink usr/lib/libGL.so.173.14.05 usr/lib/libGL.so
+nvidia-glx: non-dev-pkg-with-shlib-symlink usr/lib/xorg/modules/extensions/libglx.so.173.14.05 usr/lib/xorg/modules/extensions/libglx.so

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm?rev=393&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm Wed Jun  4 03:43:25 2008
@@ -29,8 +29,7 @@
 	dpkg-divert --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libglx.so.xlibmesa /usr/lib/xorg/modules/extensions/libglx.so > /dev/null
 
 	dpkg-divert --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
-#	dpkg-divert --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libwfb.so.xserver-xorg-core /usr/lib/xorg/modules/libwfb.so > /dev/null
-	rm -f /usr/lib/xorg/modules/extensions/libglx.so.169.12 2> /dev/null || true
+	rm -f /usr/lib/xorg/modules/extensions/libglx.so.173.14.05 2> /dev/null || true
 	if [ -d /usr/lib/nvidia ]; then
 		rmdir /usr/lib/nvidia/ || true;
 	fi
@@ -50,7 +49,7 @@
 esac
 
 
-#rm -f /usr/lib/xorg/modules/extensions/libglx.so.169.12 2> /dev/null || true
+#rm -f /usr/lib/xorg/modules/extensions/libglx.so.173.14.05 2> /dev/null || true
 
     
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.README.Debian
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.README.Debian?rev=393&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.README.Debian (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.README.Debian Wed Jun  4 03:43:25 2008
@@ -98,7 +98,7 @@
    
 7. Install the nvidia-kernel package:
 	    		     
-   dpkg -i ../nvidia-kernel-2.6.14-2-k7_169.12-1+_.Custom_i386.deb
+   dpkg -i ../nvidia-kernel-2.6.14-2-k7_173.14.05-1+_.Custom_i386.deb
    ( or similar filename )
 
 Now see GENERAL NOTES below method #2

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.docs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.docs?rev=393&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.docs (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.docs Wed Jun  4 03:43:25 2008
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86_64-169.12-pkg2/usr/share/doc/NVIDIA_Changelog
-NVIDIA-Linux-x86_64-169.12-pkg2/usr/share/doc/README.txt
+NVIDIA-Linux-x86_64-173.14.05-pkg2/usr/share/doc/NVIDIA_Changelog
+NVIDIA-Linux-x86_64-173.14.05-pkg2/usr/share/doc/README.txt

Modified: packages/nvidia-graphics-drivers/trunk/debian/upstream_info
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/upstream_info?rev=393&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/upstream_info (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/upstream_info Wed Jun  4 03:43:25 2008
@@ -1,8 +1,8 @@
 eval `dpkg-architecture`
 
 #BASE_VERSION=1.0
-RELEASE=169.12
-NEXTVER=169.13
+RELEASE=173.14.05
+NEXTVER=173.14.06
 
 if [ "$DEB_BUILD_ARCH" = "amd64" ] ; then
 	BASE_URL=ftp://download.nvidia.com/XFree86/Linux-x86_64/${RELEASE}

Added: packages/nvidia-graphics-drivers/trunk/patches/xen.patch
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/patches/xen.patch?rev=393&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/patches/xen.patch (added)
+++ packages/nvidia-graphics-drivers/trunk/patches/xen.patch Wed Jun  4 03:43:25 2008
@@ -1,0 +1,202 @@
+diff -ruN usr/src/nv/conftest.sh usr/src/nv/conftest.sh
+--- usr/src/nv/conftest.sh      2008-05-21 16:06:03.000000000 -0400
++++ usr/src/nv/conftest.sh      2008-05-21 16:11:54.000000000 -0400
+@@ -1163,62 +1163,7 @@
+     ;;
+ 
+     xen_sanity_check)
+-        #
+-        # Check if the target kernel is a Xen kernel. If so, then exit, since
+-        # the driver doesn't currently work with Xen.
+-        #
+-        RET=1
+-        VERBOSE=$6
+-        FILE="linux/autoconf.h"
+-
+-        if [ -n "$IGNORE_XEN_PRESENCE" ]; then
+-            exit 0
+-        fi
+-
+-        if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
+-            #
+-            # We are looking at a configured source tree; verify
+-            # that it's not a Xen kernel.
+-            #
+-            echo "#include <linux/autoconf.h>
+-            #ifdef CONFIG_XEN
+-            #error CONFIG_XEN defined!!
+-            #endif
+-            " > conftest$$.c
+-
+-            $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
+-            rm -f conftest$$.c
+-
+-            if [ -f conftest$$.o ]; then
+-                rm -f conftest$$.o
+-                RET=0
+-            fi
+-        else
+-            CONFIG=$HEADERS/../.config
+-            if [ -f $CONFIG ]; then
+-                if [ -z "$(grep "^CONFIG_XEN=y" $CONFIG)" ]; then
+-                    RET=0
+-                fi
+-            fi
+-        fi
+-
+-        if [ "$RET" != "0" ]; then
+-            echo "The kernel you are installing for is a Xen kernel!";
+-            echo "";
+-            echo "The NVIDIA driver does not currently work on Xen kernels. If ";
+-            echo "you are using a stock distribution kernel, please install ";
+-            echo "a variant of this kernel without Xen support; if this is a ";
+-            echo "custom kernel, please install a standard Linux kernel.  Then ";
+-            echo "try installing the NVIDIA kernel module again.";
+-            echo "";
+-            if [ "$VERBOSE" = "full_output" ]; then
+-                echo "*** Failed Xen sanity check. Bailing out! ***";
+-                echo "";
+-            fi
+-            exit 1
+-        else
+-            exit 0
+-        fi
++        exit 0
+     ;;
+ 
+     compile_tests)
+diff -ruN usr/src/nv/nv-linux.h usr/src/nv/nv-linux.h
+--- usr/src/nv/nv-linux.h       2008-05-21 16:06:03.000000000 -0400
++++ usr/src/nv/nv-linux.h       2008-05-21 16:10:14.000000000 -0400
+@@ -108,11 +108,6 @@
+ #include <linux/completion.h>
+ #include <linux/highmem.h>
+ 
+-#ifdef CONFIG_XEN
+-#include <asm/maddr.h>
+-#include <xen/interface/memory.h>
+-#endif
+-
+ #ifdef CONFIG_PROC_FS
+ #include <linux/proc_fs.h>
+ #endif
+@@ -144,7 +139,7 @@
+ #include <linux/agpgart.h>
+ #endif
+ 
+-#if (defined(NVCPU_X86) || defined(NVCPU_X86_64)) && !defined(CONFIG_XEN)
++#if (defined(NVCPU_X86) || defined(NVCPU_X86_64))
+ #define NV_BUILD_NV_PAT_SUPPORT 1
+ #endif
+ 
+@@ -713,11 +708,7 @@
+ #define NV_TASK_STRUCT_RLIM(current)  ((current)->rlim)
+ #endif
+ 
+-#ifdef CONFIG_XEN
+-#define NV_GET_DMA_ADDRESS(phys_addr) phys_to_machine(phys_addr)
+-#else
+ #define NV_GET_DMA_ADDRESS(phys_addr) (phys_addr)
+-#endif
+ 
+ #define NV_GET_PAGE_STRUCT(phys_page) virt_to_page(__va(phys_page))
+ #define NV_VMA_PGOFF(vma)             ((vma)->vm_pgoff)
+@@ -861,13 +852,8 @@
+ #else
+ #error "NV_REMAP_PAGE_RANGE() undefined!"
+ #endif
+-#if !defined(CONFIG_XEN)
+ #define NV_IO_REMAP_PAGE_RANGE(from, offset, x...) \
+     NV_REMAP_PAGE_RANGE(from, offset, x)
+-#else
+-#define NV_IO_REMAP_PAGE_RANGE(from, offset, x...) \
+-    io_remap_pfn_range(vma, from, ((offset) >> PAGE_SHIFT), x)
+-#endif
+ 
+ #define NV_PGD_OFFSET(address, kernel, mm)              \
+    ({                                                   \
+diff -ruN usr/src/nv/nv.c usr/src/nv/nv.c
+--- usr/src/nv/nv.c     2008-05-21 16:06:03.000000000 -0400
++++ usr/src/nv/nv.c     2008-05-21 16:10:16.000000000 -0400
+@@ -2020,20 +2020,6 @@
+         nvl->tasklet.data = (unsigned long) nv;
+         tasklet_enable(&nvl->tasklet);
+ 
+-#if defined(CONFIG_XEN)
+-        if ((nvl->dev->dma_mask <= 0xffffffff) &&
+-            (HYPERVISOR_memory_op(XENMEM_maximum_ram_page, NULL) > 0xfffff))
+-        {
+-            NV_SHUTDOWN_ADAPTER(sp, nv, nvl);
+-            nv_printf(NV_DBG_ERRORS,
+-                "NVRM: GPUs incapable of addressing more than 4GB of memory\n"
+-                "NVRM: are not supported when using Xen kernels on systems with\n"
+-                "NVRM: system memory mapped above the 4GB boundary.\n");
+-            rc = -EIO;
+-            goto failed;
+-        }
+-#endif
+-
+         nv->flags |= NV_FLAG_OPEN;
+     }
+ 
+@@ -3904,7 +3890,6 @@
+     U032         config
+ )
+ {
+-#if !defined(CONFIG_XEN)
+     RM_STATUS status = RM_ERROR;
+     static int old_error = 0;
+     nv_stack_t *sp = NULL;
+@@ -4042,10 +4027,6 @@
+         old_error = 0; /* report new errors */
+ 
+     return status;
+-#else
+-    nv_printf(NV_DBG_ERRORS, "NVRM: AGP is not supported on Xen kernels.\n");
+-    return RM_ERR_NOT_SUPPORTED;
+-#endif
+ }
+ 
+ RM_STATUS NV_API_CALL nv_agp_teardown(
+diff -ruN usr/src/nv/os-interface.c usr/src/nv/os-interface.c
+--- usr/src/nv/os-interface.c   2008-05-21 16:06:03.000000000 -0400
++++ usr/src/nv/os-interface.c   2008-05-21 16:13:02.000000000 -0400
+@@ -598,7 +598,6 @@
+     if (jiffies) 
+     {
+         // if we have at least 1 full jiffy to wait, give up the cpu
+-#if !defined(CONFIG_XEN)
+         // but first, make sure we haven't raised the irql level on
+         // this cpu (most likely holding a lock). I'm seeing cases
+         // where we give up the cpu with raised irql, and never get
+@@ -609,10 +608,8 @@
+         // the local CPU.
+         if (!NV_IRQL_IS_RAISED())
+         {
+-#endif
+             /* give up the cpu */
+             current->state = TASK_INTERRUPTIBLE;
+-#if !defined(CONFIG_XEN)
+         }
+         else
+         {
+@@ -622,7 +619,6 @@
+             os_dbg_breakpoint();
+             return RM_ERROR;
+         }
+-#endif
+         do
+         {
+             schedule_timeout(jiffies);
+@@ -1376,12 +1372,10 @@
+      * If you prefer to manually grant the necessary capability and 
+      * adjust the resource limit, disable the lines below.
+      */
+-#if !defined(CONFIG_XEN)
+     struct rlimit *rlim = NV_TASK_STRUCT_RLIM(current);
+     rlim[RLIMIT_MEMLOCK].rlim_cur = RLIM_INFINITY;
+     cap_raise(current->cap_effective, CAP_IPC_LOCK);
+     return RM_OK;
+-#endif
+     return RM_ERR_NOT_SUPPORTED;
+ }




More information about the Pkg-nvidia-devel mailing list