From 4d359d4ade9b2e39e6adfef878adf8b0eef02b62 Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Thu, 15 Jul 2010 17:14:58 +0200
Subject: maj nvidia#256.35-1

---
 extra/nvidia/.md5sum |  2 +-
 extra/nvidia/Pkgfile | 61 ++++++++++++++++++++++++++--------------------------
 2 files changed, 31 insertions(+), 32 deletions(-)

(limited to 'extra')

diff --git a/extra/nvidia/.md5sum b/extra/nvidia/.md5sum
index 4251e0dab..d410fedea 100644
--- a/extra/nvidia/.md5sum
+++ b/extra/nvidia/.md5sum
@@ -1 +1 @@
-97d3e5f69707092aa643fb901bb94003  NVIDIA-Linux-x86-195.36.24-pkg0.run
+f6af8917a500de28396a438f3f548c88  NVIDIA-Linux-x86-256.35.run
diff --git a/extra/nvidia/Pkgfile b/extra/nvidia/Pkgfile
index f8cbdc7e9..4adea2e52 100755
--- a/extra/nvidia/Pkgfile
+++ b/extra/nvidia/Pkgfile
@@ -5,43 +5,42 @@
 # Depends on: xorg-server
 
 name=nvidia
-version=195.36.24
+version=256.35
 release=1
 [ "`uname -m`" == "i686"   ] && _ARCH=x86
 [ "`uname -m`" == "x86_64"   ] && _ARCH=x86_64
-source=(http://us.download.nvidia.com/XFree86/Linux-${_ARCH}/$version/NVIDIA-Linux-${_ARCH}-$version-pkg0.run)
+source=(http://us.download.nvidia.com/XFree86/Linux-${_ARCH}/$version/NVIDIA-Linux-${_ARCH}-$version.run)
 
 build() {
-	sh NVIDIA-Linux-${_ARCH}-$version-pkg0.run --extract-only
-	cd NVIDIA-Linux-${_ARCH}-$version-pkg0
-
-#	patch -p0 -i $SRC/$name-makefile.patch usr/src/nv/Makefile.kbuild
-
-
-	mkdir -p $PKG/usr/lib \
-		$PKG/usr/lib/xorg/modules/drivers \
-		$PKG/usr/lib/xorg/modules/extensions \
-		$PKG/usr/bin $PKG/usr/man/man1
-
-	cp -a usr/X11R6/lib/* $PKG/usr/lib/xorg/
-	cp -a usr/lib/* $PKG/usr/lib/
-	sed -i -e 's|__LIBGL_PATH__|/usr/lib|' $PKG/usr/lib/libGL.la
-	ln -sf libGLcore.so.$version $PKG/usr/lib/libGLcore.so
-	ln -sf /usr/lib/libGLcore.so $PKG/usr/lib/xorg/modules/extensions/libGLcore.so
-	ln -sv /usr/lib/xorg/modules/extensions/libglx.so.$version \
-	$PKG//usr/lib/xorg/modules/extensions/libglx.so
-	# copy includes
-	mkdir -p $PKG/usr/include/nvidia
-	cp -r usr/include/GL $PKG/usr/include/nvidia/
-
-
-	# install xconfig/settings programs and manpages
-#	install -m 0755 usr/bin/nvidia-{xconfig,settings} $PKG/usr/bin/
-#	install -m 0644 usr/share/man/man1/nvidia-{xconfig,settings}.1.gz \
-#		$PKG/usr/man/man1/
-
+	sh NVIDIA-Linux-${_ARCH}-$version.run --extract-only
+	cd NVIDIA-Linux-${_ARCH}-$version
+	# includes for CUDA and VDPAU
+	install -d $PKG/usr/include/{cuda,vdpau}
+	install -m 0644 vdpau*.h                       $PKG/usr/include/vdpau
+	install -m 0644 cuda*.h                        $PKG/usr/include/cuda
+
+	# librairies
+	install -d $PKG/usr/lib/{tls,vdpau}
+	for i in libGL.so.$version libOpenCL.so.1.0.0  libXvMCNVIDIA.so.$version \
+	libcuda.so.$version libnvidia-cfg.so.$version libnvidia-compiler.so.$version \
+	libnvidia-glcore.so.$version  libnvidia-tls.so.$version  libnvidia-tls.so.$version \
+	libvdpau.so.$version 
+	do
+		install -m 0755 $i $PKG/usr/lib
+	done
+	for i in libvdpau_nvidia.so.$version libvdpau_trace.so.$version 
+	do
+		install -m 0755 $i $PKG/usr/lib/vdpau
+	done
+	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
+	install -m 0755 libnvidia-wfb.so.$version $PKG/usr/lib/xorg/modules
 	# build the module
-	cd usr/src/nv
+	cd kernel
 	ln -s Makefile{.kbuild,}
 	IGNORE_CC_MISMATCH=1 make module
 
-- 
cgit v1.2.3-70-g09d2