Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe

9 files changed, 28 insertions, 29 deletions

diff --git a/base/kernel-34/Pkgfile b/base/kernel-34/Pkgfile
index 764a8683c..e85c06e03 100644
--- a/base/kernel-34/Pkgfile
+++ b/base/kernel-34/Pkgfile
@@ -5,7 +5,7 @@
 name=kernel-34
 version=2.6.34.10
 _BaseVersion=2.6.34
-release=4
+release=5
 PKGMK_NO_STRIP="yes"
 PKGMK_IGNORE_FOOTPRINT="yes"
 PKGMK_IGNORE_MD5SUM="yes"
@@ -13,10 +13,10 @@ SCRIPT_VERSION="pakxe.1"
 INITRDBASE="nutyx-initrd"
 _extra=30052011
 _tools=03072011
-NVIDIA_VERSION=280.13
+NVIDIA_VERSION=285.05.09
 VB_VERSION=4.1.4
 VB_BUILD=74291
-ATI_VERSION=11.6
+ATI_VERSION=11.9
 [ "`uname -m`" == "i686"   ] && _ARCH=x86
 [ "`uname -m`" == "x86_64"   ] && _ARCH=x86_64
 [ "`uname -m`" == "i686"   ] && VB_ARCH=x86
diff --git a/base/kernel-35/Pkgfile b/base/kernel-35/Pkgfile
index 9d7d05ad3..32bb28ab5 100644
--- a/base/kernel-35/Pkgfile
+++ b/base/kernel-35/Pkgfile
@@ -6,7 +6,7 @@
 name=kernel-35
 version=2.6.35.14
 _BaseVersion=2.6.35
-release=3
+release=4
 PKGMK_NO_STRIP="yes"
 PKGMK_IGNORE_FOOTPRINT="yes"
 PKGMK_IGNORE_MD5SUM="yes"
@@ -14,10 +14,10 @@ SCRIPT_VERSION="pakxe.1"
 INITRDBASE="nutyx-initrd"
 _extra=30052011
 _tools=03072011
-NVIDIA_VERSION=280.13
+NVIDIA_VERSION=285.05.09
 VB_VERSION=4.1.4
 VB_BUILD=74291
-ATI_VERSION=11.7
+ATI_VERSION=11.9
 [ "`uname -m`" == "i686"   ] && _ARCH=x86
 [ "`uname -m`" == "x86_64"   ] && _ARCH=x86_64
 [ "`uname -m`" == "i686"   ] && VB_ARCH=x86
diff --git a/base/kernel/Pkgfile b/base/kernel/Pkgfile
index eee1e24e5..7ec445646 100644
--- a/base/kernel/Pkgfile
+++ b/base/kernel/Pkgfile
@@ -6,7 +6,7 @@
 name=kernel
 version=2.6.39.4
 _BaseVersion=2.6.39
-release=2
+release=3
 PKGMK_NO_STRIP="yes"
 PKGMK_IGNORE_FOOTPRINT="yes"
 PKGMK_IGNORE_MD5SUM="yes"
@@ -14,10 +14,10 @@ SCRIPT_VERSION="pakxe.1"
 INITRDBASE="nutyx-initrd"
 _extra=30052011
 _tools=03072011
-NVIDIA_VERSION=280.13
+NVIDIA_VERSION=285.05.09
 VB_VERSION=4.1.4
 VB_BUILD=74291
-ATI_VERSION=11.7
+ATI_VERSION=11.9
 
 [ "`uname -m`" == "i686"   ] && _ARCH=x86
 [ "`uname -m`" == "x86_64"   ] && _ARCH=x86_64
diff --git a/extra/ati-utils/.footprint.x86_64 b/extra/ati-utils/.footprint.x86_64
index 7f77bf1ba..778e9b8a6 100644
--- a/extra/ati-utils/.footprint.x86_64
+++ b/extra/ati-utils/.footprint.x86_64
@@ -79,7 +79,6 @@ drwxr-xr-x	root/root	usr/share/ati/
 drwxr-xr-x	root/root	usr/share/ati/amdcccle/
 drwxr-xr-x	root/root	usr/share/licenses/
 drwxr-xr-x	root/root	usr/share/licenses/ati-utils/
--rw-r--r--	root/root	usr/share/licenses/ati-utils/ATI_LICENSE.TXT
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man8/
 -rw-r--r--	root/root	usr/share/man/man8/atieventsd.8.gz
diff --git a/extra/ati-utils/.md5sum.x86_64 b/extra/ati-utils/.md5sum.x86_64
index 5aa5fa9f2..bf0423840 100644
--- a/extra/ati-utils/.md5sum.x86_64
+++ b/extra/ati-utils/.md5sum.x86_64
@@ -1 +1 @@
-acebb812d4c057766828df0bf572e8ae  ati-driver-installer-11-7-x86.x86_64.run
+2c6af8691b4d68709d0e0e04b96d0a3e  ati-driver-installer-11-9-x86.x86_64.run
diff --git a/extra/ati-utils/Pkgfile b/extra/ati-utils/Pkgfile
index 164ec922b..f2cbee152 100755
--- a/extra/ati-utils/Pkgfile
+++ b/extra/ati-utils/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: 
 
 name=ati-utils
-version=11.7
+version=11.9
 release=1
 [ "`uname -m`" == "i686"   ] && _ARCH=x86
 [ "`uname -m`" == "x86_64"   ] && _ARCH=x86_64
@@ -89,7 +89,7 @@ build() {
 	chmod 755 $PKG/etc/ati/authatieventsd.sh
 #	install -m755 $SRC/atieventsd.sh $PKG/etc/rc.d/init.d/atieventsd
 
-	install -m644 $SRC/ati/ATI_LICENSE.TXT $PKG/usr/share/licenses/$name/
+#	install -m644 $SRC/ati/ATI_LICENSE.TXT $PKG/usr/share/licenses/$name/
 	mkdir -p $PKG/etc/X11/xorg.conf.d
 	cat > $PKG/etc/X11/xorg.conf.d/30-ati.conf << "EOF"
 Section "ServerLayout"
diff --git a/extra/nvidia-utils/.footprint.x86_64 b/extra/nvidia-utils/.footprint.x86_64
index b1a8e7d21..d934e7131 100644
--- a/extra/nvidia-utils/.footprint.x86_64
+++ b/extra/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.280.13
--rwxr-xr-x	root/root	usr/lib/X11/modules/extensions/libglx.so.280.13
--rwxr-xr-x	root/root	usr/lib/X11/modules/libnvidia-wfb.so.280.13
--rwxr-xr-x	root/root	usr/lib/libGL.so.280.13
+lrwxrwxrwx	root/root	usr/lib/X11/modules/extensions/libglx.so -> libglx.so.285.05.09
+-rwxr-xr-x	root/root	usr/lib/X11/modules/extensions/libglx.so.285.05.09
+-rwxr-xr-x	root/root	usr/lib/X11/modules/libnvidia-wfb.so.285.05.09
+-rwxr-xr-x	root/root	usr/lib/libGL.so.285.05.09
 -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.280.13
--rwxr-xr-x	root/root	usr/lib/libcuda.so.280.13
--rwxr-xr-x	root/root	usr/lib/libnvidia-cfg.so.280.13
--rwxr-xr-x	root/root	usr/lib/libnvidia-compiler.so.280.13
--rwxr-xr-x	root/root	usr/lib/libnvidia-glcore.so.280.13
--rwxr-xr-x	root/root	usr/lib/libnvidia-tls.so.280.13
--rwxr-xr-x	root/root	usr/lib/libvdpau.so.280.13
+-rwxr-xr-x	root/root	usr/lib/libXvMCNVIDIA.so.285.05.09
+-rwxr-xr-x	root/root	usr/lib/libcuda.so.285.05.09
+-rwxr-xr-x	root/root	usr/lib/libnvidia-cfg.so.285.05.09
+-rwxr-xr-x	root/root	usr/lib/libnvidia-compiler.so.285.05.09
+-rwxr-xr-x	root/root	usr/lib/libnvidia-glcore.so.285.05.09
+-rwxr-xr-x	root/root	usr/lib/libnvidia-tls.so.285.05.09
+-rwxr-xr-x	root/root	usr/lib/libvdpau.so.285.05.09
 drwxr-xr-x	root/root	usr/lib/tls/
--rwxr-xr-x	root/root	usr/lib/tls/libnvidia-tls.so.280.13
+-rwxr-xr-x	root/root	usr/lib/tls/libnvidia-tls.so.285.05.09
 drwxr-xr-x	root/root	usr/lib/vdpau/
--rwxr-xr-x	root/root	usr/lib/vdpau/libvdpau_nvidia.so.280.13
--rwxr-xr-x	root/root	usr/lib/vdpau/libvdpau_trace.so.280.13
+-rwxr-xr-x	root/root	usr/lib/vdpau/libvdpau_nvidia.so.285.05.09
+-rwxr-xr-x	root/root	usr/lib/vdpau/libvdpau_trace.so.285.05.09
 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/extra/nvidia-utils/.md5sum.x86_64 b/extra/nvidia-utils/.md5sum.x86_64
index 2cc750048..23d15568b 100644
--- a/extra/nvidia-utils/.md5sum.x86_64
+++ b/extra/nvidia-utils/.md5sum.x86_64
@@ -1 +1 @@
-8f0e8d88a824f0bed27faa56a939a4f6  NVIDIA-Linux-x86_64-280.13.run
+4d645c795817284296bfcc644b0c9fd2  NVIDIA-Linux-x86_64-285.05.09.run
diff --git a/extra/nvidia-utils/Pkgfile b/extra/nvidia-utils/Pkgfile
index 91cbcf3e5..255719f4c 100755
--- a/extra/nvidia-utils/Pkgfile
+++ b/extra/nvidia-utils/Pkgfile
@@ -4,7 +4,7 @@
 # Packager: thierryn1 at hispeed dot ch
 
 name=nvidia-utils
-version=280.13
+version=285.05.09
 release=1
 [ "`uname -m`" == "i686"   ] && _ARCH=x86
 [ "`uname -m`" == "x86_64"   ] && _ARCH=x86_64