Adding a patch which allows compilation on OSX

Package-Manager: portage-2.0.51.22-r2

diff --git a/media-libs/freeglut/ChangeLog b/media-libs/freeglut/ChangeLog
index fea709cd8ae1944cc41218aa14b03bd99635c12d..e0b561fe1853e817c4f1171c4909b4f351f22579 100644 (file)
--- a/media-libs/freeglut/ChangeLog
+++ b/media-libs/freeglut/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/freeglut
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/ChangeLog,v 1.21 2005/08/24 23:26:54 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/ChangeLog,v 1.22 2005/09/10 15:48:12 grobian Exp $
+
+  10 Sep 2005; Fabian Groffen <grobian@gentoo.org>
+  +files/freeglut-2.4.0-macos.patch, freeglut-2.4.0.ebuild:
+  Adding a patch to allow compilation on OSX.
 
   24 Aug 2005; Aron Griffis <agriffis@gentoo.org> freeglut-2.2.0.ebuild:
   stable on ia64

diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest
index b130237536a385936d3f5ad73cc8c027d0a56903..60122e92a3d6fc87107e036e5483a1477eea91d3 100644 (file)
--- a/media-libs/freeglut/Manifest
+++ b/media-libs/freeglut/Manifest
@@ -1,6 +1,7 @@
-MD5 3c716e18e124f4626bc1170328f70b07 metadata.xml 425
-MD5 379d3e9269bdfb44da88b28249bce014 freeglut-2.4.0.ebuild 774
-MD5 42a665ccbd4b3b6bfe97b7d29a85a080 ChangeLog 2531
+MD5 3696b192f698fde84edf66e6f1df717d freeglut-2.4.0.ebuild 876
 MD5 ad45ce8644d0cff5f298dd4b7d9e6be2 freeglut-2.2.0.ebuild 764
+MD5 c9c88e9186eaf71eba17860515fc9d06 ChangeLog 2688
+MD5 3c716e18e124f4626bc1170328f70b07 metadata.xml 425
 MD5 e2b32978d8afb726aaccca034b50bb50 files/digest-freeglut-2.2.0 66
 MD5 af0b718a698fa8d64f28628ee423674c files/digest-freeglut-2.4.0 66
+MD5 b65ddf67b98d56c32985623701fc850a files/freeglut-2.4.0-macos.patch 384

diff --git a/media-libs/freeglut/files/freeglut-2.4.0-macos.patch b/media-libs/freeglut/files/freeglut-2.4.0-macos.patch
new file mode 100644 (file)
index 0000000..8a05b94
--- /dev/null
+++ b/media-libs/freeglut/files/freeglut-2.4.0-macos.patch
@@ -0,0 +1,11 @@
+--- freeglut-2.4.0/src/freeglut_joystick.c.orig        2005-07-02 10:41:52.000000000 +0200
++++ freeglut-2.4.0/src/freeglut_joystick.c     2005-07-02 10:44:17.000000000 +0200
+@@ -1389,7 +1389,7 @@
+ #    endif
+ #endif
+ 
+-#if defined( __linux__ )
++#if defined( __linux__ ) || defined(__APPLE_CC__)
+     /* Default for older Linux systems. */
+     joy->num_axes    =  2;
+     joy->num_buttons = 32;

diff --git a/media-libs/freeglut/freeglut-2.4.0.ebuild b/media-libs/freeglut/freeglut-2.4.0.ebuild
index 3bd1fc4a1f7c67163aa5cb4038ae7dc61448d97c..e248f2f60a1b5d44e23b9464767718a128fac372 100644 (file)
--- a/media-libs/freeglut/freeglut-2.4.0.ebuild
+++ b/media-libs/freeglut/freeglut-2.4.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 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.1 2005/06/29 00:15:58 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/freeglut-2.4.0.ebuild,v 1.2 2005/09/10 15:48:12 grobian Exp $
+
+inherit eutils
 
 DESCRIPTION="A completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library"
 HOMEPAGE="http://freeglut.sourceforge.net/"
@@ -16,6 +18,12 @@ DEPEND="virtual/opengl
        !virtual/glut"
 PROVIDE="virtual/glut"
 
+src_unpack() {
+       unpack ${A}
+       # fixes bug #97390
+       epatch ${FILESDIR}/${P}-macos.patch
+}
+
 src_install() {
        make DESTDIR="${D}" install || die "make install failed"
        dodoc AUTHORS ChangeLog NEWS README TODO