diff options
Diffstat (limited to 'media-video/nvidia-kernel')
3 files changed, 72 insertions, 3 deletions
diff --git a/media-video/nvidia-kernel/ChangeLog b/media-video/nvidia-kernel/ChangeLog index 79bc5e5fc980..77bf4daad6bc 100644 --- a/media-video/nvidia-kernel/ChangeLog +++ b/media-video/nvidia-kernel/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-video/nvidia-kernel # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.118 2005/07/07 14:33:32 augustus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.119 2005/07/16 23:30:44 azarah Exp $ + + 16 Jul 2005; Martin Schlemmer <azarah@gentoo.org> + +files/1.0.7667/NVIDIA_kernel-1.0-7667-KERNEL_VERSION-moved.patch, + nvidia-kernel-1.0.7667.ebuild: + Add support for latest kernels that no longer define KERNEL_VERSION in + version.h. Cleanup warnings users do not need to see. *nvidia-kernel-1.0.7667 (07 Jul 2005) diff --git a/media-video/nvidia-kernel/files/1.0.7667/NVIDIA_kernel-1.0-7667-KERNEL_VERSION-moved.patch b/media-video/nvidia-kernel/files/1.0.7667/NVIDIA_kernel-1.0-7667-KERNEL_VERSION-moved.patch new file mode 100644 index 000000000000..9e897183872c --- /dev/null +++ b/media-video/nvidia-kernel/files/1.0.7667/NVIDIA_kernel-1.0-7667-KERNEL_VERSION-moved.patch @@ -0,0 +1,56 @@ +diff -urpN nv/conftest.sh nv.az/conftest.sh +--- nv/conftest.sh 2005-06-17 16:50:43.000000000 +0200 ++++ nv.az/conftest.sh 2005-07-17 00:30:54.000000000 +0200 +@@ -212,6 +212,9 @@ case "$4" in + # Determine the kernel version using a compile check. + # + echo "#include \"linux/version.h\" ++ #ifndef KERNEL_VERSION ++ # include <linux/utsname.h> ++ #endif + int main() { + if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) { + return 0; +@@ -290,6 +293,9 @@ case "$4" in + # + + echo "#include \"linux/version.h\" ++ #ifndef KERNEL_VERSION ++ # include <linux/utsname.h> ++ #endif + int main() { + printf(\"%s\n\", UTS_RELEASE); + return 0; +@@ -369,6 +375,9 @@ case "$4" in + + echo "#include <linux/version.h> + #include <linux/mm.h> ++ #ifndef KERNEL_VERSION ++ # include <linux/utsname.h> ++ #endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) + #include <asm/cacheflush.h> + #endif +@@ -460,6 +469,9 @@ case "$4" in + VERBOSE=$5 + + echo "#include <linux/version.h> ++ #ifndef KERNEL_VERSION ++ # include <linux/utsname.h> ++ #endif + #include <linux/autoconf.h> + #if defined(CONFIG_X86_64) && \ + LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) && \ +diff -urpN nv/nv-linux.h nv.az/nv-linux.h +--- nv/nv-linux.h 2005-06-17 16:50:42.000000000 +0200 ++++ nv.az/nv-linux.h 2005-07-17 00:31:06.000000000 +0200 +@@ -16,6 +16,9 @@ + + #include <linux/config.h> + #include <linux/version.h> ++#ifndef KERNEL_VERSION ++# include <linux/utsname.h> ++#endif + + + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 0) diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.7667.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.7667.ebuild index 6178c4906e56..976a31ac950b 100644 --- a/media-video/nvidia-kernel/nvidia-kernel-1.0.7667.ebuild +++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.7667.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.7667.ebuild,v 1.1 2005/07/07 14:33:32 augustus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.7667.ebuild,v 1.2 2005/07/16 23:30:44 azarah Exp $ inherit eutils linux-mod @@ -94,9 +94,16 @@ src_unpack() { # epatch ${NV_PATCH_PREFIX//7174/7167}-conftest-koutput-includes.patch # Fix calling of smp_processor_id() when preempt is enabled epatch ${NV_PATCH_PREFIX//7667/7167}-disable-preempt-on-smp_processor_id.patch + epatch ${NV_PATCH_PREFIX}-KERNEL_VERSION-moved.patch fi - # if you set this then it's your own fault when stuff breaks :) + # Quiet down warnings the user do not need to see + sed -i \ + -e 's:-Wpointer-arith::g' \ + -e 's:-Wsign-compare::g' \ + ${S}/Makefile.kbuild + + # If you set this then it's your own fault when stuff breaks :) [[ -n ${USE_CRAZY_OPTS} ]] && sed -i "s:-O:${CFLAGS}:" Makefile.* # If greater than 2.6.5 use M= instead of SUBDIR= |