r1248 - crux-2.2/ports/opt/nvidia - crux-commits

13 Apr 2006

Author: jaeger
Date: 2006-04-13 19:08:29 +0200 (Thu, 13 Apr 2006)
New Revision: 1248

Added:
   crux-2.2/ports/opt/nvidia/nvidia-makefile.patch
Removed:
   crux-2.2/ports/opt/nvidia/nvidia-1.0-7676-makefiles.patch
Modified:
   crux-2.2/ports/opt/nvidia/.footprint
   crux-2.2/ports/opt/nvidia/.md5sum
   crux-2.2/ports/opt/nvidia/Pkgfile
Log:
nvidia: updated to version 1.0-8756

Modified: crux-2.2/ports/opt/nvidia/.footprint
===================================================================

--- crux-2.2/ports/opt/nvidia/.footprint	2006-04-13 07:39:38 UTC (rev 1247)
+++ crux-2.2/ports/opt/nvidia/.footprint	2006-04-13 17:08:29 UTC (rev 1248)
@@ -8,13 +8,14 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/X11R6/
 drwxr-xr-x	root/root	usr/X11R6/lib/
--rwxr-xr-x	root/root	usr/X11R6/lib/libXvMCNVIDIA.a
--rwxr-xr-x	root/root	usr/X11R6/lib/libXvMCNVIDIA.so.1.0.8178
+-r--r--r--	root/root	usr/X11R6/lib/libXvMCNVIDIA.a
+-rwxr-xr-x	root/root	usr/X11R6/lib/libXvMCNVIDIA.so.1.0.8756
 drwxr-xr-x	root/root	usr/X11R6/lib/modules/
 drwxr-xr-x	root/root	usr/X11R6/lib/modules/drivers/
 -rwxr-xr-x	root/root	usr/X11R6/lib/modules/drivers/nvidia_drv.o
+-rwxr-xr-x	root/root	usr/X11R6/lib/modules/drivers/nvidia_drv.so
 drwxr-xr-x	root/root	usr/X11R6/lib/modules/extensions/
--rwxr-xr-x	root/root	usr/X11R6/lib/modules/extensions/libglx.so.1.0.8178
+-rwxr-xr-x	root/root	usr/X11R6/lib/modules/extensions/libglx.so.1.0.8756
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/nvidia-settings
 -rwxr-xr-x	root/root	usr/bin/nvidia-xconfig
@@ -26,14 +27,13 @@
 -r--r--r--	root/root	usr/include/nvidia/GL/glx.h
 -r--r--r--	root/root	usr/include/nvidia/GL/glxext.h
 drwxr-xr-x	root/root	usr/lib/
--rw-r--r--	root/root	usr/lib/libGL.la
-lrwxrwxrwx	root/root	usr/lib/libGL.so -> libGL.so.1.0.8178
--rwxr-xr-x	root/root	usr/lib/libGL.so.1.0.8178
--rwxr-xr-x	root/root	usr/lib/libGLcore.so.1.0.8178
--rwxr-xr-x	root/root	usr/lib/libnvidia-cfg.so.1.0.8178
--rwxr-xr-x	root/root	usr/lib/libnvidia-tls.so.1.0.8178
+-rwxr-xr-x	root/root	usr/lib/libGL.la
+-rwxr-xr-x	root/root	usr/lib/libGL.so.1.0.8756
+-rwxr-xr-x	root/root	usr/lib/libGLcore.so.1.0.8756
+-rwxr-xr-x	root/root	usr/lib/libnvidia-cfg.so.1.0.8756
+-rwxr-xr-x	root/root	usr/lib/libnvidia-tls.so.1.0.8756
 drwxr-xr-x	root/root	usr/lib/tls/
--rwxr-xr-x	root/root	usr/lib/tls/libnvidia-tls.so.1.0.8178
+-rwxr-xr-x	root/root	usr/lib/tls/libnvidia-tls.so.1.0.8756
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man1/
 -rw-r--r--	root/root	usr/man/man1/nvidia-settings.1.gz

Modified: crux-2.2/ports/opt/nvidia/.md5sum
===================================================================
--- crux-2.2/ports/opt/nvidia/.md5sum	2006-04-13 07:39:38 UTC (rev 1247)
+++ crux-2.2/ports/opt/nvidia/.md5sum	2006-04-13 17:08:29 UTC (rev 1248)
@@ -1,2 +1,2 @@
-6c8081bfde4a806a487efc2a9a1ff016  NVIDIA-Linux-x86-1.0-8178-pkg0.run
-30639de943a63b41fb363c665e3e094f  nvidia-1.0-7676-makefiles.patch
+2fb4e625e41e2385d8ae082f4177bbb1  NVIDIA-Linux-x86-1.0-8756-pkg0.run
+544ac021f572c0aca5025dcca9d01510  nvidia-makefile.patch

Modified: crux-2.2/ports/opt/nvidia/Pkgfile
===================================================================
--- crux-2.2/ports/opt/nvidia/Pkgfile	2006-04-13 07:39:38 UTC (rev 1247)
+++ crux-2.2/ports/opt/nvidia/Pkgfile	2006-04-13 17:08:29 UTC (rev 1248)
@@ -6,17 +6,17 @@
 # Nice to have: gl-select
 
 name=nvidia
-version=1.0-8178
+version=1.0-8756
 release=1
 source=(http://download.nvidia.com/XFree86/Linux-x86/$version/NVIDIA-Linux-x86-$vers... \
-	$name-1.0-7676-makefiles.patch)
+	$name-makefile.patch)
 
 build() {
 	sh NVIDIA-Linux-x86-$version-pkg0.run --extract-only
 	cd NVIDIA-Linux-x86-$version-pkg0
 
-	# patch Makefiles for normal users and no load during build
-	patch -p1 < $SRC/$name-1.0-7676-makefiles.patch
+	# patch Makefile.kbuild for normal users and no load during build
+	patch -p0 -i $SRC/$name-makefile.patch usr/src/nv/Makefile.kbuild
 
 	# create directories the Makefile expects
 	mkdir -p $PKG/usr/lib \
@@ -24,17 +24,11 @@
 		$PKG/usr/X11R6/lib/modules/extensions \
 		$PKG/usr/bin $PKG/usr/man/man1
 
-	# build/install libraries
-	make ROOT=$PKG install
-	install -m 0644 usr/lib/libGL.la $PKG/usr/lib/
+	# install libraries
+	cp -a usr/X11R6/lib $PKG/usr/X11R6/
+	cp -a usr/lib/* $PKG/usr/lib/
 	sed -i -e 's|__LIBGL_PATH__|/usr/lib|' $PKG/usr/lib/libGL.la
 
-	# remove the documentation
-	rm -rf $PKG/usr/share
-
-	# remove the conflicting libglx.so symlink
-	rm -f $PKG/usr/X11R6/lib/modules/extensions/libglx.so
-
 	# copy includes
 	mkdir -p $PKG/usr/include/nvidia
 	cp -r usr/include/GL $PKG/usr/include/nvidia/
@@ -46,7 +40,8 @@
 
 	# build the module
 	cd usr/src/nv
-	IGNORE_CC_MISMATCH=1 make -f Makefile.kbuild module
+	ln -s Makefile{.kbuild,}
+	IGNORE_CC_MISMATCH=1 make module
 
 	# install it
 	install -m 0644 -D nvidia.ko \

Deleted: crux-2.2/ports/opt/nvidia/nvidia-1.0-7676-makefiles.patch
===================================================================
--- crux-2.2/ports/opt/nvidia/nvidia-1.0-7676-makefiles.patch	2006-04-13 07:39:38 UTC (rev 1247)
+++ crux-2.2/ports/opt/nvidia/nvidia-1.0-7676-makefiles.patch	2006-04-13 17:08:29 UTC (rev 1248)
@@ -1,49 +0,0 @@
-diff -urN NVIDIA-Linux-x86-1.0-7676-pkg0.orig/Makefile NVIDIA-Linux-x86-1.0-7676-pkg0/Makefile
---- NVIDIA-Linux-x86-1.0-7676-pkg0.orig/Makefile	2005-07-29 15:30:44.000000000 -0500
-+++ NVIDIA-Linux-x86-1.0-7676-pkg0/Makefile	2005-08-26 08:36:42.736205664 -0500
-@@ -95,4 +95,4 @@
- 	@echo -n "      "
- 	cp -r usr/share/doc/* ${DOCDIR}
- 	@echo -n "      "
--	/sbin/ldconfig
-+	#/sbin/ldconfig
-diff -urN NVIDIA-Linux-x86-1.0-7676-pkg0.orig/usr/src/nv/Makefile.kbuild NVIDIA-Linux-x86-1.0-7676-pkg0/usr/src/nv/Makefile.kbuild
---- NVIDIA-Linux-x86-1.0-7676-pkg0.orig/usr/src/nv/Makefile.kbuild	2005-07-29 15:30:43.000000000 -0500
-+++ NVIDIA-Linux-x86-1.0-7676-pkg0/usr/src/nv/Makefile.kbuild	2005-08-26 08:36:42.736205664 -0500
-@@ -255,10 +255,10 @@
- #
- 
- suser-sanity-check:
--	@if ! $(CONFTEST) suser_sanity_check; then exit 1; fi
-+	#@if ! $(CONFTEST) suser_sanity_check; then exit 1; fi
- 
- rmmod-sanity-check:
--	@if ! $(CONFTEST) rmmod_sanity_check; then exit 1; fi
-+	#@if ! $(CONFTEST) rmmod_sanity_check; then exit 1; fi
- 
- gcc-sanity-check:
- 	@if ! $(CONFTEST) cc_sanity_check full_output; then exit 1; fi
-@@ -293,9 +293,9 @@
- #
- 
- module-install: suser-sanity-check module
--	@mkdir -p $(MODULE_ROOT)/video; \
--	install -m 0664 -o root -g root $(MODULE_OBJECT) $(MODULE_ROOT)/video; \
--	PATH="$(PATH):/bin:/sbin" depmod -ae;
-+	#@mkdir -p $(MODULE_ROOT)/video; \
-+	#install -m 0664 -o root -g root $(MODULE_OBJECT) $(MODULE_ROOT)/video; \
-+	#PATH="$(PATH):/bin:/sbin" depmod -ae;
- 
- #
- # This target builds, then installs, then creates device nodes and inserts
-@@ -303,8 +303,8 @@
- #
- 
- package-install: module-install rmmod-sanity-check
--	PATH="$(PATH):/bin:/sbin" modprobe $(MODULE_NAME) && \
--	echo "$(MODULE_OBJECT) installed successfully.";
-+	#PATH="$(PATH):/bin:/sbin" modprobe $(MODULE_NAME) && \
-+	#echo "$(MODULE_OBJECT) installed successfully.";
- 
- #
- # Build an object file suitable for further processing by the installer and

Added: crux-2.2/ports/opt/nvidia/nvidia-makefile.patch
===================================================================
--- crux-2.2/ports/opt/nvidia/nvidia-makefile.patch	                        (rev 0)
+++ crux-2.2/ports/opt/nvidia/nvidia-makefile.patch	2006-04-13 17:08:29 UTC (rev 1248)
@@ -0,0 +1,39 @@
+--- Makefile.kbuild.orig	2006-04-13 11:14:18.437632472 -0500
++++ Makefile.kbuild	2006-04-13 11:15:28.789937296 -0500
+@@ -269,10 +269,10 @@
+ #
+ 
+ suser-sanity-check:
+-	@if ! $(CONFTEST) suser_sanity_check; then exit 1; fi
++	#@if ! $(CONFTEST) suser_sanity_check; then exit 1; fi
+ 
+ rmmod-sanity-check:
+-	@if ! $(CONFTEST) rmmod_sanity_check; then exit 1; fi
++	#@if ! $(CONFTEST) rmmod_sanity_check; then exit 1; fi
+ 
+ gcc-sanity-check:
+ 	@if ! $(CONFTEST) cc_sanity_check full_output; then exit 1; fi
+@@ -311,9 +311,9 @@
+ #
+ 
+ module-install: suser-sanity-check module
+-	@mkdir -p $(MODULE_ROOT)/video; \
+-	install -m 0664 -o root -g root $(MODULE_OBJECT) $(MODULE_ROOT)/video; \
+-	PATH="$(PATH):/bin:/sbin" depmod -ae;
++	#@mkdir -p $(MODULE_ROOT)/video; \
++	#install -m 0664 -o root -g root $(MODULE_OBJECT) $(MODULE_ROOT)/video; \
++	#PATH="$(PATH):/bin:/sbin" depmod -ae;
+ 
+ #
+ # This target builds, then installs, then creates device nodes and inserts
+@@ -321,8 +321,8 @@
+ #
+ 
+ package-install: module-install rmmod-sanity-check
+-	PATH="$(PATH):/bin:/sbin" modprobe $(MODULE_NAME) && \
+-	echo "$(MODULE_OBJECT) installed successfully.";
++	#PATH="$(PATH):/bin:/sbin" modprobe $(MODULE_NAME) && \
++	#echo "$(MODULE_OBJECT) installed successfully.";
+ 
+ #
+ # Build an object file suitable for further processing by the installer and

    

r1248 - crux-2.2/ports/opt/nvidia

crux＠crux.nu

tags

participants (1)