From 85fc37441c7c3031055486ae1507b752787834a1 Mon Sep 17 00:00:00 2001 From: orchidman Date: Mon, 6 Aug 2012 12:22:01 +0200 Subject: nvidia-utils 304.32-1 (cherry picked from commit 51a7d4f28576aa30d9afd346d8c8bbc3ec75ba47) Conflicts: nvidia-utils/.footprint.i686 nvidia-utils/.footprint.x86_64 nvidia-utils/.md5sum.i686 nvidia-utils/.md5sum.x86_64 nvidia-utils/Pkgfile --- nvidia-utils/.footprint.i686 | 28 ++++++++++---------- nvidia-utils/.footprint.i686~ | 58 ++++++++++++++++++++++++++++++++++++++++++ nvidia-utils/.footprint.x86_64 | 28 ++++++++++---------- nvidia-utils/.md5sum.i686 | 2 +- nvidia-utils/.md5sum.x86_64 | 2 +- nvidia-utils/Pkgfile | 4 +-- 6 files changed, 90 insertions(+), 32 deletions(-) create mode 100644 nvidia-utils/.footprint.i686~ diff --git a/nvidia-utils/.footprint.i686 b/nvidia-utils/.footprint.i686 index 9d5479e11..97ce8c698 100644 --- a/nvidia-utils/.footprint.i686 +++ b/nvidia-utils/.footprint.i686 @@ -12,24 +12,24 @@ 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.304.30 --rwxr-xr-x root/root usr/lib/X11/modules/extensions/libglx.so.304.30 --rwxr-xr-x root/root usr/lib/X11/modules/libnvidia-wfb.so.304.30 --rwxr-xr-x root/root usr/lib/libGL.so.304.30 +lrwxrwxrwx root/root usr/lib/X11/modules/extensions/libglx.so -> libglx.so.304.32 +-rwxr-xr-x root/root usr/lib/X11/modules/extensions/libglx.so.304.32 +-rwxr-xr-x root/root usr/lib/X11/modules/libnvidia-wfb.so.304.32 +-rwxr-xr-x root/root usr/lib/libGL.so.304.32 -rwxr-xr-x root/root usr/lib/libOpenCL.so.1.0.0 -rw-r--r-- root/root usr/lib/libXvMCNVIDIA.a --rwxr-xr-x root/root usr/lib/libXvMCNVIDIA.so.304.30 --rwxr-xr-x root/root usr/lib/libcuda.so.304.30 --rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.304.30 --rwxr-xr-x root/root usr/lib/libnvidia-compiler.so.304.30 --rwxr-xr-x root/root usr/lib/libnvidia-glcore.so.304.30 --rwxr-xr-x root/root usr/lib/libnvidia-tls.so.304.30 --rwxr-xr-x root/root usr/lib/libvdpau.so.304.30 +-rwxr-xr-x root/root usr/lib/libXvMCNVIDIA.so.304.32 +-rwxr-xr-x root/root usr/lib/libcuda.so.304.32 +-rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.304.32 +-rwxr-xr-x root/root usr/lib/libnvidia-compiler.so.304.32 +-rwxr-xr-x root/root usr/lib/libnvidia-glcore.so.304.32 +-rwxr-xr-x root/root usr/lib/libnvidia-tls.so.304.32 +-rwxr-xr-x root/root usr/lib/libvdpau.so.304.32 drwxr-xr-x root/root usr/lib/tls/ --rwxr-xr-x root/root usr/lib/tls/libnvidia-tls.so.304.30 +-rwxr-xr-x root/root usr/lib/tls/libnvidia-tls.so.304.32 drwxr-xr-x root/root usr/lib/vdpau/ --rwxr-xr-x root/root usr/lib/vdpau/libvdpau_nvidia.so.304.30 --rwxr-xr-x root/root usr/lib/vdpau/libvdpau_trace.so.304.30 +-rwxr-xr-x root/root usr/lib/vdpau/libvdpau_nvidia.so.304.32 +-rwxr-xr-x root/root usr/lib/vdpau/libvdpau_trace.so.304.32 drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man1/ diff --git a/nvidia-utils/.footprint.i686~ b/nvidia-utils/.footprint.i686~ new file mode 100644 index 000000000..7a9afb4cb --- /dev/null +++ b/nvidia-utils/.footprint.i686~ @@ -0,0 +1,58 @@ +drwxr-xr-x root/root etc/ +drwxr-xr-x root/root etc/X11/ +drwxr-xr-x root/root etc/X11/xorg.conf.d/ +-rw-r--r-- root/root etc/X11/xorg.conf.d/30-nvidia.conf +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/lib/ +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/ +<<<<<<< HEAD +lrwxrwxrwx root/root usr/lib/X11/modules/extensions/libglx.so -> libglx.so.304.30 +-rwxr-xr-x root/root usr/lib/X11/modules/extensions/libglx.so.304.30 +-rwxr-xr-x root/root usr/lib/X11/modules/libnvidia-wfb.so.304.30 +-rwxr-xr-x root/root usr/lib/libGL.so.304.30 +-rwxr-xr-x root/root usr/lib/libOpenCL.so.1.0.0 +-rw-r--r-- root/root usr/lib/libXvMCNVIDIA.a +-rwxr-xr-x root/root usr/lib/libXvMCNVIDIA.so.304.30 +-rwxr-xr-x root/root usr/lib/libcuda.so.304.30 +-rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.304.30 +-rwxr-xr-x root/root usr/lib/libnvidia-compiler.so.304.30 +-rwxr-xr-x root/root usr/lib/libnvidia-glcore.so.304.30 +-rwxr-xr-x root/root usr/lib/libnvidia-tls.so.304.30 +-rwxr-xr-x root/root usr/lib/libvdpau.so.304.30 +drwxr-xr-x root/root usr/lib/tls/ +-rwxr-xr-x root/root usr/lib/tls/libnvidia-tls.so.304.30 +drwxr-xr-x root/root usr/lib/vdpau/ +-rwxr-xr-x root/root usr/lib/vdpau/libvdpau_nvidia.so.304.30 +-rwxr-xr-x root/root usr/lib/vdpau/libvdpau_trace.so.304.30 +======= +lrwxrwxrwx root/root usr/lib/X11/modules/extensions/libglx.so -> libglx.so.304.32 +-rwxr-xr-x root/root usr/lib/X11/modules/extensions/libglx.so.304.32 +-rwxr-xr-x root/root usr/lib/X11/modules/libnvidia-wfb.so.304.32 +-rwxr-xr-x root/root usr/lib/libGL.so.304.32 +-rwxr-xr-x root/root usr/lib/libOpenCL.so.1.0.0 +-rw-r--r-- root/root usr/lib/libXvMCNVIDIA.a +-rwxr-xr-x root/root usr/lib/libXvMCNVIDIA.so.304.32 +-rwxr-xr-x root/root usr/lib/libcuda.so.304.32 +-rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.304.32 +-rwxr-xr-x root/root usr/lib/libnvidia-compiler.so.304.32 +-rwxr-xr-x root/root usr/lib/libnvidia-glcore.so.304.32 +-rwxr-xr-x root/root usr/lib/libnvidia-tls.so.304.32 +-rwxr-xr-x root/root usr/lib/libvdpau.so.304.32 +drwxr-xr-x root/root usr/lib/tls/ +-rwxr-xr-x root/root usr/lib/tls/libnvidia-tls.so.304.32 +drwxr-xr-x root/root usr/lib/vdpau/ +-rwxr-xr-x root/root usr/lib/vdpau/libvdpau_nvidia.so.304.32 +-rwxr-xr-x root/root usr/lib/vdpau/libvdpau_trace.so.304.32 +>>>>>>> 51a7d4f... nvidia-utils 304.32-1 +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man1/ +-rw-r--r-- root/root usr/share/man/man1/nvidia-settings.1.gz +-rw-r--r-- root/root usr/share/man/man1/nvidia-xconfig.1.gz diff --git a/nvidia-utils/.footprint.x86_64 b/nvidia-utils/.footprint.x86_64 index 9d5479e11..97ce8c698 100644 --- a/nvidia-utils/.footprint.x86_64 +++ b/nvidia-utils/.footprint.x86_64 @@ -12,24 +12,24 @@ 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.304.30 --rwxr-xr-x root/root usr/lib/X11/modules/extensions/libglx.so.304.30 --rwxr-xr-x root/root usr/lib/X11/modules/libnvidia-wfb.so.304.30 --rwxr-xr-x root/root usr/lib/libGL.so.304.30 +lrwxrwxrwx root/root usr/lib/X11/modules/extensions/libglx.so -> libglx.so.304.32 +-rwxr-xr-x root/root usr/lib/X11/modules/extensions/libglx.so.304.32 +-rwxr-xr-x root/root usr/lib/X11/modules/libnvidia-wfb.so.304.32 +-rwxr-xr-x root/root usr/lib/libGL.so.304.32 -rwxr-xr-x root/root usr/lib/libOpenCL.so.1.0.0 -rw-r--r-- root/root usr/lib/libXvMCNVIDIA.a --rwxr-xr-x root/root usr/lib/libXvMCNVIDIA.so.304.30 --rwxr-xr-x root/root usr/lib/libcuda.so.304.30 --rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.304.30 --rwxr-xr-x root/root usr/lib/libnvidia-compiler.so.304.30 --rwxr-xr-x root/root usr/lib/libnvidia-glcore.so.304.30 --rwxr-xr-x root/root usr/lib/libnvidia-tls.so.304.30 --rwxr-xr-x root/root usr/lib/libvdpau.so.304.30 +-rwxr-xr-x root/root usr/lib/libXvMCNVIDIA.so.304.32 +-rwxr-xr-x root/root usr/lib/libcuda.so.304.32 +-rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.304.32 +-rwxr-xr-x root/root usr/lib/libnvidia-compiler.so.304.32 +-rwxr-xr-x root/root usr/lib/libnvidia-glcore.so.304.32 +-rwxr-xr-x root/root usr/lib/libnvidia-tls.so.304.32 +-rwxr-xr-x root/root usr/lib/libvdpau.so.304.32 drwxr-xr-x root/root usr/lib/tls/ --rwxr-xr-x root/root usr/lib/tls/libnvidia-tls.so.304.30 +-rwxr-xr-x root/root usr/lib/tls/libnvidia-tls.so.304.32 drwxr-xr-x root/root usr/lib/vdpau/ --rwxr-xr-x root/root usr/lib/vdpau/libvdpau_nvidia.so.304.30 --rwxr-xr-x root/root usr/lib/vdpau/libvdpau_trace.so.304.30 +-rwxr-xr-x root/root usr/lib/vdpau/libvdpau_nvidia.so.304.32 +-rwxr-xr-x root/root usr/lib/vdpau/libvdpau_trace.so.304.32 drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man1/ diff --git a/nvidia-utils/.md5sum.i686 b/nvidia-utils/.md5sum.i686 index 796238e37..a0d489ada 100644 --- a/nvidia-utils/.md5sum.i686 +++ b/nvidia-utils/.md5sum.i686 @@ -1 +1 @@ -2fb7a7e00404145a842d32b691ea94b6 NVIDIA-Linux-x86-304.30.run +e917f4b0f8deb28496bb16a035294c46 NVIDIA-Linux-x86-304.32.run diff --git a/nvidia-utils/.md5sum.x86_64 b/nvidia-utils/.md5sum.x86_64 index 796238e37..36b219ae7 100644 --- a/nvidia-utils/.md5sum.x86_64 +++ b/nvidia-utils/.md5sum.x86_64 @@ -1 +1 @@ -2fb7a7e00404145a842d32b691ea94b6 NVIDIA-Linux-x86-304.30.run +207faf7a195e336370ec916782d47850 NVIDIA-Linux-x86_64-304.32.run diff --git a/nvidia-utils/Pkgfile b/nvidia-utils/Pkgfile index 3e346e81c..bce5019c4 100755 --- a/nvidia-utils/Pkgfile +++ b/nvidia-utils/Pkgfile @@ -4,11 +4,11 @@ # Packager: thierryn1 at hispeed dot ch name=nvidia-utils -version=304.30 +version=304.32 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.run) +source=(http://download.nvidia.com/XFree86/Linux-${_ARCH}/$version/NVIDIA-Linux-${_ARCH}-$version.run) build() { sh NVIDIA-Linux-${_ARCH}-$version.run --extract-only -- cgit v1.2.3-54-g00ecf