Don't build demo that fails with newer mesa, bug #428382.

Package-Manager: portage-2.2.0_alpha115/cvs/Linux x86_64

3 files changed, 68 insertions, 19 deletions

diff --git a/media-libs/freeglut/ChangeLog b/media-libs/freeglut/ChangeLog
index efe7b14545c6..c0e6c5bdf30d 100644
--- a/media-libs/freeglut/ChangeLog
+++ b/media-libs/freeglut/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/freeglut
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/ChangeLog,v 1.88 2012/05/10 18:28:01 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/ChangeLog,v 1.89 2012/07/30 21:39:08 chithanh Exp $
+
+*freeglut-2.8.0-r1 (30 Jul 2012)
+
+  30 Jul 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +freeglut-2.8.0-r1.ebuild:
+  Don't build demo that fails with newer mesa, bug #428382.
 
   10 May 2012; Alexis Ballier <aballier@gentoo.org> freeglut-2.8.0.ebuild:
   keyword ~amd64-fbsd
@@ -314,4 +320,3 @@
   +freeglut-2.2.0.ebuild:
   Initial import. Thanks to Tamer Fahmy <tamer@tammura.at> for the ebuild
   submission. This closes bug 36783.
-
diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest
index 8c215cbbeae9..01c161b8b9d3 100644
--- a/media-libs/freeglut/Manifest
+++ b/media-libs/freeglut/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-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 2.6.0-GFX_radeon.patch 786 SHA256 ed6642c409bc32b4ee98cd371ea3d403ce293eabf2d06aad9d9913166e62ed89 SHA512 dd449990c97ac4b40a33acbbda9a81e92b454ca5fecd2a9a54c48c7a647bd3a74f1088d173dea8883f7ce072c554a306b03fa1ea6bd24be65080662145b32cd1 WHIRLPOOL d65a6b5221edc43867229172292edbc97c3009bc61cd406113930c12a4781fdd2c81cb6617cc99fd10257b0cfb11896456704557d9e2336cb4388177d0efa27e
+AUX freeglut-2.4.0-bsd-usb-joystick.patch 755 SHA256 52ada965b1dc6abbb9ce0bbc00bf91452c6717b74016d21e0a10df24a0ffe83c SHA512 7aa28f277864357e9b2bb6e7fcd801bb9dd6e131fec8989aca26990cf59b60c3465030ea5068ca01cb7f46bf406c0f3fce2327affb7f288ee3026b5717717561 WHIRLPOOL 91710af0b3c06f36b65f51045e12f444329b4954268012422d0c6eafefc0a4f5f25f4b01b348256fdbce9956f766ee91773fc3cf8e28e0f9941ccd9b92930fb9
 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
-DIST freeglut-2.8.0.tar.gz 979459 RMD160 c406a3a62f60ac876cda855afcb7242824ce99a5 SHA1 4debbe559c6c9841ce1abaddc9d461d17c6083b1 SHA256 197293ff886abe613bc9eb4a762d9161b0c9e64b3e8e613ed7c5e353974fba05
-EBUILD freeglut-2.6.0.ebuild 1606 RMD160 6356d3a9f0468a68c3714cb1422a724b43a91971 SHA1 d89832f919807d807781449f81db642f44f06783 SHA256 d98b5b31671da2d456556014dd69f9f789bbfae03395284aa8d94de7a79ebac9
-EBUILD freeglut-2.8.0.ebuild 1313 RMD160 c3a5057a125e1cd2abda99dbb90f9818955a381b SHA1 49b1b1031a78dd2962a1854a502934f8ece0f28c SHA256 e716c7a490080c1359f91004bfe074c3d5dfe23d59ff593582a56b6212cface0
-MISC ChangeLog 11065 RMD160 ad1e40f30ab121575fbd62516a4684d137365327 SHA1 fa1b068122774a5ec0bcc2e6ad34fb554a161d40 SHA256 84e5c737152f63199effe71268dc8daf41252c66cffe3492263ef5c5dfc91fdf
-MISC metadata.xml 489 RMD160 600b4e9df84478b95b5816da4c684422f4759f4a SHA1 6a6b0206385fd06331bc2b2bb79031179ec6904c SHA256 177d737b92192f5b623a248d0266c7b60173af108ba2497d0b54e0b59af197a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEARECAAYFAk+sCLcACgkQvFcC4BYPU0oGIACePvyO1ckFAB/4mYk+NfzDGsHk
-6tIAn1liSDxyNMdMWFUFVTgO9gIIctfF
-=oaWi
------END PGP SIGNATURE-----
+DIST freeglut-2.8.0.tar.gz 979459 SHA256 197293ff886abe613bc9eb4a762d9161b0c9e64b3e8e613ed7c5e353974fba05 SHA512 ae2918d1ed7370ba3345f6416f70678cdf2346f61ce118102dc449d365163fcf238b76474178f57687592dacf41657b064e588e378c562ce878e92eaed17a665 WHIRLPOOL a9a0de803282c501d08f3039cff487310c8889e71302aec9b8744aaf989d98110ab4aa978621af9705d9d431b3070cbbde5cdf23928e445565d4fcce7e14857f
+EBUILD freeglut-2.6.0.ebuild 1606 SHA256 d98b5b31671da2d456556014dd69f9f789bbfae03395284aa8d94de7a79ebac9 SHA512 f52716417f01c87bf47315b10965ab2358f6260d905041acdc3ffb3a7d6a7d6fd221dd4aeac80e12b1897d9fb2d6f96824c2910d6e892f8f530153b1ca09d70c WHIRLPOOL 1c4d11f3d15898a11261eaf7903e60471e57d09f898be78783607ed97a8b80147c1423922d215f28d39ece17b853db14e271a2ffd34cd053a0c20ad5b028950e
+EBUILD freeglut-2.8.0-r1.ebuild 1454 SHA256 49421fe9930c87a71f71337ca72346b42da66f86eda0caae0f38a13b0a749616 SHA512 7e1513dd8ec790bc23d98107d439900d577e43da842b3b3fde48feb5299f7fd2e9946c98421c1aea008a849daf82135b0d3ca44380bb63dbce795a3cce9a218d WHIRLPOOL c018f25381b44ceaae7f7a03a9c398bda27e60407e64ef2dbaf58e0a9b85afe7ef5bf0542831fb597b8105bb94f3153b320b736e0066ff5059f4d1981e5d8d7f
+EBUILD freeglut-2.8.0.ebuild 1313 SHA256 e716c7a490080c1359f91004bfe074c3d5dfe23d59ff593582a56b6212cface0 SHA512 e901b3bbe3735475c705fa7efdd3d45860d8da0cc709ae4981ab9dfc849fde1a7653ceba0af4e4fb46e5c263da112d096349ab27f1733e63c49fe7ad2b9ff14c WHIRLPOOL 24bbb20915f7e9fdd4df523596ea10a8b162a1d99b59d27787c04b9fda2f24510bcad71942642e88cd4e4865ac4bbb2f77b81cd570c34f0e71f96927262417ac
+MISC ChangeLog 11257 SHA256 764f83b1797947c6322cfee7fb262b2163b1335246a9efbf54b2d3644839b8d1 SHA512 5f8bf86d478e75e20ccda7581a4ba75f3ec2dd538db889310b69b3755813b79305dc2812f7f54f963ec450b91715ea6a07f1421f12ad5eb7077db386f1f3f57d WHIRLPOOL 7a0f19cea31e7eb9c7247b8e6ea0e55130bfa446fb4c4528b21db1b611a83f0ef233c22e602701e7958d8c00c0740f14df5be783bb83e7ed4ca50ef87b98bd39
+MISC metadata.xml 489 SHA256 177d737b92192f5b623a248d0266c7b60173af108ba2497d0b54e0b59af197a3 SHA512 790314a48edba6bb3679cf120858597ff644e416b85d361d8c6bc9ad338c46f742a542c746e3cbbb81aefbbe0bf2637cbe326edf24699eb042cd8b28ead00fe0 WHIRLPOOL dfb5d298177d63564f3b32e8c51a614d38d1ff81ee5c7f93a8f967e7f98ec93d765384e011d05348808300a3918090807a62fc7138162d2187cf833cc4d4ffe3
diff --git a/media-libs/freeglut/freeglut-2.8.0-r1.ebuild b/media-libs/freeglut/freeglut-2.8.0-r1.ebuild
new file mode 100644
index 000000000000..e500186c4669
--- /dev/null
+++ b/media-libs/freeglut/freeglut-2.8.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/freeglut-2.8.0-r1.ebuild,v 1.1 2012/07/30 21:39:08 chithanh Exp $
+
+EAPI=4
+inherit eutils libtool
+
+DESCRIPTION="A completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library"
+HOMEPAGE="http://freeglut.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="debug static-libs"
+
+RDEPEND="virtual/glu
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXext
+	>=x11-libs/libXi-1.3
+	x11-libs/libXrandr
+	x11-libs/libXxf86vm"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/xproto"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+src_prepare() {
+	# Please read the comments in the patch before thinking about dropping it
+	# yet again...
+	epatch "${FILESDIR}"/${PN}-2.4.0-bsd-usb-joystick.patch
+
+	# smooth_opengl3 demo doesn't build with recent mesa, bug #428382
+	sed -i "s/smooth_opengl3 //" progs/demos/Makefile.* || die
+
+	# Needed for sane .so versionning on bsd, please don't drop
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--enable-replace-glut \
+		$(use_enable debug)
+}
+
+src_install() {
+	default
+	dohtml -r doc
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}