Merge commit 'lesibel/master'

10 files changed, 53 insertions, 47 deletions

diff --git a/base/libpng/.footprint b/base/libpng/.footprint
index 1f676e45e..65e583738 100644
--- a/base/libpng/.footprint
+++ b/base/libpng/.footprint
@@ -1,25 +1,27 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
-lrwxrwxrwx	root/root	usr/bin/libpng-config -> libpng14-config
--rwxr-xr-x	root/root	usr/bin/libpng14-config
+lrwxrwxrwx	root/root	usr/bin/libpng-config -> libpng12-config
+-rwxr-xr-x	root/root	usr/bin/libpng12-config
 drwxr-xr-x	root/root	usr/include/
-drwxr-xr-x	root/root	usr/include/libpng14/
--rw-r--r--	root/root	usr/include/libpng14/png.h
--rw-r--r--	root/root	usr/include/libpng14/pngconf.h
-lrwxrwxrwx	root/root	usr/include/png.h -> libpng14/png.h
-lrwxrwxrwx	root/root	usr/include/pngconf.h -> libpng14/pngconf.h
+drwxr-xr-x	root/root	usr/include/libpng12/
+-rw-r--r--	root/root	usr/include/libpng12/png.h
+-rw-r--r--	root/root	usr/include/libpng12/pngconf.h
+lrwxrwxrwx	root/root	usr/include/png.h -> libpng12/png.h
+lrwxrwxrwx	root/root	usr/include/pngconf.h -> libpng12/pngconf.h
 drwxr-xr-x	root/root	usr/lib/
-lrwxrwxrwx	root/root	usr/lib/libpng.a -> libpng14.a
-lrwxrwxrwx	root/root	usr/lib/libpng.la -> libpng14.la
-lrwxrwxrwx	root/root	usr/lib/libpng.so -> libpng14.so
--rw-r--r--	root/root	usr/lib/libpng14.a
--rwxr-xr-x	root/root	usr/lib/libpng14.la
-lrwxrwxrwx	root/root	usr/lib/libpng14.so -> libpng14.so.14.1.0
-lrwxrwxrwx	root/root	usr/lib/libpng14.so.14 -> libpng14.so.14.1.0
--rwxr-xr-x	root/root	usr/lib/libpng14.so.14.1.0
+lrwxrwxrwx	root/root	usr/lib/libpng.a -> libpng12.a
+lrwxrwxrwx	root/root	usr/lib/libpng.la -> libpng12.la
+lrwxrwxrwx	root/root	usr/lib/libpng.so -> libpng12.so
+lrwxrwxrwx	root/root	usr/lib/libpng.so.3 -> libpng.so.3.39.0
+-rwxr-xr-x	root/root	usr/lib/libpng.so.3.39.0
+-rw-r--r--	root/root	usr/lib/libpng12.a
+-rwxr-xr-x	root/root	usr/lib/libpng12.la
+lrwxrwxrwx	root/root	usr/lib/libpng12.so -> libpng12.so.0.39.0
+lrwxrwxrwx	root/root	usr/lib/libpng12.so.0 -> libpng12.so.0.39.0
+-rwxr-xr-x	root/root	usr/lib/libpng12.so.0.39.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
-lrwxrwxrwx	root/root	usr/lib/pkgconfig/libpng.pc -> libpng14.pc
--rw-r--r--	root/root	usr/lib/pkgconfig/libpng14.pc
+lrwxrwxrwx	root/root	usr/lib/pkgconfig/libpng.pc -> libpng12.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/libpng12.pc
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man3/
diff --git a/base/libpng/.md5sum b/base/libpng/.md5sum
index 8bfd4b7d8..e5a02bda2 100644
--- a/base/libpng/.md5sum
+++ b/base/libpng/.md5sum
@@ -1 +1,2 @@
-e1767bf290ded9fda9ee05bd23ae4cff  libpng-1.4.1.tar.bz2
+bc93c1cd8625811d1311d2957b947e7b  libpng-1.2.39-apng-1.patch
+4d48ecff6fc7ab12e97b07d0f65ec2f0  libpng-1.2.39.tar.bz2
diff --git a/base/libpng/Pkgfile b/base/libpng/Pkgfile
index 36d533ca7..715e0bf57 100755
--- a/base/libpng/Pkgfile
+++ b/base/libpng/Pkgfile
@@ -1,18 +1,18 @@
-# Description: Librairie de fonctions de support PNG
+# t/kernel-pae/.footprintescription: Librairie de fonctions de support PNG
 # URL: http://www.libpng.org/pub/png/libpng.html
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
 
 name=libpng
-version=1.4.1
+version=1.2.39
 release=1
-source=( http://downloads.sourceforge.net/$name/$name-$version.tar.bz2 )
-#	http://kiao.no-ip.info/NuTyX/files/libpng-$version-apng-1.patch)
+source=( http://downloads.sourceforge.net/$name/$name-$version.tar.bz2 \
+	http://kiao.no-ip.info/NuTyX/files/libpng-$version-apng-1.patch)
 
 
 build() {
 	cd $name-$version
-#	patch -Np1 -i ../libpng-$version-apng-1.patch
+	patch -Np1 -i ../libpng-$version-apng-1.patch
 	./configure --prefix=/usr \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
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 \
diff --git a/xorg/xorg-xf86-video-intel/Pkgfile b/xorg/xorg-xf86-video-intel/Pkgfile
index 9472ba865..29a1f228a 100644
--- a/xorg/xorg-xf86-video-intel/Pkgfile
+++ b/xorg/xorg-xf86-video-intel/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: xorg-server
 
 name=xorg-xf86-video-intel
-version=2.9.1
+version=2.10.0
 release=1
 source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-$version.tar.bz2)