diff options
Diffstat (limited to 'media-video')
4 files changed, 74 insertions, 15 deletions
diff --git a/media-video/nvidia-kernel/ChangeLog b/media-video/nvidia-kernel/ChangeLog index c61be2a76cb3..9c4d34621d53 100644 --- a/media-video/nvidia-kernel/ChangeLog +++ b/media-video/nvidia-kernel/ChangeLog @@ -1,6 +1,6 @@ # ChangeLog for media-video/nvidia-kernel # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.35 2003/06/23 04:17:22 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.36 2003/07/08 07:04:06 azarah Exp $ 23 Jun 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.4363-r2.ebuild: @@ -14,6 +14,12 @@ *nvidia-kernel-1.0.4363-r2 (26 May 2003) + 08 Jul 2003; ,,, <root@gentoo.org> nvidia-kernel-1.0.4363-r2.ebuild, + files/1.0.4363/NVIDIA_kernel-1.0-4363-highpmd.diff: + Add patch for 2.5.74-mm2, original patch thanks to Thomas Schlichter + <schlicht@uni-mannheim.de> and some fixups thanks to Andrew Morton + <akpm@osdl.org>. + 26 May 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.4363-r2.ebuild, files/1.0.4363/NVIDIA_kernel-1.0-4363-2.5.69-agp.diff: diff --git a/media-video/nvidia-kernel/Manifest b/media-video/nvidia-kernel/Manifest index bf99bd00df52..b06a987d78b6 100644 --- a/media-video/nvidia-kernel/Manifest +++ b/media-video/nvidia-kernel/Manifest @@ -1,26 +1,27 @@ -MD5 81dab2da5eacf51933bc19d17f6ef8a8 ChangeLog 7277 MD5 04b1f361d40708ab81631bea5e46a632 nvidia-kernel-1.0.2880-r1.ebuild 1970 +MD5 76fccda1348aa4c183f690d797c1d24a ChangeLog 7562 MD5 5177ed76121fb4bc1aa220c62319d196 nvidia-kernel-1.0.2960-r1.ebuild 2081 MD5 16a9003f79bea31eeec6f03ae64cd8ef nvidia-kernel-1.0.3123-r2.ebuild 3229 -MD5 4fc62b5769bfcbb15e69c27860bc27e7 nvidia-kernel-1.0.4191-r2.ebuild 3870 -MD5 059207b3eeaa0fb6e642402f06ef4a1a nvidia-kernel-1.0.4363-r2.ebuild 4002 +MD5 cdcf177830becdf3c2cb628e1d6a6749 nvidia-kernel-1.0.4363-r2.ebuild 4180 MD5 0646bd1f1f1109063862d1475aaccab4 nvidia-kernel-1.0.4349-r2.ebuild 3702 -MD5 441b29e8f10b6620c4dd4fc01528f172 files/NVIDIA_kernel-1.0-3123-2.5-module.diff 5569 +MD5 4fc62b5769bfcbb15e69c27860bc27e7 nvidia-kernel-1.0.4191-r2.ebuild 3870 +MD5 15c10778db607715e60a461e09d9f54c files/digest-nvidia-kernel-1.0.2960-r1 1122 +MD5 b6a9c4bdd3961980af4a70f57485d708 files/nvidia-1.1 441 +MD5 089e6829e7e8497a603ba9dc9563a722 files/nvidia 30 +MD5 ef31d4cc1ef62e1c3b2336d984cf6496 files/digest-nvidia-kernel-1.0.2880-r1 74 +MD5 6d8e159e5bdeb520091874050594b706 files/NVIDIA_kernel-1.0-4191-2.5.63.diff 814 +MD5 f38a4afc671446ad293a46b0046c0aec files/NVIDIA_kernel-1.0-3123-pa.diff 10825 MD5 4057597a09dd795c93ce8088d6f023bb files/NVIDIA_kernel-1.0-3123-2.5-tl-pa.diff 11858 MD5 059b3ddf8944dce6c9184d11d15abd71 files/NVIDIA_kernel-1.0-3123-2.5-tl.diff 31614 -MD5 2533aa51a645ec25c96a389110230298 files/NVIDIA_kernel-1.0-3123-2.5.54.diff 858 -MD5 f38a4afc671446ad293a46b0046c0aec files/NVIDIA_kernel-1.0-3123-pa.diff 10825 +MD5 5ba2848379bbce2f85d8442c01c0291d files/digest-nvidia-kernel-1.0.3123-r2 74 +MD5 c66873e3c55fd472cc99da1b74499c03 files/digest-nvidia-kernel-1.0.4349-r2 74 MD5 7f987ae6384103d87f323d834bba87a1 files/NVIDIA_kernel-1.0-4191-2.5-tl.diff 39065 MD5 57f69061f52fd98e20c7d62882af2757 files/NVIDIA_kernel-1.0-4191-2.5.54.diff 1228 -MD5 6d8e159e5bdeb520091874050594b706 files/NVIDIA_kernel-1.0-4191-2.5.63.diff 814 -MD5 ef31d4cc1ef62e1c3b2336d984cf6496 files/digest-nvidia-kernel-1.0.2880-r1 74 -MD5 15c10778db607715e60a461e09d9f54c files/digest-nvidia-kernel-1.0.2960-r1 1122 -MD5 5ba2848379bbce2f85d8442c01c0291d files/digest-nvidia-kernel-1.0.3123-r2 74 +MD5 441b29e8f10b6620c4dd4fc01528f172 files/NVIDIA_kernel-1.0-3123-2.5-module.diff 5569 +MD5 2533aa51a645ec25c96a389110230298 files/NVIDIA_kernel-1.0-3123-2.5.54.diff 858 MD5 854b5c292ec300d7105dbd54385840f6 files/digest-nvidia-kernel-1.0.4191-r2 74 -MD5 c66873e3c55fd472cc99da1b74499c03 files/digest-nvidia-kernel-1.0.4349-r2 74 -MD5 089e6829e7e8497a603ba9dc9563a722 files/nvidia 30 -MD5 b6a9c4bdd3961980af4a70f57485d708 files/nvidia-1.1 441 MD5 56ebaa3ba92e9db848baea746a6aef1a files/digest-nvidia-kernel-1.0.4363-r2 74 MD5 31565678620709b117139345323051fd files/1.0.4349/NVIDIA_kernel-1.0-4349-2.5-20030402.diff 70350 MD5 439563bcf7fa96c91361226fae454e0e files/1.0.4349/NVIDIA_kernel-1.0-4349-2.5.68.diff 1467 +MD5 229c0402f2342904e285faec5614ea95 files/1.0.4363/NVIDIA_kernel-1.0-4363-highpmd.diff 1425 MD5 e08e015c157458037c079e0259cf16a6 files/1.0.4363/NVIDIA_kernel-1.0-4363-2.5-20030614.diff 74562 diff --git a/media-video/nvidia-kernel/files/1.0.4363/NVIDIA_kernel-1.0-4363-highpmd.diff b/media-video/nvidia-kernel/files/1.0.4363/NVIDIA_kernel-1.0-4363-highpmd.diff new file mode 100644 index 000000000000..a4e00117d9e6 --- /dev/null +++ b/media-video/nvidia-kernel/files/1.0.4363/NVIDIA_kernel-1.0-4363-highpmd.diff @@ -0,0 +1,43 @@ +diff -urpN NVIDIA_kernel-1.0-4363.orig/nv-linux.h NVIDIA_kernel-1.0-4363/nv-linux.h +--- NVIDIA_kernel-1.0-4363.orig/nv-linux.h 2003-04-20 03:57:19.000000000 +0200 ++++ NVIDIA_kernel-1.0-4363/nv-linux.h 2003-07-08 07:53:49.000000000 +0200 +@@ -186,6 +186,15 @@ + } + #endif + ++#if defined(pmd_offset_map) ++#define NV_PMD_OFFSET(address, pg_dir) \ ++ pmd_offset_map(pg_dir, address); ++#define NV_PMD_OFFSET_UNMAP 1 ++#else ++#define NV_PMD_OFFSET(address, pg_dir) \ ++ pmd_offset(pg_dir, address) ++#endif ++ + #define NV_PAGE_ALIGN(addr) ( ((addr) + PAGE_SIZE - 1) / PAGE_SIZE) + #define NV_MASK_OFFSET(addr) ( (addr) & (PAGE_SIZE - 1) ) + +diff -urpN NVIDIA_kernel-1.0-4363.orig/nv.c NVIDIA_kernel-1.0-4363/nv.c +--- NVIDIA_kernel-1.0-4363.orig/nv.c 2003-04-20 03:57:19.000000000 +0200 ++++ NVIDIA_kernel-1.0-4363/nv.c 2003-07-08 07:55:09.000000000 +0200 +@@ -2191,11 +2191,18 @@ nv_get_phys_address(unsigned long addres + if (pgd_none(*pg_dir)) + goto failed; + +- pg_mid_dir = pmd_offset(pg_dir, address); +- if (pmd_none(*pg_mid_dir)) ++ pg_mid_dir = NV_PMD_OFFSET(pg_dir, address); ++ if (pmd_none(*pg_mid_dir)) { ++#if defined(NV_PMD_OFFSET_UNMAP) ++ pmd_unmap(pg_mid_dir); ++#endif + goto failed; ++ } + + NV_PTE_OFFSET(address, pg_mid_dir, pte); ++#if defined(NV_PMD_OFFSET_UNMAP) ++ pmd_unmap(pg_mid_dir); ++#endif + + if (!pte_present(pte)) + goto failed; diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.4363-r2.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.4363-r2.ebuild index 47dc11633284..c41b69c03264 100644 --- a/media-video/nvidia-kernel/nvidia-kernel-1.0.4363-r2.ebuild +++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.4363-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.4363-r2.ebuild,v 1.3 2003/06/23 04:17:22 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.4363-r2.ebuild,v 1.4 2003/07/08 07:04:06 azarah Exp $ inherit eutils @@ -39,6 +39,10 @@ pkg_setup() { die "MTRR support not detected!" fi + check_version_h +} + +check_version_h() { if [ ! -f "${ROOT}/usr/src/linux/include/linux/version.h" ] then eerror "Please verify that your /usr/src/linux symlink is pointing" @@ -50,6 +54,8 @@ pkg_setup() { } get_KV_info() { + check_version_h + # Get the kernel version of sources in /usr/src/linux ... export KV_full="$(awk '/UTS_RELEASE/ { gsub("\"", "", $3); print $3 }' \ "${ROOT}/usr/src/linux/include/linux/version.h")" @@ -90,6 +96,9 @@ src_unpack() { EPATCH_SINGLE_MSG="Applying tasklet patch for kernel 2.5..." \ epatch ${FILESDIR}/${PV}/${NV_PACKAGE}-2.5-20030614.diff + EPATCH_SINGLE_MSG="Applying highpmd patch (2.5.74-mm2+)..." \ + epatch ${FILESDIR}/${PV}/${NV_PACKAGE}-highpmd.diff + # Kbuild have issues currently (sandbox related). ln -snf Makefile.nvidia Makefile fi |