diff --git a/nvidia/.footprint b/nvidia/.footprint index bc254e904..aed53a898 100644 --- a/nvidia/.footprint +++ b/nvidia/.footprint @@ -6,16 +6,6 @@ drwxr-xr-x root/root lib/modules//kernel/drivers/ drwxr-xr-x root/root lib/modules//kernel/drivers/video/ -rw-r--r-- root/root lib/modules//kernel/drivers/video/nvidia.ko drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/X11R6/ -drwxr-xr-x root/root usr/X11R6/lib/ --r--r--r-- root/root usr/X11R6/lib/libXvMCNVIDIA.a --rwxr-xr-x root/root usr/X11R6/lib/libXvMCNVIDIA.so.1.0.9746 -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.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.9746 --rwxr-xr-x root/root usr/X11R6/lib/modules/libnvidia-wfb.so.1.0.9746 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 @@ -28,12 +18,25 @@ drwxr-xr-x root/root usr/include/nvidia/GL/ -r--r--r-- root/root usr/include/nvidia/GL/glxext.h drwxr-xr-x root/root usr/lib/ -rwxr-xr-x root/root usr/lib/libGL.la --rwxr-xr-x root/root usr/lib/libGL.so.1.0.9746 --rwxr-xr-x root/root usr/lib/libGLcore.so.1.0.9746 --rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.1.0.9746 --rwxr-xr-x root/root usr/lib/libnvidia-tls.so.1.0.9746 +-rwxr-xr-x root/root usr/lib/libGL.so.1.0.9755 +-rwxr-xr-x root/root usr/lib/libGLcore.so.1.0.9755 +-rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.1.0.9755 +-rwxr-xr-x root/root usr/lib/libnvidia-tls.so.1.0.9755 drwxr-xr-x root/root usr/lib/tls/ --rwxr-xr-x root/root usr/lib/tls/libnvidia-tls.so.1.0.9746 +-rwxr-xr-x root/root usr/lib/tls/libnvidia-tls.so.1.0.9755 +drwxr-xr-x root/root usr/lib/xorg/ +drwxr-xr-x root/root usr/lib/xorg/lib/ +-r--r--r-- root/root usr/lib/xorg/lib/libXvMCNVIDIA.a +-rwxr-xr-x root/root usr/lib/xorg/lib/libXvMCNVIDIA.so.1.0.9755 +drwxr-xr-x root/root usr/lib/xorg/lib/modules/ +drwxr-xr-x root/root usr/lib/xorg/lib/modules/drivers/ +-rwxr-xr-x root/root usr/lib/xorg/lib/modules/drivers/nvidia_drv.so +drwxr-xr-x root/root usr/lib/xorg/lib/modules/extensions/ +-rwxr-xr-x root/root usr/lib/xorg/lib/modules/extensions/libglx.so.1.0.9755 +-rwxr-xr-x root/root usr/lib/xorg/lib/modules/libnvidia-wfb.so.1.0.9755 +drwxr-xr-x root/root usr/lib/xorg/modules/ +drwxr-xr-x root/root usr/lib/xorg/modules/drivers/ +drwxr-xr-x root/root usr/lib/xorg/modules/extensions/ 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 diff --git a/nvidia/.md5sum b/nvidia/.md5sum index e90a0ff19..4e71a3839 100644 --- a/nvidia/.md5sum +++ b/nvidia/.md5sum @@ -1,2 +1,2 @@ -575f988468f2c34a302da3d21e282689 NVIDIA-Linux-x86-1.0-9746-pkg0.run +991e03ceaff94fa8113ac04a541ec576 NVIDIA-Linux-x86-1.0-9755-pkg0.run 544ac021f572c0aca5025dcca9d01510 nvidia-makefile.patch diff --git a/nvidia/Pkgfile b/nvidia/Pkgfile index 707a14594..c4bba894f 100644 --- a/nvidia/Pkgfile +++ b/nvidia/Pkgfile @@ -1,10 +1,10 @@ # Description: nVIDIA Linux Display Driver # URL: http://www.nvidia.com/ # Maintainer: Matt Housh, jaeger at morpheus dot net -# Depends on: x11, gl-select +# Depends on: xorg, gl-select name=nvidia -version=1.0-9746 +version=1.0-9755 release=1 source=(http://download.nvidia.com/XFree86/Linux-x86/$version/NVIDIA-Linux-x86-$version-pkg0.run \ $name-makefile.patch) @@ -18,12 +18,12 @@ build() { # create directories the Makefile expects mkdir -p $PKG/usr/lib \ - $PKG/usr/X11R6/lib/modules/drivers \ - $PKG/usr/X11R6/lib/modules/extensions \ + $PKG/usr/lib/xorg/modules/drivers \ + $PKG/usr/lib/xorg/modules/extensions \ $PKG/usr/bin $PKG/usr/man/man1 # install libraries - cp -a usr/X11R6/lib $PKG/usr/X11R6/ + 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