Version bump. Per bug #295163. Thx to bug reporter for the patches.

Package-Manager: portage-2.2_rc53/cvs/Linux x86_64

6 files changed, 69 insertions, 29 deletions

diff --git a/media-libs/freeglut/ChangeLog b/media-libs/freeglut/ChangeLog
index 9f2144f127fe..1b82863af6c2 100644
--- a/media-libs/freeglut/ChangeLog
+++ b/media-libs/freeglut/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/freeglut
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/ChangeLog,v 1.62 2009/10/11 19:36:01 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/ChangeLog,v 1.63 2009/11/30 12:43:55 scarabeus Exp $
+
+*freeglut-2.6.0 (30 Nov 2009)
+
+  30 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/2.6.0-GFX_radeon.patch, -freeglut-2.6.0_rc1.ebuild,
+  +freeglut-2.6.0.ebuild, -files/freeglut-2.6.0_rc1-bsd_joystick.patch,
+  metadata.xml:
+  Version bump. Per bug #295163. Thx to bug reporter for the patches.
 
   11 Oct 2009; nixnut <nixnut@gentoo.org> freeglut-2.6.0_rc1.ebuild:
   revert to ~ppc #287229
diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest
index 8231bf111949..8e2aff5f3503 100644
--- a/media-libs/freeglut/Manifest
+++ b/media-libs/freeglut/Manifest
@@ -1,12 +1,13 @@
 AUX 2.4.0-cursor.patch 760 RMD160 4cbf8ffe84e1463e85569153704d4dfe07961e46 SHA1 feb229abe646828c9d629172e504c7c6905deb9f SHA256 5206d52da9159b0505feb271ce4c24abdab6b3fbc4944abd7b2a4c3f0610a9d8
+AUX 2.6.0-GFX_radeon.patch 786 RMD160 7b7ea37704106af989f36e72b94e8b8e69c6857f SHA1 2e392c7d0b60016ec89e6a5edf504f5722351b95 SHA256 ed6642c409bc32b4ee98cd371ea3d403ce293eabf2d06aad9d9913166e62ed89
 AUX freeglut-2.4.0-bsd-usb-joystick.patch 755 RMD160 2453315cc3d2a882bd68d96a413d555e75a0b661 SHA1 095343909d035a9e0933a3af431fc708170db23c SHA256 52ada965b1dc6abbb9ce0bbc00bf91452c6717b74016d21e0a10df24a0ffe83c
 AUX freeglut-2.4.0-macos.patch 384 RMD160 f44ed965ac534697fa5dc4bbc17b1f464795edfd SHA1 4863883e3742162f1ace5767a6c9906e4f7d2f30 SHA256 6de982efac5a62b317e4cc73570da45c4ded0f42295b5dfeae090948d37eabf6
-AUX freeglut-2.6.0_rc1-bsd_joystick.patch 564 RMD160 9aefe433021a8eebaf337a273fc2fb862baad27b SHA1 41eb8aceedb7903f8c9ed1dd93b4dc8c61df2dd5 SHA256 e033905a09bc169d76c2eb75b333e675d5a49f3787a549a0b48ae4cf10934c09
 AUX freeglut-gcc42.patch 283 RMD160 d0fa7fa4828d2ab8e554ce30f72b5af4a92b9e14 SHA1 34cfdaa4f6422af3d5bca097468cb60168581f42 SHA256 e718dc2c6465654c3f87872f459b008109bbacc4c9bcf2a475880ded1b18b436
 DIST freeglut-2.4.0.tar.gz 469557 RMD160 77465647f3d65fbb5cf253eb93ac7409e0c37b14 SHA1 91a528aa72758b7288a0d69a964b1b7e3f322a12 SHA256 269f2d50ba30b381622eb36f20b552ad43a1b43d544b9075e484e7146e81b052
-DIST freeglut-2.6.0-rc1.tar.gz 715384 RMD160 8afcbd8be60e00943afcadc0eb1282c024d99289 SHA1 0bf40f0134695a95032de8cf8305c13dc8d654e5 SHA256 60cc641b124109e510c2397949713cb4a91521d719853b92c13c60f78fedc3ae
+DIST freeglut-2.6.0-mpx-r6.patch 13696 RMD160 c6a4fa56c512b3e3d4179e00a531e7e90582ec28 SHA1 a2f09fa5fdd0877fb1bbdcbc80f0b7d8ad61df17 SHA256 e2936ce3cb4af219871806004d30f46d7fa9da77f66208203d566bae9e48bb5c
+DIST freeglut-2.6.0.tar.gz 1124186 RMD160 43bdb1a6d99445ee09370930ec6bc0f8310e7fcf SHA1 68306c4486c13d005a4e4d54035e0c0b1bdc220b SHA256 615b41edc96c405ee6bb7e9a2942642140c3e57c1dd8c68e968a17ddfb59e98f
 EBUILD freeglut-2.4.0-r1.ebuild 1729 RMD160 2cadb60b2ab465f4e15a42a3427252eb758367e7 SHA1 074dd8dc10747701c1c4592a16d8576f84cc8e54 SHA256 e685e6c099d594d666fbc2483861d3d7906cf0e122ed8a121d7b343ea7096911
 EBUILD freeglut-2.4.0-r2.ebuild 1797 RMD160 64f16972663803f76e5781603d34ae2f7f903993 SHA1 194c88b9a0bd3e351f8a0f4fb12882f23f2d85ca SHA256 d7c1e3ec1fc455f103f12d224266044e2ecbaf7e3f30a6a91f18b5b9e75b6cf0
-EBUILD freeglut-2.6.0_rc1.ebuild 1223 RMD160 724ae5d2798f148191a3f18021f0f92f1ed920a4 SHA1 9be02d6fd38e29aa90e9d0bd163de50edd1d8eea SHA256 36d065cbb7245be09c5240e8a459b0cbd79fcb715543f0709689345f0e0ac8b4
-MISC ChangeLog 7788 RMD160 552a5bd6858d7705c2e9bfff995d8a62f3b02ad7 SHA1 cdaae2b8a85c036549eac30d921de2a4be2b25bf SHA256 7b22d01f9863a67711496a46220a22473bc65f7c9f7e39b30b7253a4d86edc8b
-MISC metadata.xml 425 RMD160 c156d2171334ccbfe68cf0e032e8c9085221f3d2 SHA1 130855d87692166c8e04a8ba6670ff6ee5ca89f3 SHA256 9bbc04ac34ad6352031f12d061385dc2fa77df2decef98c7f0c6c0c7af018d68
+EBUILD freeglut-2.6.0.ebuild 1326 RMD160 6f50b5965884af87e5799b97f22fe599fbb3e7d8 SHA1 910f205e5aecb39d6abe94ee468c3c1a7c1f1142 SHA256 4b8e921c4104a1cc4ec9874ebd61b8249dbc20e6adb678a427e7b4d258dee248
+MISC ChangeLog 8097 RMD160 096d8b0e51cef576766a73b572274a4cb59c41ee SHA1 7f90a5c4ef4fa53983beefdcbe5c88579446cc6d SHA256 241879edee92a7e6f9fc6675e3add79ca2b932d2f556a00f6d0cda53bbe52879
+MISC metadata.xml 547 RMD160 aca9d5b8a53da9ad98263a30fafdadb0f97cf368 SHA1 2b890cdc7b0ad39313851f4794e7d04cf360fcd9 SHA256 f20911324f4b6374ced9986fae7cfa7f2bf3041817042a8db923f7e4bcf65b96
diff --git a/media-libs/freeglut/files/2.6.0-GFX_radeon.patch b/media-libs/freeglut/files/2.6.0-GFX_radeon.patch
new file mode 100644
index 000000000000..8806fe849cb5
--- /dev/null
+++ b/media-libs/freeglut/files/2.6.0-GFX_radeon.patch
@@ -0,0 +1,28 @@
+Index: src/freeglut_window.c
+===================================================================
+--- src/freeglut_window.c	(Revision 832)
++++ src/freeglut_window.c	(Arbeitskopie)
+@@ -594,10 +594,9 @@
+ #if TARGET_HOST_POSIX_X11
+     if ( window )
+     {
+-        glXMakeContextCurrent(
++        glXMakeCurrent(
+             fgDisplay.Display,
+             window->Window.Handle,
+-            window->Window.Handle,
+             window->Window.Context
+         );
+ 
+@@ -932,10 +932,9 @@
+     XSetWMProtocols( fgDisplay.Display, window->Window.Handle,
+                      &fgDisplay.DeleteWindow, 1 );
+ 
+-    glXMakeContextCurrent(
++    glXMakeCurrent(
+         fgDisplay.Display,
+         window->Window.Handle,
+-        window->Window.Handle,
+         window->Window.Context
+     );
+ 
diff --git a/media-libs/freeglut/files/freeglut-2.6.0_rc1-bsd_joystick.patch b/media-libs/freeglut/files/freeglut-2.6.0_rc1-bsd_joystick.patch
deleted file mode 100644
index cde788850aeb..000000000000
--- a/media-libs/freeglut/files/freeglut-2.6.0_rc1-bsd_joystick.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=2862668&group_id=1032&atid=101032
-
---- freeglut-2.6.0/src/freeglut_joystick.c.old	2009-09-20 16:28:07 +0200
-+++ freeglut-2.6.0/src/freeglut_joystick.c	2009-09-20 16:28:18 +0200
-@@ -1325,7 +1325,7 @@
-         if( joy->error )
-             return;
- 
--        snprintf( joyfname, sizeof(buffer), "%s/.joy%drc", getenv( "HOME" ), joy->id );
-+        snprintf( joyfname, sizeof(joyfname), "%s/.joy%drc", getenv( "HOME" ), joy->id );
- 
-         joyfile = fopen( joyfname, "r" );
-         joy->error =( joyfile == NULL );
diff --git a/media-libs/freeglut/freeglut-2.6.0_rc1.ebuild b/media-libs/freeglut/freeglut-2.6.0.ebuild
index 230872486bb7..f74e8e594860 100644
--- a/media-libs/freeglut/freeglut-2.6.0_rc1.ebuild
+++ b/media-libs/freeglut/freeglut-2.6.0.ebuild
@@ -1,30 +1,36 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/freeglut-2.6.0_rc1.ebuild,v 1.9 2009/10/11 19:36:01 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/freeglut-2.6.0.ebuild,v 1.1 2009/11/30 12:43:55 scarabeus Exp $
 
 EAPI="2"
 
-inherit eutils flag-o-matic libtool
+inherit eutils flag-o-matic libtool autotools
 
 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"
+SRC_URI="mirror://sourceforge/freeglut/${P/_/-}.tar.gz
+	mpx? ( http://tisch.sourceforge.net/freeglut-2.6.0-mpx-r6.patch )"
 
 LICENSE="X11"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug"
+IUSE="debug mpx"
 
-RDEPEND="virtual/opengl
+RDEPEND="
+	virtual/opengl
 	virtual/glu
-	!media-libs/glut"
+	mpx? ( >=x11-libs/libXi-1.3 )
+"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${P/_*/}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-bsd_joystick.patch"
-	epatch "${FILESDIR}/${PN}-2.4.0-bsd-usb-joystick.patch"
+	epatch "${FILESDIR}/${PV}-GFX_radeon.patch"
+
+	use mpx && epatch "${DISTDIR}/${P}-mpx-r6.patch"
+
+	eautoreconf
 	# Needed for sane .so versionning on bsd, please don't drop
 	elibtoolize
 }
diff --git a/media-libs/freeglut/metadata.xml b/media-libs/freeglut/metadata.xml
index 2772d643054e..b78c5e306871 100644
--- a/media-libs/freeglut/metadata.xml
+++ b/media-libs/freeglut/metadata.xml
@@ -3,7 +3,17 @@
 <pkgmetadata>
 <herd>x11</herd>
 <maintainer>
-  <email>x11@gentoo.org</email>
+	<email>x11@gentoo.org</email>
 </maintainer>
-<longdescription>Freeglut provides an open-source alternative to the OpenGL Utility Toolkit (GLUT) library. It is actively developed and maintained, while not being restricted by its license.</longdescription>
+<use>
+	<flag name="mpx">
+		Enable support for multi-pointer-X. One pointer for each pointer
+		device.
+	</flag>
+</use>
+<longdescription>
+	Freeglut provides an open-source alternative to the OpenGL Utility Toolkit
+	(GLUT) library. It is actively developed and maintained, while not being
+	restricted by its license.
+</longdescription>
 </pkgmetadata>