summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2004-01-09 23:39:52 +0000
committerMike Frysinger <vapier@gentoo.org>2004-01-09 23:39:52 +0000
commit7d6d438c717e42122239027ecf0de13be49b983f (patch)
tree13e83bf3a2f068a601997aa6445637a7effa028c /media-libs/svgalib
parentstable on alpha (diff)
downloadgentoo-2-7d6d438c717e42122239027ecf0de13be49b983f.tar.gz
gentoo-2-7d6d438c717e42122239027ecf0de13be49b983f.tar.bz2
gentoo-2-7d6d438c717e42122239027ecf0de13be49b983f.zip
gcc-3.x and linux-2.6.x fixes
Diffstat (limited to 'media-libs/svgalib')
-rw-r--r--media-libs/svgalib/ChangeLog6
-rw-r--r--media-libs/svgalib/files/svgalib-1.4.3-gcc3.patch11
-rw-r--r--media-libs/svgalib/files/svgalib-1.4.3-linux2.6.patch6
-rw-r--r--media-libs/svgalib/svgalib-1.4.3-r4.ebuild6
4 files changed, 26 insertions, 3 deletions
diff --git a/media-libs/svgalib/ChangeLog b/media-libs/svgalib/ChangeLog
index de0cb91a9fa8..4192de09b3fa 100644
--- a/media-libs/svgalib/ChangeLog
+++ b/media-libs/svgalib/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/svgalib
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.21 2003/10/10 18:33:04 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.22 2004/01/09 23:39:50 vapier Exp $
+
+ 09 Jan 2004; Mike Frysinger <vapier@gentoo.org>
+ svgalib-1.4.3-r4.ebuild svgalib-1.4.3-gcc3.patch svgalib-1.4.3-linux2.6.patch :
+ Yeah it's old and crusty, but lets make it compile #23515.
10 Oct 2003; Alexander Gabert <pappy@gentoo.org> svgalib-1.4.3-r4.ebuild:
flags not needed any more, hardened-gcc propolice behaviour will be changed in
diff --git a/media-libs/svgalib/files/svgalib-1.4.3-gcc3.patch b/media-libs/svgalib/files/svgalib-1.4.3-gcc3.patch
new file mode 100644
index 000000000000..dd6d1b4b4b47
--- /dev/null
+++ b/media-libs/svgalib/files/svgalib-1.4.3-gcc3.patch
@@ -0,0 +1,11 @@
+--- ./src/vga.c.old 2003-06-26 18:01:47.778102000 -0400
++++ ./src/vga.c 2003-06-26 17:57:40.108102000 -0400
+@@ -3914,7 +3914,7 @@
+
+ #define ML_GETINT(x) \
+ ptr = strtok(NULL, " "); if(!ptr) break; \
+- mmt.##x = atoi(ptr);
++ mmt.x = atoi(ptr);
+
+ ML_GETINT(HDisplay);
+ ML_GETINT(HSyncStart);
diff --git a/media-libs/svgalib/files/svgalib-1.4.3-linux2.6.patch b/media-libs/svgalib/files/svgalib-1.4.3-linux2.6.patch
new file mode 100644
index 000000000000..d806b7228578
--- /dev/null
+++ b/media-libs/svgalib/files/svgalib-1.4.3-linux2.6.patch
@@ -0,0 +1,6 @@
+--- src/et6000.c.orig 2004-01-09 18:24:37.640905848 -0500
++++ src/et6000.c 2004-01-09 18:25:33.637393088 -0500
+@@ -12,3 +12,2 @@
+ #include "driver.h"
+-#include <linux/pci.h>
+ #include "timing.h"
diff --git a/media-libs/svgalib/svgalib-1.4.3-r4.ebuild b/media-libs/svgalib/svgalib-1.4.3-r4.ebuild
index 0b957ce8061a..ffb588ddb3b3 100644
--- a/media-libs/svgalib/svgalib-1.4.3-r4.ebuild
+++ b/media-libs/svgalib/svgalib-1.4.3-r4.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-libs/svgalib/svgalib-1.4.3-r4.ebuild,v 1.10 2003/10/10 18:33:04 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.4.3-r4.ebuild,v 1.11 2004/01/09 23:39:50 vapier Exp $
inherit eutils
@@ -11,7 +11,7 @@ SRC_URI="http://www.svgalib.org/${P}.tar.gz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="x86 -ppc -sparc -alpha"
+KEYWORDS="-* x86"
DEPEND="virtual/glibc"
@@ -21,6 +21,8 @@ src_unpack() {
cd ${S}
epatch ${FILESDIR}/${P}-gentoo.diff
epatch ${FILESDIR}/${P}-userpriv.patch
+ epatch ${FILESDIR}/${P}-linux2.6.patch
+ epatch ${FILESDIR}/${P}-gcc3.patch #23515
# Update r128 driver, bug #10987.
cp -f ${DISTDIR}/r128.c ${S}/src