diff options
| author |   Chris PeBenito <pebenito@gentoo.org> | 2003-07-13 02:39:43 +0000 |
|---|---|---|
| committer | Chris PeBenito <pebenito@gentoo.org> | 2003-07-13 02:39:43 +0000 |
| commit | f7205680b98b57d232d9b86113bdac04773fe752 (patch) | |
| tree | f9f780a25c152bed812418c37d29ca6475631c33 /media-video | |
| parent | lets keep the homedir till portage is fixed (diff) | |
| download | gentoo-2-f7205680b98b57d232d9b86113bdac04773fe752.tar.gz gentoo-2-f7205680b98b57d232d9b86113bdac04773fe752.tar.bz2 gentoo-2-f7205680b98b57d232d9b86113bdac04773fe752.zip | |
fix to close 23247
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/mgavideo/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/mgavideo/Manifest | 5 | ||||
| -rw-r--r-- | media-video/mgavideo/files/mgavideo-0.1.0-rmap_fix.patch | 12 | ||||
| -rw-r--r-- | media-video/mgavideo/mgavideo-0.1.0.ebuild | 3 |
4 files changed, 22 insertions, 4 deletions
diff --git a/media-video/mgavideo/ChangeLog b/media-video/mgavideo/ChangeLog index f99b092c6c27..4d3d23af402c 100644 --- a/media-video/mgavideo/ChangeLog +++ b/media-video/mgavideo/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/mgavideo # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mgavideo/ChangeLog,v 1.4 2003/02/12 07:39:07 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mgavideo/ChangeLog,v 1.5 2003/07/13 02:39:37 pebenito Exp $ + + 12 Jul 2003; Chris PeBenito <pebenito@gentoo.org> mgavideo-0.1.0.ebuild, + files/mgavideo-0.1.0-rmap_fix.patch: + Add fix so mgavideo can compile on a rmap kernel. *mgavideo-0.1.0 (08 Jun 2002) diff --git a/media-video/mgavideo/Manifest b/media-video/mgavideo/Manifest index c7f4d6b774e2..0db08a0e444c 100644 --- a/media-video/mgavideo/Manifest +++ b/media-video/mgavideo/Manifest @@ -1,3 +1,4 @@ -MD5 dad42d412191466bf1f5fa2a1a166187 ChangeLog 979 -MD5 c4d75ccf315e3a9b8e13c4ca7707dc9f mgavideo-0.1.0.ebuild 1693 +MD5 7d6a180a6214a2ba88282d287fb1503a ChangeLog 1148 +MD5 08d7d931d5b3bce000ac24542b914677 mgavideo-0.1.0.ebuild 1770 MD5 134be36fbdc71740c294e9c6d30dab27 files/digest-mgavideo-0.1.0 66 +MD5 219dbcbe61f9163c297fe87e38b93273 files/mgavideo-0.1.0-rmap_fix.patch 484 diff --git a/media-video/mgavideo/files/mgavideo-0.1.0-rmap_fix.patch b/media-video/mgavideo/files/mgavideo-0.1.0-rmap_fix.patch new file mode 100644 index 000000000000..67d04d16790d --- /dev/null +++ b/media-video/mgavideo/files/mgavideo-0.1.0-rmap_fix.patch @@ -0,0 +1,12 @@ +diff -urN mgavideo-0.1.0.orig/driver/mgacore.h mgavideo-0.1.0/driver/mgacore.h +--- mgavideo-0.1.0.orig/driver/mgacore.h 2001-12-01 03:38:42.000000000 -0600 ++++ mgavideo-0.1.0/driver/mgacore.h 2003-04-24 13:57:42.000000000 -0500 +@@ -498,7 +498,7 @@ + if (!pgd_none(*pgd)) { + pmd = pmd_offset(pgd, adr); + if (!pmd_none(*pmd)) { +- ptep = pte_offset(pmd, adr); ++ ptep = pte_offset_kernel(pmd, adr); + pte = *ptep; + if (pte_present(pte)) + #if (LINUX_VERSION_CODE >= 0x020300) diff --git a/media-video/mgavideo/mgavideo-0.1.0.ebuild b/media-video/mgavideo/mgavideo-0.1.0.ebuild index e99bcd274ce4..e77cfce8709e 100644 --- a/media-video/mgavideo/mgavideo-0.1.0.ebuild +++ b/media-video/mgavideo/mgavideo-0.1.0.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/mgavideo/mgavideo-0.1.0.ebuild,v 1.5 2003/02/13 13:29:02 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mgavideo/mgavideo-0.1.0.ebuild,v 1.6 2003/07/13 02:39:37 pebenito Exp $ S=${WORKDIR}/${P}/driver DESCRIPTION="Matrox Marvel G200/G400/Rainbow Runner G-series V4L I and II @@ -18,6 +18,7 @@ KEYWORDS="x86" src_unpack() { unpack ${A} cd ${S} + [ -f /usr/src/linux/mm/rmap.c ] && epatch ${FILESDIR}/${P}-rmap_fix.patch # This allows us to compile the i2c-algo-ks.o module even if the user doesn't have # the i2c-core.o module, incase they want to compile that later. At the end of this |