Added patch for gcc4 as per bug #94600.

Package-Manager: portage-2.0.53_rc7

diff --git a/media-libs/libggi/ChangeLog b/media-libs/libggi/ChangeLog
index d037a451d88b1d88c50923b9a3fcc5fe3b8b9c33..0adb7b4e0e96a5754f564a3c475e680098c71017 100644 (file)
--- 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/Manifest b/media-libs/libggi/Manifest
index 840b5cdb2fbef31c1563d5ed178677e1577558f7..a001f68333ab081913e4e210041766fe48609cae 100644 (file)
--- a/media-libs/libggi/Manifest
+++ b/media-libs/libggi/Manifest
@@ -1,22 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6713806d3d89cc7416ce73c2e877bb1c libggi-2.1.0.ebuild 1784
-MD5 8565bb352e3e1f7a37e3df631f551a28 libggi-2.0.1.ebuild 1401
-MD5 1e0338ad3e486acabbb4eec53c74ecf0 libggi-2.1.1.ebuild 1837
-MD5 2eb0ad2bde38c008a964837655ee2f2d ChangeLog 3449
-MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
-MD5 7c001ca257478a9dcd94d3a1823a8e17 libggi-2.0.1-r1.ebuild 1642
+MD5 5b626b5174bb1bf6d91adc69bcaf12f1 ChangeLog 3600
 MD5 dccabae951c60ae1cffb9318b96e5e8b files/digest-libggi-2.0.1 65
+MD5 dccabae951c60ae1cffb9318b96e5e8b files/digest-libggi-2.0.1-r1 65
 MD5 b93988b2735e152af47806e54abbef57 files/digest-libggi-2.1.0 69
 MD5 026e0928dbe84dcf3e6921767870df9c files/digest-libggi-2.1.1 69
-MD5 dccabae951c60ae1cffb9318b96e5e8b files/digest-libggi-2.0.1-r1 65
 MD5 0003d0005fedae0068066f6791125cba files/glibc-2.2.2-speed.diff 255
 MD5 ba5500ab4d04f2478eff5056de19fd4e files/libggi-2.0.1-ppc.patch 291
+MD5 63c83abc1ab956c65af57fb546f4d4eb files/libggi-2.1.1-gcc4.patch 1944
+MD5 7c001ca257478a9dcd94d3a1823a8e17 libggi-2.0.1-r1.ebuild 1642
+MD5 8565bb352e3e1f7a37e3df631f551a28 libggi-2.0.1.ebuild 1401
+MD5 6713806d3d89cc7416ce73c2e877bb1c libggi-2.1.0.ebuild 1784
+MD5 e1ea425ddb5b9dff511e9373ab39aa03 libggi-2.1.1.ebuild 1719
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFCoglF06ebR+OMO78RAkW5AJsGDMX9vet+0stK+rO/8QGNSINu5wCfR/2I
-PK3jCltSXKXpUFUcERQXEVQ=
-=lmAg
+iD8DBQFDarU8j5H05b2HAEkRAtazAJ9Ano8eBxA+2Kd2aFQWBEtpaa/QXQCglMvo
+E5Ge1mVHhkoeXkHBZHpEr64=
+=vaym
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..dc3ebbe
--- /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 4742a3ff9fc1273f73cdbfb787e5320749196e9a..7ad43dc33ce7fd8239747db77f5d46f8bcf3e969 100644 (file)
--- 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