summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry N <thierryn1 at hispeed dot ch>2009-09-20 17:01:53 +0200
committerThierry N <thierryn1 at hispeed dot ch>2009-09-20 17:01:53 +0200
commit5dd8791dbf2287af11076ad65022ce61dc722588 (patch)
tree1cdbd1d88bb9e4c8df93d112565adef3b3332ccc
parent34c04ca5c2e81f74cb33bd0151178e90b97ac3ed (diff)
downloadnutyx-pakxe-5dd8791dbf2287af11076ad65022ce61dc722588.tar.gz
nutyx-pakxe-5dd8791dbf2287af11076ad65022ce61dc722588.tar.bz2
nutyx-pakxe-5dd8791dbf2287af11076ad65022ce61dc722588.tar.xz
nutyx-pakxe-5dd8791dbf2287af11076ad65022ce61dc722588.zip
nvidia, suppression des utilitaires et rajout du lien merci fredjo
-rw-r--r--extra/nvidia/.footprint5
-rwxr-xr-xextra/nvidia/Pkgfile16
2 files changed, 7 insertions, 14 deletions
diff --git a/extra/nvidia/.footprint b/extra/nvidia/.footprint
index 78be9e3f9..4694fcb72 100644
--- a/extra/nvidia/.footprint
+++ b/extra/nvidia/.footprint
@@ -5,8 +5,6 @@ drwxr-xr-x root/root lib/modules/<kernel-version>/extra/
-rw-r--r-- root/root lib/modules/<kernel-version>/extra/nvidia.ko
drwxr-xr-x root/root usr/
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
drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/nvidia/
drwxr-xr-x root/root usr/include/nvidia/GL/
@@ -35,9 +33,8 @@ 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/libGLcore.so -> /usr/lib/libGLcore.so
+lrwxrwxrwx root/root usr/lib/xorg/modules/extensions/libglx.so -> /usr/lib/xorg/modules/extensions/libglx.so.185.18.36
-rwxr-xr-x root/root usr/lib/xorg/modules/extensions/libglx.so.185.18.36
-rwxr-xr-x root/root usr/lib/xorg/modules/libnvidia-wfb.so.185.18.36
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
--rw-r--r-- root/root usr/man/man1/nvidia-xconfig.1.gz
diff --git a/extra/nvidia/Pkgfile b/extra/nvidia/Pkgfile
index a1a991ee0..badf33ccb 100755
--- a/extra/nvidia/Pkgfile
+++ b/extra/nvidia/Pkgfile
@@ -6,7 +6,7 @@
name=nvidia
version=185.18.36
-release=1
+release=2
[ "`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\
@@ -29,21 +29,17 @@ build() {
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/
-
- # 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/
+# 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/
# build the module
cd usr/src/nv