Added patch for gcc4 as per bug #94600.

(Portage version: 2.0.53_rc7)

3 files changed, 84 insertions, 8 deletions

diff --git a/media-libs/libggi/ChangeLog b/media-libs/libggi/ChangeLog
index d037a451d88b..0adb7b4e0e96 100644
--- a/media-libs/libggi/ChangeLog
+++ b/media-libs/libggi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libggi
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libggi/ChangeLog,v 1.26 2005/06/04 20:03:51 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libggi/ChangeLog,v 1.27 2005/11/04 01:11:12 flameeyes Exp $
+
+  04 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/libggi-2.1.1-gcc4.patch, libggi-2.1.1.ebuild:
+  Added patch for gcc4 as per bug #94600.
 
   04 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org> libggi-2.1.0.ebuild,
   libggi-2.1.1.ebuild:
diff --git a/media-libs/libggi/files/libggi-2.1.1-gcc4.patch b/media-libs/libggi/files/libggi-2.1.1-gcc4.patch
new file mode 100644
index 000000000000..dc3ebbed3ecb
--- /dev/null
+++ b/media-libs/libggi/files/libggi-2.1.1-gcc4.patch
@@ -0,0 +1,71 @@
+--- default/fbdev/ati/mach64/visual.c~	2004-09-13 18:19:19.000000000 +0200
++++ default/fbdev/ati/mach64/visual.c	2005-07-19 10:39:28.000000000 +0200
+@@ -281,7 +281,7 @@
+ 	}*/
+ 
+ 	free(priv);
+-	ATI_MACH64_PRIV(vis) = NULL;
++	LIBGGI_PRIVATE(vis) = NULL;
+ 
+ 	ggUnregisterCleanup((ggcleanup_func *)do_cleanup, vis);
+ 
+@@ -313,7 +313,7 @@
+ 	if (priv == NULL) {
+ 		return GGI_ENOMEM;
+ 	}
+-	ATI_MACH64_PRIV(vis) = priv;
++	LIBGGI_PRIVATE(vis) = priv;
+ 
+ 
+ 	fbdevpriv->mmioaddr = mmap(NULL, fbdevpriv->orig_fix.mmio_len,
+--- default/fbdev/mga/g400/visual.c~	2004-09-13 18:20:44.000000000 +0200
++++ default/fbdev/mga/g400/visual.c	2005-07-19 10:38:28.000000000 +0200
+@@ -117,7 +117,7 @@
+ 	}
+ 
+ 	free(priv);
+-	MGA_G400_PRIV(vis) = NULL;
++	LIBGGI_PRIVATE(vis) = NULL;
+ 
+ 	ggUnregisterCleanup((ggcleanup_func *)do_cleanup, vis);
+ 
+@@ -259,7 +259,7 @@
+ 	  /* vis->opdraw->crossblit = GGI_mga_g400_crossblit; */
+ 	}
+ 
+-	MGA_G400_PRIV(vis) = priv;
++	LIBGGI_PRIVATE(vis) = priv;
+ 
+ 	/* Register cleanup handler */
+ 	ggRegisterCleanup((ggcleanup_func *)do_cleanup, vis);
+--- default/fbdev/mga/2164w/visual.c~	2004-09-13 18:19:59.000000000 +0200
++++ default/fbdev/mga/2164w/visual.c	2005-07-19 10:37:13.000000000 +0200
+@@ -111,7 +111,7 @@
+ 	}
+ 
+ 	free(priv);
+-	M2164W_PRIV(vis) = NULL;
++	LIBGGI_PRIVATE(vis) = NULL;
+ 
+ 	ggUnregisterCleanup((ggcleanup_func *)do_cleanup, vis);
+ 
+@@ -253,7 +253,7 @@
+ 		vis->opdraw->crossblit = GGI_m2164w_crossblit;
+ 	}
+ 
+-	M2164W_PRIV(vis) = priv;
++	LIBGGI_PRIVATE(vis) = priv;
+ 
+ 	/* Register cleanup handler */
+ 	ggRegisterCleanup((ggcleanup_func *)do_cleanup, vis);
+--- display/vcsa/visual.c~	2004-11-14 01:41:44.000000000 +0100
++++ display/vcsa/visual.c	2005-07-19 10:34:02.000000000 +0200
+@@ -124,7 +124,7 @@
+ 		}
+ 	}
+ 
+- 	priv = VCSA_PRIV(vis) = malloc(sizeof(ggi_vcsa_priv));
++ 	priv = LIBGGI_PRIVATE(vis) = malloc(sizeof(ggi_vcsa_priv));
+ 	if (priv == NULL) return GGI_ENOMEM;
+ 
+ 	LIBGGI_GC(vis) = malloc(sizeof(ggi_gc));
diff --git a/media-libs/libggi/libggi-2.1.1.ebuild b/media-libs/libggi/libggi-2.1.1.ebuild
index 4742a3ff9fc1..7ad43dc33ce7 100644
--- a/media-libs/libggi/libggi-2.1.1.ebuild
+++ b/media-libs/libggi/libggi-2.1.1.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-libs/libggi/libggi-2.1.1.ebuild,v 1.2 2005/06/04 20:03:51 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libggi/libggi-2.1.1.ebuild,v 1.3 2005/11/04 01:11:12 flameeyes Exp $
 
 inherit eutils libtool
 
@@ -19,9 +19,15 @@ DEPEND=">=media-libs/libgii-0.9.0
 	aalib? ( >=media-libs/aalib-1.2-r1 )
 	dga? ( virtual/x11 )"
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}/${P}-gcc4.patch"
 	elibtoolize
+}
 
+src_compile() {
 	local myconf=""
 
 	use svga \
@@ -56,11 +62,6 @@ src_compile() {
 src_install () {
 	make DESTDIR=${D} install || die "make install failed"
 
-	# This la file seems to bug mesa.
-# Hopefully libtoolize will fix for mesa-3.5.  The *.la needed
-# for mesa-5.0 in the works - <azarah@gentoo.org> (28 Dec 2002)
-#	rm ${D}/usr/$(get_libdir)/*.la
-
 	dodoc ChangeLog* FAQ NEWS README TODO
 	docinto txt
 	dodoc doc/*.txt