(#140542) Fix cursor initialization bug to make flightgear work. Patch from upstream CVS, pulled by Tupone Alfredo.

(Portage version: 2.1.2_pre2-r5)

4 files changed, 84 insertions, 1 deletions

diff --git a/media-libs/freeglut/ChangeLog b/media-libs/freeglut/ChangeLog
index 171c8c37564a..ef0e13a01892 100644
--- a/media-libs/freeglut/ChangeLog
+++ b/media-libs/freeglut/ChangeLog
@@ -1,6 +1,13 @@
 # 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.39 2006/08/31 17:38:17 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/ChangeLog,v 1.40 2006/10/12 17:32:41 dberkholz Exp $
+
+*freeglut-2.4.0-r1 (12 Oct 2006)
+
+  12 Oct 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/2.4.0-cursor.patch, +freeglut-2.4.0-r1.ebuild:
+  (#140542) Fix cursor initialization bug to make flightgear work. Patch from
+  upstream CVS, pulled by Tupone Alfredo.
 
   31 Aug 2006; Joshua Baergen <joshuabaergen@gentoo.org>
   freeglut-2.4.0.ebuild:
diff --git a/media-libs/freeglut/files/2.4.0-cursor.patch b/media-libs/freeglut/files/2.4.0-cursor.patch
new file mode 100644
index 000000000000..fab7f9eb0d81
--- /dev/null
+++ b/media-libs/freeglut/files/2.4.0-cursor.patch
@@ -0,0 +1,19 @@
+--- src/freeglut_cursor.c.old	2006-10-11 20:49:13.000000000 +0200
++++ src/freeglut_cursor.c	2006-10-11 20:51:43.000000000 +0200
+@@ -147,11 +147,13 @@
+             }
+         }
+ 
+-        if ( ( cursorIDToUse != GLUT_CURSOR_NONE ) && ( cursor == None ) ) {
++	if ( cursorIDToUse == GLUT_CURSOR_INHERIT ) {
++            XUndefineCursor( fgDisplay.Display, window->Window.Handle );
++	} else if ( cursor != None ) {
++            XDefineCursor( fgDisplay.Display, window->Window.Handle, cursor );
++	} else if ( cursorIDToUse != GLUT_CURSOR_NONE ) {
+             fgError( "Failed to create cursor" );
+         }
+-        XDefineCursor( fgDisplay.Display,
+-                       window->Window.Handle, cursor );
+     }
+ 
+ #elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE
diff --git a/media-libs/freeglut/files/digest-freeglut-2.4.0-r1 b/media-libs/freeglut/files/digest-freeglut-2.4.0-r1
new file mode 100644
index 000000000000..2b011d3f0fac
--- /dev/null
+++ b/media-libs/freeglut/files/digest-freeglut-2.4.0-r1
@@ -0,0 +1,3 @@
+MD5 6d16873bd876fbf4980a927cfbc496a1 freeglut-2.4.0.tar.gz 469557
+RMD160 77465647f3d65fbb5cf253eb93ac7409e0c37b14 freeglut-2.4.0.tar.gz 469557
+SHA256 269f2d50ba30b381622eb36f20b552ad43a1b43d544b9075e484e7146e81b052 freeglut-2.4.0.tar.gz 469557
diff --git a/media-libs/freeglut/freeglut-2.4.0-r1.ebuild b/media-libs/freeglut/freeglut-2.4.0-r1.ebuild
new file mode 100644
index 000000000000..fd3a57cbeddc
--- /dev/null
+++ b/media-libs/freeglut/freeglut-2.4.0-r1.ebuild
@@ -0,0 +1,54 @@
+# 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-r1.ebuild,v 1.1 2006/10/12 17:32:41 dberkholz Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="A completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library"
+HOMEPAGE="http://freeglut.sourceforge.net/"
+SRC_URI="mirror://sourceforge/freeglut/${P}.tar.gz"
+
+LICENSE="X11"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="virtual/opengl
+	virtual/glu
+	!media-libs/glut"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	# bug #134586
+	if [[ ${CFLAGS/march/} = ${CFLAGS} ]]; then
+		ewarn "You do not have 'march' set in your CFLAGS."
+		ewarn "This is known to cause compilation problems"
+		ewarn "in ${P}.  If the compile fails, please set"
+		ewarn "'march' to the appropriate architecture."
+		epause 5
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# fixes bug #97390
+	epatch "${FILESDIR}"/${P}-macos.patch
+
+	# #131856
+	epatch "${FILESDIR}"/${PN}-gcc42.patch
+
+	# (#140542) fix cursor handling so flightgear works
+	epatch "${FILESDIR}"/${PV}-cursor.patch
+
+	# bug #134586
+	replace-flags -O3 -O2
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README TODO
+	docinto doc
+	dohtml -r doc/*.html doc/*.png
+}