diff options
| -rw-r--r-- | media-libs/freeglut/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/freeglut/files/freeglut-gcc42.patch | 12 | ||||
| -rw-r--r-- | media-libs/freeglut/freeglut-2.4.0.ebuild | 6 |
3 files changed, 22 insertions, 2 deletions
diff --git a/media-libs/freeglut/ChangeLog b/media-libs/freeglut/ChangeLog index 89f8bf8e33dd..2a97ada26cbc 100644 --- a/media-libs/freeglut/ChangeLog +++ b/media-libs/freeglut/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/freeglut # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/ChangeLog,v 1.36 2006/07/11 20:03:27 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/ChangeLog,v 1.37 2006/07/29 18:04:10 joshuabaergen Exp $ + + 29 Jul 2006; Joshua Baergen <joshuabaergen@gentoo.org> + +files/freeglut-gcc42.patch, freeglut-2.4.0.ebuild: + Add a patch for GCC 4.2 compatibility. Fixes bug #131856. 11 Jul 2006; Aron Griffis <agriffis@gentoo.org> freeglut-2.4.0.ebuild: Mark 2.4.0 stable on ia64 diff --git a/media-libs/freeglut/files/freeglut-gcc42.patch b/media-libs/freeglut/files/freeglut-gcc42.patch new file mode 100644 index 000000000000..27404eaea847 --- /dev/null +++ b/media-libs/freeglut/files/freeglut-gcc42.patch @@ -0,0 +1,12 @@ +--- src/freeglut_joystick.c.old 2006-07-25 21:15:14.000000000 -0600 ++++ src/freeglut_joystick.c 2006-07-25 21:21:54.000000000 -0600 +@@ -1684,9 +1684,6 @@ + + fgInitialiseJoysticks (); + +- if ( !fgJoystick ) +- return 0; +- + if ( !fgState.JoysticksInitialised ) + return 0; + diff --git a/media-libs/freeglut/freeglut-2.4.0.ebuild b/media-libs/freeglut/freeglut-2.4.0.ebuild index 0a8a97f15794..314c1e51c86f 100644 --- a/media-libs/freeglut/freeglut-2.4.0.ebuild +++ b/media-libs/freeglut/freeglut-2.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/freeglut-2.4.0.ebuild,v 1.15 2006/07/11 20:03:27 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/freeglut-2.4.0.ebuild,v 1.16 2006/07/29 18:04:10 joshuabaergen Exp $ inherit eutils flag-o-matic @@ -20,10 +20,14 @@ DEPEND="${RDEPEND}" src_unpack() { unpack ${A} + cd ${S} # fixes bug #97390 epatch ${FILESDIR}/${P}-macos.patch + # #131856 + epatch ${FILESDIR}/${PN}-gcc42.patch + # bug #134586 replace-flags -O3 -O2 } |