[Frugalware-git] gnometesting: nvidia-361.42-2-x86_64 - fix build
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=a12132ea127ae2ad0a6b4aa6ad572ba6c04cff69
commit a12132ea127ae2ad0a6b4aa6ad572ba6c04cff69
Author: Baste
Date: Fri Apr 1 14:23:50 2016 +0200
nvidia-361.42-2-x86_64
- fix build
diff --git a/source/x11-extra/nvidia/FrugalBuild
b/source/x11-extra/nvidia/FrugalBuild
index be77071..815dbe3 100644
--- a/source/x11-extra/nvidia/FrugalBuild
+++ b/source/x11-extra/nvidia/FrugalBuild
@@ -3,7 +3,7 @@
pkgname=nvidia
pkgver=361.42
-pkgrel=1
+pkgrel=2
archs=('i686' 'x86_64')
_F_kernelmod_scriptlet=nvidia.install
Finclude kernel-module
@@ -51,7 +51,9 @@ build () {
Fexec make SYSSRC=$_F_kernelmod_dir/build module || Fdie
Ffilerel nvidia.ko $_F_kernelmod_dir/kernel/drivers/video/nvidia.ko
Ffilerel nvidia-modeset.ko
$_F_kernelmod_dir/kernel/drivers/video/nvidia-modeset.ko
- Ffilerel nvidia-uvm.ko
$_F_kernelmod_dir/kernel/drivers/video/nvidia-uvm.ko
+ if [[ "$CARCH" = "x86_64" ]]; then
+ Ffilerel nvidia-uvm.ko
$_F_kernelmod_dir/kernel/drivers/video/nvidia-uvm.ko
+ fi
Fbuild_kernelmod_scriptlet
cd $Fsrcdir/${_F_nvidia_name} || Fdie
@@ -65,7 +67,7 @@ build () {
# GLX extension module for X
Fmkdir /usr/lib/xorg/modules/extensions/
Fexerel /usr/lib/xorg/modules/extensions/libglx.so.$pkgver
- # Fln libglx.so -> libglx.so.361.28 ?
+ Fln libglx.so.$pkgver /usr/lib/xorg/modules/extensions/libglx.so
Fexerel /usr/lib/libGLX_nvidia.so.$pkgver
Fln libGLX_nvidia.so.$pkgver /usr/lib/libGLX_indirect.so.0
@@ -74,8 +76,9 @@ build () {
Ffilerel gl.h /usr/include/GL/
Fmkdir /usr/lib/
Ffilerel /usr/lib/libGL.la
- Fexerel /usr/lib/libGL.so.1.0.0
- Fln libGL.so.1.0.0 /usr/lib/libGL.so
+ Fexerel /usr/lib/libGL.so.$pkgver
+ Fln libGL.so.$pkgver /usr/lib/libGL.so.1
+ Fln libGL.so.1 /usr/lib/libGL.so
# OpenGL core library
Fexerel /usr/lib/libnvidia-glcore.so.$pkgver
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] gnometesting: nvidia-361.42-1-x86_64 - 361.28 -> 361.42 - try to fix build :D
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=d7f3f268799de977f74c9432fb0c5adb0cfde947
commit d7f3f268799de977f74c9432fb0c5adb0cfde947
Author: Baste
Date: Fri Apr 1 13:32:26 2016 +0200
nvidia-361.42-1-x86_64
- 361.28 -> 361.42
- try to fix build :D
diff --git a/source/x11-extra/nvidia/FrugalBuild
b/source/x11-extra/nvidia/FrugalBuild
index e42eadd..be77071 100644
--- a/source/x11-extra/nvidia/FrugalBuild
+++ b/source/x11-extra/nvidia/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: Michel Hermier
pkgname=nvidia
-pkgver=361.28
-pkgrel=5
+pkgver=361.42
+pkgrel=1
archs=('i686' 'x86_64')
_F_kernelmod_scriptlet=nvidia.install
Finclude kernel-module
@@ -21,11 +21,11 @@ case "$CARCH" in
i686)
_F_nvidia_name="NVIDIA-Linux-x86-${pkgver}"
source=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/${_F_nvidia_name}.run";)
- sha1sums=('aa7057262cf34d53c87e2caf231301d5a499b13b');;
+ sha1sums=('52050af6827a60f75c48c9303acea73563eb57de');;
x86_64)
_F_nvidia_name="NVIDIA-Linux-${CARCH}-${pkgver}-no-compat32"
source=("http://us.download.nvidia.com/XFree86/Linux-${CARCH}/${pkgver}/${_F_nvidia_name}.run";)
- sha1sums=('7603e8accef2fddb9d87fd1ab15511fd62f6547d');;
+ sha1sums=('98d68431af11e4ed1b7cf4b383dd567ec61afef5');;
esac
source=("${source[@]}" \
@@ -50,6 +50,8 @@ build () {
Fexec cd $Fsrcdir/${_F_nvidia_name}/kernel || Fdie
Fexec make SYSSRC=$_F_kernelmod_dir/build module || Fdie
Ffilerel nvidia.ko $_F_kernelmod_dir/kernel/drivers/video/nvidia.ko
+ Ffilerel nvidia-modeset.ko
$_F_kernelmod_dir/kernel/drivers/video/nvidia-modeset.ko
+ Ffilerel nvidia-uvm.ko
$_F_kernelmod_dir/kernel/drivers/video/nvidia-uvm.ko
Fbuild_kernelmod_scriptlet
cd $Fsrcdir/${_F_nvidia_name} || Fdie
@@ -63,6 +65,9 @@ build () {
# GLX extension module for X
Fmkdir /usr/lib/xorg/modules/extensions/
Fexerel /usr/lib/xorg/modules/extensions/libglx.so.$pkgver
+ # Fln libglx.so -> libglx.so.361.28 ?
+ Fexerel /usr/lib/libGLX_nvidia.so.$pkgver
+ Fln libGLX_nvidia.so.$pkgver /usr/lib/libGLX_indirect.so.0
# OpenGL library
Fmkdir /usr/include/GL/
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] gnometesting: nvidia-173xx-173.14.31-10-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=c6194f479f775c8c7b94ccdcb2824c90e19018f7
commit c6194f479f775c8c7b94ccdcb2824c90e19018f7
Author: Miklos Vajna
Date: Wed Jan 25 01:30:32 2012 +0100
nvidia-173xx-173.14.31-10-i686
rebuilt with kernel-3.1-10
diff --git a/source/x11-extra/nvidia-173xx/FrugalBuild
b/source/x11-extra/nvidia-173xx/FrugalBuild
index 6d0881e..64137fd 100644
--- a/source/x11-extra/nvidia-173xx/FrugalBuild
+++ b/source/x11-extra/nvidia-173xx/FrugalBuild
@@ -3,7 +3,7 @@
pkgname=nvidia-173xx
pkgver=173.14.31
-pkgrel=9
+pkgrel=10
archs=('i686' 'x86_64' '!ppc')
_F_nvidia_legacyver="173.14.xx"
Finclude nvidia
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] gnometesting: nvidia-290.10-9-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=de89cc831fe9b575a3fe14896af8e711c0e0e07a
commit de89cc831fe9b575a3fe14896af8e711c0e0e07a
Author: Miklos Vajna
Date: Wed Jan 25 01:30:32 2012 +0100
nvidia-290.10-9-i686
rebuilt with kernel-3.1-10
diff --git a/source/x11-extra/nvidia/FrugalBuild
b/source/x11-extra/nvidia/FrugalBuild
index 05f7686..9807dae 100644
--- a/source/x11-extra/nvidia/FrugalBuild
+++ b/source/x11-extra/nvidia/FrugalBuild
@@ -3,7 +3,7 @@
pkgname=nvidia
pkgver=290.10
-pkgrel=8
+pkgrel=9
archs=('i686' 'x86_64' '!ppc')
_F_kernelmod_scriptlet=nvidia.install
Finclude kernel-module
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] gnometesting: nvidia-settings-260.19.29-2-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=2e14c586266aa778c301322961b1f482b975c6ad
commit 2e14c586266aa778c301322961b1f482b975c6ad
Author: bouleetbil
Date: Tue Jan 25 14:13:32 2011 +0100
nvidia-settings-260.19.29-2-x86_64
- rebuild with libxml2 2.7.8
diff --git a/source/x11-extra/nvidia-settings/FrugalBuild
b/source/x11-extra/nvidia-settings/FrugalBuild
index 77f8292..5b9e40c 100644
--- a/source/x11-extra/nvidia-settings/FrugalBuild
+++ b/source/x11-extra/nvidia-settings/FrugalBuild
@@ -3,11 +3,11 @@
pkgname=nvidia-settings
pkgver=260.19.29
-pkgrel=1
+pkgrel=2
pkgdesc="nVidia settings configuration tool."
url="ftp://download.nvidia.com/XFree86/$pkgname/";
up2date="Flasttar $url"
-depends=('gtk+2>=2.20.0-2' 'libxv')
+depends=('libxml2>=2.7.8' 'gtk+2>=2.20.0-2' 'libxv')
makedepends=('pkgconfig')
groups=('x11-extra')
archs=('i686' 'x86_64' '!ppc')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] gnometesting: nvidia-195.36.15-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=591acdc97082349d5fbaaed915e98c7dfb05293b
commit 591acdc97082349d5fbaaed915e98c7dfb05293b
Author: Michel Hermier
Date: Sun Mar 21 19:37:54 2010 +0100
nvidia-195.36.15-1-i686
* Bump version.
diff --git a/source/x11-extra/nvidia/FrugalBuild
b/source/x11-extra/nvidia/FrugalBuild
index 51e4aed..ebf4b69 100644
--- a/source/x11-extra/nvidia/FrugalBuild
+++ b/source/x11-extra/nvidia/FrugalBuild
@@ -2,13 +2,11 @@
# Maintainer: Michel Hermier
pkgname=nvidia
-pkgver=190.53
-pkgrel=3
+pkgver=195.36.15
+pkgrel=1
archs=('i686' 'x86_64' '!ppc')
Finclude nvidia
case "$_F_nvidia_arch" in
-x86)sha1sums=('ca0e88c2e0b0bb83cf53d859d1d2abcf9e402920');;
-x86_64) sha1sums=('a80402aaaccae2d9ea5a974d837885e0d717ef11');;
+x86)sha1sums=('bb5850553a98dd7c074418d230fa36ad3c440cd5');;
+x86_64) sha1sums=('ba7d3da7e18a1f82131b67d0419c8809af8dd55f');;
esac
-source=($source kernel-2.6.33.patch)
-sha1sums=("${sha1su...@]}" '431f890c94a4ff03bc839c1e8d4c30e78313f0ba')
diff --git a/source/x11-extra/nvidia/kernel-2.6.33.patch
b/source/x11-extra/nvidia/kernel-2.6.33.patch
deleted file mode 100644
index 7952e2e..000
--- a/source/x11-extra/nvidia/kernel-2.6.33.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: usr/src/nv/conftest.sh
-===
usr/src/nv/conftest.sh
-+++ usr/src/nv/conftest.sh 2009-12-20 04:15:47.194130196 +0200
-@@ -111,7 +111,12 @@
- fi
- }
-
--CONFTEST_PREAMBLE="#include
-+CONFTEST_PREAMBLE="#include
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include
-+#else
-+#include
-+#endif
- #if defined(CONFIG_XEN) && \
- defined(CONFIG_XEN_INTERFACE_VERSION) &&
!defined(__XEN_INTERFACE_VERSION__)
- #define __XEN_INTERFACE_VERSION__ CONFIG_XEN_INTERFACE_VERSION
-Index: usr/src/nv/nvacpi.c
-===
usr/src/nv/nvacpi.c
-+++ usr/src/nv/nvacpi.c2009-12-20 03:48:28.497758783 +0200
-@@ -49,6 +49,10 @@
- };
- #endif
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)
-+#define acpi_walk_namespace(a,b,c,d,e,f) acpi_walk_namespace(a,b,c,d,e,f,NULL)
-+#endif
-+
- static struct acpi_driver *nv_acpi_driver;
- static acpi_handle nvif_handle = NULL;
- static acpi_handle dsm_handle = NULL;
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] gnometesting: nvidia.*
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=47414cc9e86a202d3abab88599b819c8d7c9e313
commit 47414cc9e86a202d3abab88599b819c8d7c9e313
Author: Michel Hermier
Date: Thu Mar 25 08:37:43 2010 +0100
nvidia.*
* Make nvidia.* genscriptlet complient.
* Fix various packages errors (rebuild will follow after some real
testing).
diff --git a/source/include/nvidia.install b/source/include/nvidia.install
index c8f8f78..e7b25ed 100644
--- a/source/include/nvidia.install
+++ b/source/include/nvidia.install
@@ -55,13 +55,13 @@ post_install() {
if [ "$exist" -eq 0 ]; then
echo nvidia >> /etc/sysconfig/modules
fi
- /sbin/depmod -ea $_F_kernelmod_uname
+ /sbin/depmod -ea @_F_kernelmod_uname@
module_load
}
post_upgrade() {
- echo -n "Runing depmod for nvidia kernel module for kernel
$_F_kernelmod_uname ..."
- /sbin/depmod -ea $_F_kernelmod_uname
+ echo -n "Runing depmod for nvidia kernel module for kernel
@_F_kernelmod_uname@ ..."
+ /sbin/depmod -ea @_F_kernelmod_uname@
echo " done."
## if that exisit we bumped / upgraded the package only no new kernel
## on a new kernel we do nothing because one has to reboot anyway
@@ -95,7 +95,7 @@ pre_remove() {
}
post_remove() {
- /sbin/depmod -a $_F_kernelmod_uname
+ /sbin/depmod -a @_F_kernelmod_uname@
echo "*** Nvidia driver is removed now. To have a working Xorg Server again run
: ***"
echo "*** pacman-g2 -S libgl libgl-headers libglx "
}
diff --git a/source/include/nvidia.sh b/source/include/nvidia.sh
index 9407943..8a66e95 100644
--- a/source/include/nvidia.sh
+++ b/source/include/nvidia.sh
@@ -52,8 +52,11 @@ fi
if [ -z "$_F_nvidia_linkver" ]; then
_F_nvidia_linkver=$pkgver
fi
+if [ -z "$_F_nvidia_opencl_linkver" ]; then
+ _F_nvidia_opencl_linkver=1.0.0
+fi
if [ -z "$_F_nvidia_install" ]; then
- _F_nvidia_install="nvidia.install"
+ _F_nvidia_install="$Fincdir/nvidia.install"
fi
if [ -z "$_F_nvidia_up2date" ]; then
if [ -z "$_F_nvidia_legacyver" ]; then
@@ -118,10 +121,11 @@ Finclude kernel-module
Fbuild_nvidia_scriptlet()
{
- cp $Fincdir/nvidia.install ${Fsrcdir%/src}
- Fsed '$pkgname' "$pkgname" ${Fsrcdir%/src}/$_F_kernelmod_scriptlet
- Fsed '$pkgver' "$pkgver" ${Fsrcdir%/src}/$_F_kernelmod_scriptlet
Fbuild_kernelmod_scriptlet
+
+ # Compatibility code remove after 1.3
+ Fsed '$pkgname' "$pkgname" "${Fsrcdir}/$(basename
"$_F_kernelmod_scriptlet")"
+ Fsed '$pkgver' "$pkgver" "${Fsrcdir}/$(basename
"$_F_kernelmod_scriptlet")"
}
Fbuild_nvidia() {
@@ -143,14 +147,6 @@ Fbuild_nvidia() {
# Install the binaries
Fexerel usr/bin/nvidia-* /usr/bin/
- # Install the includes
- Fmkdir usr/include/GL/
- Ffilerel usr/include/GL/* /usr/include/GL/
- if [ -d usr/include/cuda ]; then
- Fmkdir usr/include/cuda
- Ffilerel usr/include/cuda/* /usr/include/cuda/
- fi
-
# Install the xorg modules
Fmkdir usr/lib/xorg/modules/drivers
Fexerel usr/X11R6/lib/modules/drivers/*.so* /usr/lib/xorg/modules/drivers/
@@ -165,37 +161,69 @@ Fbuild_nvidia() {
# fi
# Install the libraries
- Fexerel usr/lib/*.so* /usr/lib/
+ Fmkdir /usr/include/GL/
+ Ffilerel usr/include/GL/* /usr/include/GL/
Fexerel usr/lib/libGL.la /usr/lib/libGL.la
- Fexerel usr/X11R6/lib/*.so* /usr/lib/
Fsed "__LIBGL_PATH__" "/usr/lib" $Fdestdir/usr/lib/libGL.la
+ Fexerel "usr/lib/libGL.so.$_F_nvidia_linkver" /usr/lib/
Fln "libGL.so.$_F_nvidia_linkver" "/usr/lib/libGL.so"
Fln "libGL.so.$_F_nvidia_linkver" "/usr/lib/libGL.so.1"
Fln "libGL.so.$_F_nvidia_linkver" "/usr/lib/libGL.so.1.2"
+
+ Fexerel "usr/lib/libGLcore.so.$_F_nvidia_linkver" /usr/lib/
Fln "libGLcore.so.$_F_nvidia_linkver" "/usr/lib/libGLcore.so"
Fln "libGLcore.so.$_F_nvidia_linkver" "/usr/lib/libGLcore.so.1"
+
+ Fexerel "usr/lib/libnvidia-tls.so.$_F_nvidia_linkver" /usr/lib/
Fln "libnvidia-tls.so.$_F_nvidia_linkver" "/usr/lib/libnvidia-tls.so"
Fln "libnvidia-tls.so.$_F_nvidia_linkver" "/usr/lib/libnvidia-tls.so.1"
+
+ Ffilerel "usr/X11R6/lib/libXvMCNVIDIA.a" /usr/lib/
+ Fexerel "usr/X11R6/lib/libXvMCNVIDIA.so.$_F_nvidia_linkver" /usr/lib/
Fln "libXvMCNVIDIA.so.$_F_nvidia_linkver" "/usr/lib/libXvMCNVIDIA.so"
Fln "libXvMCNVIDIA.so.$_F_nvidia_linkver" "/usr/lib/libXvMCNVIDIA.so.1"
Fln "libXvMCNVIDIA.so.$_F_nvidia_linkver" "/usr/lib/libXvMCNVIDIA_dynamic.so"
Fln "libXvMCNVIDIA.so.$_F_nvidia_linkver" "/usr/lib/libXvMCNVIDIA_dynamic.so.1"
+
+ if [ -e "usr/lib/libOpenCL.so.$_F_nvidia_opencl_linkver" ]; then
+ Fmkdir /etc/OpenCL/vendors/
+ Ffilerel etc/OpenCL/vendors/nvidia.icd /etc/OpenCL/vendors/
+ Fmkdir /usr/include/CL/
+ Ffilerel usr/include/CL/* /usr/include/CL/
+ Fexerel "usr/lib/libOpenCL.so.$_F_nvidia_opencl_linkver"
/usr/lib/
+ Fln "libOpenCL.so.$_F_nvidia_opencl_linkver"
"/usr/lib/libOpenCL.so"
+ Fln "l
[Frugalware-git] gnometesting: nvidia-emul-195.36.15_1-1-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=5c24074d3b24384db3aa20f7a583e4b475216d9f
commit 5c24074d3b24384db3aa20f7a583e4b475216d9f
Author: bouleetbil
Date: Mon Mar 22 23:30:57 2010 +0100
nvidia-emul-195.36.15_1-1-x86_64
version bump
diff --git a/source/emul-extra/nvidia-emul/FrugalBuild
b/source/emul-extra/nvidia-emul/FrugalBuild
index e1be1e2..d3c01fe 100644
--- a/source/emul-extra/nvidia-emul/FrugalBuild
+++ b/source/emul-extra/nvidia-emul/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Christian Hamar alias krix
pkgname=nvidia-emul
-pkgver=190.53_2
+pkgver=195.36.15_1
pkgrel=1
pkgdesc="3d accelerated display driver for Nvidia cards (32bit emul)"
url="http://www.nvidia.com";
@@ -12,4 +12,4 @@ provides=('libgl-emul' 'libglx-emul')
groups=('emul-extra')
archs=('!i686' 'x86_64')
Finclude emul
-sha1sums=('9432e773b4e1e09bdf6bf5eba9782f44c54cb3f2')
+sha1sums=('ac6c4c9cd16254d6e68ae0df29af7bf893096ce6')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] gnometesting: nvidia-71xx-71.86.13-2-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=05b44378130f34babc1ef0290e1384174430510d
commit 05b44378130f34babc1ef0290e1384174430510d
Author: Miklos Vajna
Date: Sun Mar 14 13:06:45 2010 +0100
nvidia-71xx-71.86.13-2-i686
- rebuilt with kernel-2.6.33
diff --git a/source/x11-extra/nvidia-71xx/FrugalBuild
b/source/x11-extra/nvidia-71xx/FrugalBuild
index 04caa31..98ed0ff 100644
--- a/source/x11-extra/nvidia-71xx/FrugalBuild
+++ b/source/x11-extra/nvidia-71xx/FrugalBuild
@@ -3,7 +3,7 @@
pkgname=nvidia-71xx
pkgver=71.86.13
-pkgrel=1
+pkgrel=2
archs=('i686' 'x86_64' '!ppc')
_F_nvidia_legacyver="71.86.xx"
Finclude nvidia
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] gnometesting: nvidia-96xx-96.43.16-2-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=ff423711d0b82000500161c37bce19a6cfd0ac0f
commit ff423711d0b82000500161c37bce19a6cfd0ac0f
Author: Miklos Vajna
Date: Sun Mar 14 13:02:32 2010 +0100
nvidia-96xx-96.43.16-2-i686
- rebuild with 2.6.33
diff --git a/source/x11-extra/nvidia-96xx/FrugalBuild
b/source/x11-extra/nvidia-96xx/FrugalBuild
index d690037..ac8b41a 100644
--- a/source/x11-extra/nvidia-96xx/FrugalBuild
+++ b/source/x11-extra/nvidia-96xx/FrugalBuild
@@ -3,7 +3,7 @@
pkgname=nvidia-96xx
pkgver=96.43.16
-pkgrel=1
+pkgrel=2
archs=('i686' 'x86_64' '!ppc')
_F_nvidia_legacyver="96.43.xx"
Finclude nvidia
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] gnometesting: nvidia-173xx-173.14.25-2-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=6d319df041281d0ffbab35dff556a1fff564be08
commit 6d319df041281d0ffbab35dff556a1fff564be08
Author: Miklos Vajna
Date: Sun Mar 14 12:56:52 2010 +0100
nvidia-173xx-173.14.25-2-i686
- rebuild with kernel-2.6.33
diff --git a/source/x11-extra/nvidia-173xx/FrugalBuild
b/source/x11-extra/nvidia-173xx/FrugalBuild
index 1bb83fe..cc8aa3b 100644
--- a/source/x11-extra/nvidia-173xx/FrugalBuild
+++ b/source/x11-extra/nvidia-173xx/FrugalBuild
@@ -3,7 +3,7 @@
pkgname=nvidia-173xx
pkgver=173.14.25
-pkgrel=1
+pkgrel=2
archs=('i686' 'x86_64' '!ppc')
_F_nvidia_legacyver="173.14.xx"
Finclude nvidia
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] gnometesting: nvidia-190.53-3-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=20f58092c824f5bde9f7448fee5cf1276ac2bb55
commit 20f58092c824f5bde9f7448fee5cf1276ac2bb55
Author: Miklos Vajna
Date: Sun Mar 14 12:48:02 2010 +0100
nvidia-190.53-3-i686
- add kernel-2.6.33.patch
diff --git a/source/x11-extra/nvidia/FrugalBuild
b/source/x11-extra/nvidia/FrugalBuild
index 26ee03f..51e4aed 100644
--- a/source/x11-extra/nvidia/FrugalBuild
+++ b/source/x11-extra/nvidia/FrugalBuild
@@ -3,10 +3,12 @@
pkgname=nvidia
pkgver=190.53
-pkgrel=2
+pkgrel=3
archs=('i686' 'x86_64' '!ppc')
Finclude nvidia
case "$_F_nvidia_arch" in
x86)sha1sums=('ca0e88c2e0b0bb83cf53d859d1d2abcf9e402920');;
x86_64) sha1sums=('a80402aaaccae2d9ea5a974d837885e0d717ef11');;
esac
+source=($source kernel-2.6.33.patch)
+sha1sums=("${sha1su...@]}" '431f890c94a4ff03bc839c1e8d4c30e78313f0ba')
diff --git a/source/x11-extra/nvidia/kernel-2.6.33.patch
b/source/x11-extra/nvidia/kernel-2.6.33.patch
new file mode 100644
index 000..7952e2e
--- /dev/null
+++ b/source/x11-extra/nvidia/kernel-2.6.33.patch
@@ -0,0 +1,33 @@
+Index: usr/src/nv/conftest.sh
+===
+--- usr/src/nv/conftest.sh
usr/src/nv/conftest.sh 2009-12-20 04:15:47.194130196 +0200
+@@ -111,7 +111,12 @@
+ fi
+ }
+
+-CONFTEST_PREAMBLE="#include
++CONFTEST_PREAMBLE="#include
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
++#include
++#else
++#include
++#endif
+ #if defined(CONFIG_XEN) && \
+ defined(CONFIG_XEN_INTERFACE_VERSION) &&
!defined(__XEN_INTERFACE_VERSION__)
+ #define __XEN_INTERFACE_VERSION__ CONFIG_XEN_INTERFACE_VERSION
+Index: usr/src/nv/nvacpi.c
+===
+--- usr/src/nv/nvacpi.c
usr/src/nv/nvacpi.c2009-12-20 03:48:28.497758783 +0200
+@@ -49,6 +49,10 @@
+ };
+ #endif
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)
++#define acpi_walk_namespace(a,b,c,d,e,f) acpi_walk_namespace(a,b,c,d,e,f,NULL)
++#endif
++
+ static struct acpi_driver *nv_acpi_driver;
+ static acpi_handle nvif_handle = NULL;
+ static acpi_handle dsm_handle = NULL;
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
