summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortyrry <tyrry33 at gmail dot com>2010-02-18 12:29:41 +0100
committertyrry <tyrry33 at gmail dot com>2010-02-18 12:29:41 +0100
commitb41d0b0ee60a26aceb7f2be7dd36b0ee03e4a5d1 (patch)
treeb8e651e40faf3a3f467dda5b761f1aa138386ebe
parent1f7fa3967cf195a3b34a41c696903e00932e23eb (diff)
parent63471beabaab2793b0c887a936dcf740f5154a6a (diff)
downloadnutyx-extra-b41d0b0ee60a26aceb7f2be7dd36b0ee03e4a5d1.tar.gz
nutyx-extra-b41d0b0ee60a26aceb7f2be7dd36b0ee03e4a5d1.tar.bz2
nutyx-extra-b41d0b0ee60a26aceb7f2be7dd36b0ee03e4a5d1.tar.xz
nutyx-extra-b41d0b0ee60a26aceb7f2be7dd36b0ee03e4a5d1.zip
Merge remote branch 'nutyx-2009/master'
Diffstat
-rw-r--r--base/virtualbox-module/.md5sum2
-rwxr-xr-xbase/virtualbox-module/Pkgfile15
-rw-r--r--extra/nvidia-96xx/.footprint20
-rw-r--r--extra/nvidia-96xx/.md5sum2
-rw-r--r--extra/nvidia-96xx/Pkgfile8
-rw-r--r--extra/virtualbox-bin/.footprint2
-rw-r--r--extra/virtualbox-bin/.md5sum2
-rwxr-xr-xextra/virtualbox-bin/Pkgfile4
8 files changed, 28 insertions, 27 deletions
diff --git a/base/virtualbox-module/.md5sum b/base/virtualbox-module/.md5sum
index 12c8cb3f0..8917e3c52 100644
--- a/base/virtualbox-module/.md5sum
+++ b/base/virtualbox-module/.md5sum
@@ -1 +1 @@
-4178a0f5aa924c5202632e576d1c14c1 VirtualBox-3.1.2-56127-Linux_x86.run
+4cd92d79644ef6f4c41cb53de77f0458 VirtualBox-3.1.4-57640-Linux_x86.run
diff --git a/base/virtualbox-module/Pkgfile b/base/virtualbox-module/Pkgfile
index 9726fba0e..8fa17e6b1 100755
--- a/base/virtualbox-module/Pkgfile
+++ b/base/virtualbox-module/Pkgfile
@@ -2,14 +2,13 @@
# URL: http://www.virtualbox.org
# Maintainer: NutyX core team
# Packager: thierryn1 at hispeed dot ch
-# Depends on:
name=virtualbox-module
-version=3.1.2
-release=8
+version=3.1.4
+release=1
_name=VirtualBox
-_kernel=`uname -r`
-_build=56127
+_kernel=`uname -r|sed "s/-NuTyX//"`
+_build=57640
source=(http://download.virtualbox.org/virtualbox/$version/${_name}-${version}-${_build}-Linux_x86.run)
@@ -18,11 +17,11 @@ build() {
sh "VirtualBox-${version}-${_build}-Linux_x86.run" --target "$SRC" --keep --noexec
tar xfj VirtualBox.tar.bz2
- mkdir -p $PKG/lib/modules/${_kernel}/kernel/drivers/misc/
+ mkdir -p $PKG/lib/modules/`uname -r`/kernel/drivers/misc/
cd src
make
install -D -m 0644 vboxdrv.ko \
- $PKG/lib/modules/${_kernel}/kernel/drivers/misc/vboxdrv.ko
+ $PKG/lib/modules/`uname -r`/kernel/drivers/misc/vboxdrv.ko
install -D -m 0644 vboxnetflt.ko \
- $PKG/lib/modules/${_kernel}/kernel/drivers/misc/vboxnetflt.ko
+ $PKG/lib/modules/`uname -r`/kernel/drivers/misc/vboxnetflt.ko
}
diff --git a/extra/nvidia-96xx/.footprint b/extra/nvidia-96xx/.footprint
index 4ec0659b4..ee775f16f 100644
--- a/extra/nvidia-96xx/.footprint
+++ b/extra/nvidia-96xx/.footprint
@@ -10,22 +10,22 @@ drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/nvidia-bug-report.sh
-rwxr-xr-x root/root usr/bin/nvidia-settings
drwxr-xr-x root/root usr/lib/
-lrwxrwxrwx root/root usr/lib/libGL.so -> /usr/lib/libGL.so.96.43.14
-lrwxrwxrwx root/root usr/lib/libGL.so.1 -> /usr/lib/libGL.so.96.43.14
--rwxr-xr-x root/root usr/lib/libGL.so.96.43.14
-lrwxrwxrwx root/root usr/lib/libGLcore.so.1 -> /usr/lib/libGLcore.so.96.43.14
--rwxr-xr-x root/root usr/lib/libGLcore.so.96.43.14
+lrwxrwxrwx root/root usr/lib/libGL.so -> /usr/lib/libGL.so.96.43.16
+lrwxrwxrwx root/root usr/lib/libGL.so.1 -> /usr/lib/libGL.so.96.43.16
+-rwxr-xr-x root/root usr/lib/libGL.so.96.43.16
+lrwxrwxrwx root/root usr/lib/libGLcore.so.1 -> /usr/lib/libGLcore.so.96.43.16
+-rwxr-xr-x root/root usr/lib/libGLcore.so.96.43.16
-rwxr-xr-x root/root usr/lib/libXvMCNVIDIA.a
--rwxr-xr-x root/root usr/lib/libXvMCNVIDIA.so.96.43.14
-lrwxrwxrwx root/root usr/lib/libnvidia-tls.so.1 -> /usr/lib/libnvidia-tls.so.96.43.14
--rwxr-xr-x root/root usr/lib/libnvidia-tls.so.96.43.14
+-rwxr-xr-x root/root usr/lib/libXvMCNVIDIA.so.96.43.16
+lrwxrwxrwx root/root usr/lib/libnvidia-tls.so.1 -> /usr/lib/libnvidia-tls.so.96.43.16
+-rwxr-xr-x root/root usr/lib/libnvidia-tls.so.96.43.16
drwxr-xr-x root/root usr/lib/xorg/
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/libglx.so -> /usr/lib/xorg/modules/extensions/libglx.so.96.43.14
--rwxr-xr-x root/root usr/lib/xorg/modules/extensions/libglx.so.96.43.14
+lrwxrwxrwx root/root usr/lib/xorg/modules/extensions/libglx.so -> /usr/lib/xorg/modules/extensions/libglx.so.96.43.16
+-rwxr-xr-x root/root usr/lib/xorg/modules/extensions/libglx.so.96.43.16
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/applications/
-rw-r--r-- root/root usr/share/applications/nvidia-settings.desktop
diff --git a/extra/nvidia-96xx/.md5sum b/extra/nvidia-96xx/.md5sum
index 84c4920c1..f10ca69d7 100644
--- a/extra/nvidia-96xx/.md5sum
+++ b/extra/nvidia-96xx/.md5sum
@@ -1 +1 @@
-ffb6a220fb04ee4430bd2c46865da332 NVIDIA-Linux-x86-96.43.14-pkg1.run
+1dc343ca57fa0f0cfd33c867a4c12f0b NVIDIA-Linux-x86-96.43.16-pkg1.run
diff --git a/extra/nvidia-96xx/Pkgfile b/extra/nvidia-96xx/Pkgfile
index ea5b896f4..4915605b0 100644
--- a/extra/nvidia-96xx/Pkgfile
+++ b/extra/nvidia-96xx/Pkgfile
@@ -5,19 +5,19 @@
# Depends on:
name=nvidia-96xx
-version=96.43.14
+version=96.43.16
release=1
-kernel=`uname -r`
+kernel=`uname -r|sed "s/-NuTyX//"`
source=(http://us.download.nvidia.com/XFree86/Linux-x86/$version/NVIDIA-Linux-x86-$version-pkg1.run\
)
build() {
- mkdir -p $PKG/lib/modules/$kernel/kernel/drivers/video
+ mkdir -p $PKG/lib/modules/`uname -r`/kernel/drivers/video
sh NVIDIA-Linux-x86-$version-pkg1.run --extract-only
cd NVIDIA-Linux-x86-$version-pkg1/usr/src/nv
ln -s Makefile.kbuild Makefile
make SYSSRC=/usr/src/linux-$kernel module
- install -m644 nvidia.ko $PKG/lib/modules/$kernel/kernel/drivers/video
+ install -m644 nvidia.ko $PKG/lib/modules/`uname -r`/kernel/drivers/video
cd ../../
mkdir -p $PKG/usr/{lib,lib/xorg/modules/{extensions,drivers},bin,share/applications,share/pixmaps}
mkdir -p $PKG/usr/share/{man/man1,doc,licences/nvidia-71xx/}
diff --git a/extra/virtualbox-bin/.footprint b/extra/virtualbox-bin/.footprint
index 513660196..a37f0b312 100644
--- a/extra/virtualbox-bin/.footprint
+++ b/extra/virtualbox-bin/.footprint
@@ -83,6 +83,7 @@ lrwxrwxrwx root/root opt/VirtualBox/components/VBoxXPCOM.so -> ../VBoxXPCOM.so
drwxr-xr-x root/root opt/VirtualBox/nls/
-rw-r--r-- root/root opt/VirtualBox/nls/VirtualBox_bg.qm
-rw-r--r-- root/root opt/VirtualBox/nls/VirtualBox_ca.qm
+-rw-r--r-- root/root opt/VirtualBox/nls/VirtualBox_ca_VA.qm
-rw-r--r-- root/root opt/VirtualBox/nls/VirtualBox_cs.qm
-rw-r--r-- root/root opt/VirtualBox/nls/VirtualBox_da.qm
-rw-r--r-- root/root opt/VirtualBox/nls/VirtualBox_de.qm
@@ -112,6 +113,7 @@ drwxr-xr-x root/root opt/VirtualBox/nls/
-rw-r--r-- root/root opt/VirtualBox/nls/VirtualBox_zh_TW.qm
-rw-r--r-- root/root opt/VirtualBox/nls/qt_bg.qm
-rw-r--r-- root/root opt/VirtualBox/nls/qt_ca.qm
+-rw-r--r-- root/root opt/VirtualBox/nls/qt_ca_VA.qm
-rw-r--r-- root/root opt/VirtualBox/nls/qt_cs.qm
-rw-r--r-- root/root opt/VirtualBox/nls/qt_da.qm
-rw-r--r-- root/root opt/VirtualBox/nls/qt_de.qm
diff --git a/extra/virtualbox-bin/.md5sum b/extra/virtualbox-bin/.md5sum
index 12c8cb3f0..8917e3c52 100644
--- a/extra/virtualbox-bin/.md5sum
+++ b/extra/virtualbox-bin/.md5sum
@@ -1 +1 @@
-4178a0f5aa924c5202632e576d1c14c1 VirtualBox-3.1.2-56127-Linux_x86.run
+4cd92d79644ef6f4c41cb53de77f0458 VirtualBox-3.1.4-57640-Linux_x86.run
diff --git a/extra/virtualbox-bin/Pkgfile b/extra/virtualbox-bin/Pkgfile
index 39d359ac2..647f477a4 100755
--- a/extra/virtualbox-bin/Pkgfile
+++ b/extra/virtualbox-bin/Pkgfile
@@ -5,9 +5,9 @@
# Depends on: virtualbox-module, sdl
name=virtualbox-bin
-version=3.1.2
+version=3.1.4
release=1
-_release=56127
+_release=57640
source=(http://download.virtualbox.org/virtualbox/$version/VirtualBox-${version}-${_release}-Linux_x86.run)
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-27 05:46:20 +0000