diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-11-20 08:16:11 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-11-20 08:16:11 +0000 |
| commit | 821c661c14a43e316601351a3790adce5542c1a4 (patch) | |
| tree | c716e6595d9406ba352705127a093c0f7d9020d6 /media-libs | |
| parent | cleanup old stuff (diff) | |
| download | gentoo-2-821c661c14a43e316601351a3790adce5542c1a4.tar.gz gentoo-2-821c661c14a43e316601351a3790adce5542c1a4.tar.bz2 gentoo-2-821c661c14a43e316601351a3790adce5542c1a4.zip | |
Add patch by Mark Loeser to fix building with gcc-4.
(Portage version: 2.0.53_rc7)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/allegro/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/allegro/allegro-4.1.18.ebuild | 3 | ||||
| -rw-r--r-- | media-libs/allegro/files/allegro-4.1.18-gcc4.patch | 35 |
3 files changed, 42 insertions, 2 deletions
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/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; + + + + |