From 03712f903f70cae581cb6af307fc77b6572234f5 Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Sat, 2 Apr 2011 18:08:43 +0200
Subject: nvidia, maj emplacement modules

---
 base/nvidia/.footprint.i686   | 16 ++++++++--------
 base/nvidia/.footprint.x86_64 | 16 ++++++++--------
 base/nvidia/Pkgfile           | 13 +++++++------
 3 files changed, 23 insertions(+), 22 deletions(-)

(limited to 'base')

diff --git a/base/nvidia/.footprint.i686 b/base/nvidia/.footprint.i686
index 67fa775dd..f3d1a618e 100644
--- a/base/nvidia/.footprint.i686
+++ b/base/nvidia/.footprint.i686
@@ -26,11 +26,11 @@ drwxr-xr-x	root/root	usr/lib/tls/
 drwxr-xr-x	root/root	usr/lib/vdpau/
 -rwxr-xr-x	root/root	usr/lib/vdpau/libvdpau_nvidia.so.260.19.36
 -rwxr-xr-x	root/root	usr/lib/vdpau/libvdpau_trace.so.260.19.36
-drwxr-xr-x	root/root	usr/lib/xorg/
-drwxr-xr-x	root/root	usr/lib/xorg/modules/
-drwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/
--rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/nvidia_drv.so
-drwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/
-lrwxrwxrwx	root/root	usr/lib/xorg/modules/extensions/libglx.so -> libglx.so.260.19.36
--rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libglx.so.260.19.36
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libnvidia-wfb.so.260.19.36
+drwxr-xr-x	root/root	usr/lib/X11/
+drwxr-xr-x	root/root	usr/lib/X11/modules/
+drwxr-xr-x	root/root	usr/lib/X11/modules/drivers/
+-rwxr-xr-x	root/root	usr/lib/X11/modules/drivers/nvidia_drv.so
+drwxr-xr-x	root/root	usr/lib/X11/modules/extensions/
+lrwxrwxrwx	root/root	usr/lib/X11/modules/extensions/libglx.so -> libglx.so.260.19.36
+-rwxr-xr-x	root/root	usr/lib/X11/modules/extensions/libglx.so.260.19.36
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libnvidia-wfb.so.260.19.36
diff --git a/base/nvidia/.footprint.x86_64 b/base/nvidia/.footprint.x86_64
index 67fa775dd..f3d1a618e 100644
--- a/base/nvidia/.footprint.x86_64
+++ b/base/nvidia/.footprint.x86_64
@@ -26,11 +26,11 @@ drwxr-xr-x	root/root	usr/lib/tls/
 drwxr-xr-x	root/root	usr/lib/vdpau/
 -rwxr-xr-x	root/root	usr/lib/vdpau/libvdpau_nvidia.so.260.19.36
 -rwxr-xr-x	root/root	usr/lib/vdpau/libvdpau_trace.so.260.19.36
-drwxr-xr-x	root/root	usr/lib/xorg/
-drwxr-xr-x	root/root	usr/lib/xorg/modules/
-drwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/
--rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/nvidia_drv.so
-drwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/
-lrwxrwxrwx	root/root	usr/lib/xorg/modules/extensions/libglx.so -> libglx.so.260.19.36
--rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libglx.so.260.19.36
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libnvidia-wfb.so.260.19.36
+drwxr-xr-x	root/root	usr/lib/X11/
+drwxr-xr-x	root/root	usr/lib/X11/modules/
+drwxr-xr-x	root/root	usr/lib/X11/modules/drivers/
+-rwxr-xr-x	root/root	usr/lib/X11/modules/drivers/nvidia_drv.so
+drwxr-xr-x	root/root	usr/lib/X11/modules/extensions/
+lrwxrwxrwx	root/root	usr/lib/X11/modules/extensions/libglx.so -> libglx.so.260.19.36
+-rwxr-xr-x	root/root	usr/lib/X11/modules/extensions/libglx.so.260.19.36
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libnvidia-wfb.so.260.19.36
diff --git a/base/nvidia/Pkgfile b/base/nvidia/Pkgfile
index 3c6d1fbe3..3375b1649 100755
--- a/base/nvidia/Pkgfile
+++ b/base/nvidia/Pkgfile
@@ -5,7 +5,7 @@
 
 name=nvidia
 version=270.30
-release=1
+release=2
 [ "`uname -m`" == "i686"   ] && _ARCH=x86
 [ "`uname -m`" == "x86_64"   ] && _ARCH=x86_64
 source=(ftp://download.nvidia.com/XFree86/Linux-${_ARCH}/$version/NVIDIA-Linux-${_ARCH}-$version.run)
@@ -30,13 +30,14 @@ build() {
 	install -m 0755 tls/libnvidia-tls.so.$version $PKG/usr/lib/tls
 	install -m 0644 libXvMCNVIDIA.a $PKG/usr/lib
 	# xorg driver/extensions
-	install -d $PKG/usr/lib/xorg/modules/{drivers,extensions}
-	install -m 0755 nvidia_drv.so $PKG/usr/lib/xorg/modules/drivers
-	install -m 0755 libglx.so.$version $PKG/usr/lib/xorg/modules/extensions
-	ln -s libglx.so.$version $PKG/usr/lib/xorg/modules/extensions/libglx.so
-	install -m 0755 libnvidia-wfb.so.$version $PKG/usr/lib/xorg/modules
+	install -d $PKG/usr/lib/X11/modules/{drivers,extensions}
+	install -m 0755 nvidia_drv.so $PKG/usr/lib/X11/modules/drivers
+	install -m 0755 libglx.so.$version $PKG/usr/lib/X11/modules/extensions
+	ln -s libglx.so.$version $PKG/usr/lib/X11/modules/extensions/libglx.so
+	install -m 0755 libnvidia-wfb.so.$version $PKG/usr/lib/X11/modules
 	# build the module
 	cd kernel
+
 	ln -s Makefile{.kbuild,}
 	IGNORE_CC_MISMATCH=1 make module
 
-- 
cgit v1.2.3-54-g00ecf