Merge commit 'lesibel/master'

6 files changed, 26 insertions, 23 deletions

diff --git a/extra/libnotify/.footprint b/extra/libnotify/.footprint
index 1e6676625..ae90c59af 100644
--- a/extra/libnotify/.footprint
+++ b/extra/libnotify/.footprint
@@ -8,8 +8,8 @@ drwxr-xr-x	root/root	usr/include/libnotify/
 -rw-r--r--	root/root	usr/include/libnotify/notify.h
 drwxr-xr-x	root/root	usr/lib/
 -rwxr-xr-x	root/root	usr/lib/libnotify.la
-lrwxrwxrwx	root/root	usr/lib/libnotify.so -> libnotify.so.1.1.2
-lrwxrwxrwx	root/root	usr/lib/libnotify.so.1 -> libnotify.so.1.1.2
--rwxr-xr-x	root/root	usr/lib/libnotify.so.1.1.2
+lrwxrwxrwx	root/root	usr/lib/libnotify.so -> libnotify.so.1.1.3
+lrwxrwxrwx	root/root	usr/lib/libnotify.so.1 -> libnotify.so.1.1.3
+-rwxr-xr-x	root/root	usr/lib/libnotify.so.1.1.3
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libnotify.pc
diff --git a/extra/libnotify/.md5sum b/extra/libnotify/.md5sum
index 353d355ef..aa6c0bed5 100644
--- a/extra/libnotify/.md5sum
+++ b/extra/libnotify/.md5sum
@@ -1 +1 @@
-ba76f68b7e3bd284ac2c2a1b9c5ecb06  libnotify-0.4.4.tar.gz
+472e2c1f808848365572a9b024d9e8f5  libnotify-0.4.5.tar.gz
diff --git a/extra/libnotify/Pkgfile b/extra/libnotify/Pkgfile
index c95f6b1a4..70ce81868 100644
--- a/extra/libnotify/Pkgfile
+++ b/extra/libnotify/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: gtk, dbus
 
 name=libnotify
-version=0.4.4
+version=0.4.5
 release=1
 source=(http://www.galago-project.org/files/releases/source/$name/$name-$version.tar.gz)
 
diff --git a/extra/nvidia/.footprint b/extra/nvidia/.footprint
index 9f015c3e0..d9c396cd7 100644
--- a/extra/nvidia/.footprint
+++ b/extra/nvidia/.footprint
@@ -16,28 +16,30 @@ 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.190.53
-lrwxrwxrwx	root/root	usr/lib/libGLcore.so -> libGLcore.so.190.53
--rwxr-xr-x	root/root	usr/lib/libGLcore.so.190.53
--rwxr-xr-x	root/root	usr/lib/libcuda.so.190.53
--rwxr-xr-x	root/root	usr/lib/libnvidia-cfg.so.190.53
--rwxr-xr-x	root/root	usr/lib/libnvidia-tls.so.190.53
--rwxr-xr-x	root/root	usr/lib/libvdpau.so.190.53
+-rwxr-xr-x	root/root	usr/lib/libGL.so.195.36.08
+lrwxrwxrwx	root/root	usr/lib/libGLcore.so -> libGLcore.so.195.36.08
+-rwxr-xr-x	root/root	usr/lib/libGLcore.so.195.36.08
+-rwxr-xr-x	root/root	usr/lib/libOpenCL.so.1.0.0
+-rwxr-xr-x	root/root	usr/lib/libcuda.so.195.36.08
+-rwxr-xr-x	root/root	usr/lib/libnvidia-cfg.so.195.36.08
+-rwxr-xr-x	root/root	usr/lib/libnvidia-compiler.so.195.36.08
+-rwxr-xr-x	root/root	usr/lib/libnvidia-tls.so.195.36.08
+-rwxr-xr-x	root/root	usr/lib/libvdpau.so.195.36.08
 drwxr-xr-x	root/root	usr/lib/tls/
--rwxr-xr-x	root/root	usr/lib/tls/libnvidia-tls.so.190.53
+-rwxr-xr-x	root/root	usr/lib/tls/libnvidia-tls.so.195.36.08
 drwxr-xr-x	root/root	usr/lib/vdpau/
--rwxr-xr-x	root/root	usr/lib/vdpau/libvdpau_nvidia.so.190.53
--rwxr-xr-x	root/root	usr/lib/vdpau/libvdpau_trace.so.190.53
+-rwxr-xr-x	root/root	usr/lib/vdpau/libvdpau_nvidia.so.195.36.08
+-rwxr-xr-x	root/root	usr/lib/vdpau/libvdpau_trace.so.195.36.08
 drwxr-xr-x	root/root	usr/lib/xorg/
 -r--r--r--	root/root	usr/lib/xorg/libXvMCNVIDIA.a
--rwxr-xr-x	root/root	usr/lib/xorg/libXvMCNVIDIA.so.190.53
+-rwxr-xr-x	root/root	usr/lib/xorg/libXvMCNVIDIA.so.195.36.08
 drwxr-xr-x	root/root	usr/lib/xorg/modules/
 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.190.53
--rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libglx.so.190.53
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libnvidia-wfb.so.190.53
+lrwxrwxrwx	root/root	usr/lib/xorg/modules/extensions/libglx.so -> /usr/lib/xorg/modules/extensions/libglx.so.195.36.08
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libglx.so.195.36.08
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/libnvidia-wfb.so.195.36.08
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man1/
diff --git a/extra/nvidia/.md5sum b/extra/nvidia/.md5sum
index fc0df5692..c4e04306e 100644
--- a/extra/nvidia/.md5sum
+++ b/extra/nvidia/.md5sum
@@ -1,2 +1,2 @@
-2e80419f6f9ac16beecd839874d0c5ab  NVIDIA-Linux-x86-190.53-pkg0.run
+7b78eed78b5f345af6dd1b2a83f5d44b  NVIDIA-Linux-x86-195.36.08-pkg0.run
 8921f37eaad3576532f0023d291b9e51  nvidia-makefile.patch
diff --git a/extra/nvidia/Pkgfile b/extra/nvidia/Pkgfile
index c1695e2c7..3ef40fa15 100755
--- a/extra/nvidia/Pkgfile
+++ b/extra/nvidia/Pkgfile
@@ -5,8 +5,9 @@
 # Depends on: xorg-server
 
 name=nvidia
-version=190.53
-release=9
+#version=190.53
+version=195.36.08
+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\
@@ -16,7 +17,7 @@ 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
+#	patch -p0 -i $SRC/$name-makefile.patch usr/src/nv/Makefile.kbuild
 
 
 	mkdir -p $PKG/usr/lib \