From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 20 Nov 2005 08:16:11 +0000 (+0000)
Subject: Add patch by Mark Loeser to fix building with gcc-4.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=563678b2021c5582e2c343caaa414bad4f93f82f;p=gentoo.git

Add patch by Mark Loeser to fix building with gcc-4.
Package-Manager: portage-2.0.53_rc7
---

diff --git a/media-libs/allegro/ChangeLog b/media-libs/allegro/ChangeLog
index b28355859ce6..b4fdd08e1cf7 100644
--- a/media-libs/allegro/ChangeLog
+++ b/media-libs/allegro/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/allegro
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.44 2005/10/18 01:32:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.45 2005/11/20 08:16:11 vapier Exp $
+
+  20 Nov 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/allegro-4.1.18-gcc4.patch, allegro-4.1.18.ebuild:
+  Add patch by Mark Loeser to fix building with gcc-4.
 
   18 Oct 2005; Aron Griffis <agriffis@gentoo.org> allegro-4.1.14.ebuild:
   Mark 4.1.14 stable on alpha
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index e5980d61e5f1..8cb9e870699d 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 69afb3c206fdd20a361ee6dbff286ace metadata.xml 636
-MD5 27d36336dc3adcc7b729ccadc55f46ee allegro-4.1.18.ebuild 2244
-MD5 4ca6b164613f4c11846a2090f147ca04 ChangeLog 5661
-MD5 5e224a9b7ff1f816ab68eb06fa1eb087 allegro-4.1.14.ebuild 2031
+MD5 adb97baaca7cb025d6144889e9f3a8b4 ChangeLog 5824
 MD5 364f2f88ed70d3d2c0aa266841da8ccd allegro-4.0.3.ebuild 2176
+MD5 5e224a9b7ff1f816ab68eb06fa1eb087 allegro-4.1.14.ebuild 2031
+MD5 f45bdbfa769efb3649f3af27968bfb84 allegro-4.1.18.ebuild 2279
+MD5 183ff716610d14fddd546ed17fea27c8 files/allegro-4.1.18-gcc4.patch 705
+MD5 80085d45008c152850633d5746809bd0 files/allegro-4.1.18-m4.patch 468
 MD5 9f28e5d796c572eb801998504cf84fbb files/digest-allegro-4.0.3 66
 MD5 cbde62e7be820f69c7c202d3ff4ac241 files/digest-allegro-4.1.14 67
-MD5 80085d45008c152850633d5746809bd0 files/allegro-4.1.18-m4.patch 468
 MD5 2f5e0d90784068cfc9473e07a4eb1b7f files/digest-allegro-4.1.18 67
+MD5 69afb3c206fdd20a361ee6dbff286ace metadata.xml 636
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDVFC3JrHF4yAQTrARArZjAJ41EsrHVBpHGB2hhqbvzZ94yZihFgCghudE
-yGf/0q6E5EuOYwg358009dA=
-=XZGH
+iD8DBQFDgDErgIKl8Uu19MoRAl5QAJ0XvA3Ugcba8w1ZVBZKqsbPX6Kw1ACeMJuB
+DBKJPBH4dRIxI9Fx5Mpd3wk=
+=MMRx
 -----END PGP SIGNATURE-----
diff --git a/media-libs/allegro/allegro-4.1.18.ebuild b/media-libs/allegro/allegro-4.1.18.ebuild
index ed0f5852fa47..4902b28deace 100644
--- a/media-libs/allegro/allegro-4.1.18.ebuild
+++ b/media-libs/allegro/allegro-4.1.18.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/allegro/allegro-4.1.18.ebuild,v 1.4 2005/08/29 03:28:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.1.18.ebuild,v 1.5 2005/11/20 08:16:11 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -28,6 +28,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-m4.patch
+	epatch "${FILESDIR}"/${P}-gcc4.patch
 	sed -i \
 		-e 's/&_oss_\(numfrags\|fragsize\)/NULL/' \
 		"${S}/setup/setup.c" \
diff --git a/media-libs/allegro/files/allegro-4.1.18-gcc4.patch b/media-libs/allegro/files/allegro-4.1.18-gcc4.patch
new file mode 100644
index 000000000000..28f65563cb3d
--- /dev/null
+++ b/media-libs/allegro/files/allegro-4.1.18-gcc4.patch
@@ -0,0 +1,35 @@
+Clean up code to work with gcc4
+
+patch by Mark Loeser
+
+--- allegro-4.1.18/src/gui.c
++++ allegro-4.1.18/src/gui.c
+@@ -1798,6 +1798,7 @@
+ 
+ 
+ 
++static int shutdown_single_menu(MENU_PLAYER *, int *);
+ /* update_menu:
+  *  Updates the status of a menu player object returned by init_menu(),
+  *  returning TRUE if it is still active or FALSE if it has finished.
+@@ -1810,8 +1810,6 @@
+  */
+ int update_menu(MENU_PLAYER *player)
+ {
+-   static int shutdown_single_menu(MENU_PLAYER *, int *);
+-
+    MENU_PLAYER *i;
+    int c, c2;
+    int old_sel, child_ret;
+--- allegro-4.1.18/src/sound.c
++++ allegro-4.1.18/src/sound.c
+@@ -25,7 +25,7 @@
+ 
+ 
+ 
+-extern DIGI_DRIVER digi_none;
++static DIGI_DRIVER digi_none;
+ 
+ 
+ 
+