version bump and apply upstream patch to stable to fix building with newer mesa (bug #447258)

Package-Manager: portage-2.2.7/cvs/Linux x86_64

6 files changed, 167 insertions, 6 deletions

diff --git a/dev-games/clanlib/ChangeLog b/dev-games/clanlib/ChangeLog
index b7b133e515f2..71ed4a36efa6 100644
--- a/dev-games/clanlib/ChangeLog
+++ b/dev-games/clanlib/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-games/clanlib
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.63 2013/01/31 00:19:04 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.64 2013/10/28 23:31:47 mr_bones_ Exp $
+
+*clanlib-2.3.7 (28 Oct 2013)
+
+  28 Oct 2013; Michael Sterrett <mr_bones_@gentoo.org> +clanlib-2.3.7.ebuild,
+  +files/clanlib-2.3.6-mesa.patch, +files/clanlib-2.3.7-autotools.patch,
+  clanlib-2.3.6.ebuild:
+  version bump and apply upstream patch to stable to fix building with newer
+  mesa (bug #447258)
 
   31 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org> -clanlib-2.3.4.ebuild,
   -files/clanlib-2.3.4-autotools.patch:
diff --git a/dev-games/clanlib/Manifest b/dev-games/clanlib/Manifest
index c38d96d1f1dc..75793bf6ce93 100644
--- a/dev-games/clanlib/Manifest
+++ b/dev-games/clanlib/Manifest
@@ -4,9 +4,13 @@ AUX clanlib-0.8.1-gcc47.patch 338 SHA256 fd5a02a670575f6298516d201bdaecabacb13ea
 AUX clanlib-0.8.1-libpng15.patch 377 SHA256 6e6a878d16292255cff4f64605db6478ac855f079505434ca9a2f61aadb88342 SHA512 735fd6cadbd1c76ff38a229361c82c1208ea8ba8db60bd8bff082424244da9e88f1c74d8067991516866887d6240846c551a24a7f392a12ae3a2d6ce50e8644f WHIRLPOOL e35e13c89f90583fd4878b149fd9d6e8ad50131e11f94672171779f397fc020c58e5465a61774dedf467b02916acf113a5af28fddb502ae7f5f815df45474fa4
 AUX clanlib-0.8.1-ndebug.patch 866 SHA256 d48bdb0b6dee6b84b139eb951da657fa4d2c8427b9b4e7eb76b41a98e7aaf8d5 SHA512 653e70a71961e654bcdd488ccf4583c33dcb601fdef54fe15724e22cc0f0d51f265620137b4a2f194f1a915390c6be06adf66602b93c89d946a0a1650eee6419 WHIRLPOOL 05e452b4d264619eaa8e30e5449389974a6d75e8d064931ad40e308a94203e0858813234be8a1e44b3c6279c25a95d3f6592a4f6b753e3255329d858a2a4e0df
 AUX clanlib-2.3.6-autotools.patch 1602 SHA256 9e75ca32d249d8103906a3ba681eb2b8b007939971630c7dd81fc01b006828d8 SHA512 d19fb6435adfe54fe1a6b2bff78dbb87bcf037ded720c4535dbfafef6bdd92c6c002f2ffdd6e563a360531b9a62817baf65ff959e44c0881fb0d95253a92b6fa WHIRLPOOL 46b6c21469a435656b6422eec7fa8c6237b5826c773372450ad177e62036e021d9c4708cf6b25646b0686c879b669d842813c63c4ce8281f87d3911752abbe10
+AUX clanlib-2.3.6-mesa.patch 337 SHA256 ea50a9be570050bdaa47d2e6543d77b349afa4ac00ae219de820f18a9a53914a SHA512 b2e63bb6808bed2da05773ac955da46dca110e10e26be08c1649a465af8d0a9fdfb597c2a88f456a5ac58e54260787050edeffa6e5679777dbf8d4d1a3fc4049 WHIRLPOOL 8a1b46f27e1e5424cdf83ebfc0eb959b89403df52978d8f9f0f9cb26d5665ffb970ed9268baf854d12afec023c6b0df6964bfdcea2cb7251061f10b8c77900a7
+AUX clanlib-2.3.7-autotools.patch 1602 SHA256 9e75ca32d249d8103906a3ba681eb2b8b007939971630c7dd81fc01b006828d8 SHA512 d19fb6435adfe54fe1a6b2bff78dbb87bcf037ded720c4535dbfafef6bdd92c6c002f2ffdd6e563a360531b9a62817baf65ff959e44c0881fb0d95253a92b6fa WHIRLPOOL 46b6c21469a435656b6422eec7fa8c6237b5826c773372450ad177e62036e021d9c4708cf6b25646b0686c879b669d842813c63c4ce8281f87d3911752abbe10
 DIST ClanLib-0.8.1.tgz 7629019 SHA256 094331dda35b0d263431d1551991eb208d8e969824434925548a9fcd1d34e495 SHA512 277daaf1055ae0198be7a6bbfd415c79cfae9e2145f62553e83849d670f56e50b8484c83f8b85f23290002e0b0c72c1e01ca597ad608a0954a4add828177293b WHIRLPOOL be486125f406a307676c4957f977b6ccc6bc2ce527a72fb4febcb3d1c7e2acdc4fc6706b66b75412184c3a0744c53e962011b0c3ac22958da5e987f0fccc9d87
 DIST ClanLib-2.3.6.tgz 25605576 SHA256 b8dc9b41028bf16c0a6082aa15cdee5d8b1ecd5256797576970f09a63e3fafde SHA512 572b51984f960a93dd03ad9f48a9f81a7c21c471616fe376c4b54e6cb0855b1043e35486c3eacdc8beadb30e48290a5a2da0cb287ec9aaf5f409f299861ab72c WHIRLPOOL 4389c13bbc71a61adb0330f0edea2be474071b721a90a920872f0d1c6d00ad4e1fcd2b8510144ffacb4f5ff5235ee702d64f9f56b338b449b3f908686ee70c26
+DIST ClanLib-2.3.7.tgz 26132425 SHA256 d46127c08103f48d15936ceb9f95b3dfb1ff8ccba667cef1b3f8e639cb2601c2 SHA512 73169afc0f639390f80403150757a8a14f842bc291a9457c9bca1319642b78bc4d03a93327d75254230e39545c5b4b690e56dc0149ed7b60b223e5a5364e882a WHIRLPOOL a6547d0bc8d254e887c427dfff63deb2b69790124da3db49d54cf853f8c834d44172a06e92ef7fc5222c8c81f903ab29f186f85da698dc085f4138d147ddad68
 EBUILD clanlib-0.8.1.ebuild 2294 SHA256 695a61567e00bbe0c5dbade1d6d83749fedc34033ae04585c1b0254a3c6ce488 SHA512 26deac7967f1ec34c9b7a8b345c25882f8bbd1669d5b4ec336ec3631f792e43678698ce3be87e727819cfe2ae4a1ed518e7d1d1b1eb583ca5b7786c89994aa02 WHIRLPOOL a38d3c41aa7ebd5b9c25a9da73cb5dac2738e3f3a53adf07622955c5a102af9b5ecc0444bce7b018d53b899117764c8c348eeeaa32ddf14e4eb16089923767a9
-EBUILD clanlib-2.3.6.ebuild 2067 SHA256 1f1571cc4167f30c159c82919f8ff274877dc253bd39386d9f644318665205b2 SHA512 1f38ee6199bc800504a470e33e584893c252f6aa0f9842322e724830bd993772d32e7e1fa06a8b7b35676036c58c26f3b5d28bb5757e488dcd431a8148e9f8c3 WHIRLPOOL efa6966aad37f7be9a293fde40bdcf78d7b4a77f757b60690ed21b064b934b03ac0aa998be02b5d0ac6914caee8c6686df4b9e13a6f0a135dc0fbd86974f4c82
-MISC ChangeLog 11680 SHA256 a83378db5181ba97b441b786cd0d1273ac53c21c2c3773646f6dd662b56394c1 SHA512 69901b527720bd02bf13e85fd42751c64b5babf21c664d071d26ee0baf31b40e70beec417f469b35def66e0cddc5a11c6d621efcdf0a891c7b39b55c345c999d WHIRLPOOL 00f78c1a9cdae3098733e746ba1b1885649ef3b3667601222a155c6b4db7907b7574693a4114f94653c1afc3b217beb88f903f779bec7f77bd206e40e1de0eed
+EBUILD clanlib-2.3.6.ebuild 2080 SHA256 c49cefb9823bcc966ff7bbb091fa900d5a4a54ca0f7819ae299f5349a306db09 SHA512 d4560c6788aadc372e899ddca47aa2c60708afca26987e93ca2b06cf03a1486d16a329ee8a6da5b0d31271613fded08e5b7834f6104eb7c63d1eaecbfd98395a WHIRLPOOL af7cadc5686f26882f7e872adbc29842c6d7b4bc1f475ffe82631b7d3c63fa6f0c7b0b8b367229a4e81cca0beecc883cc05de4f09e4e2906176833ee7e84fa17
+EBUILD clanlib-2.3.7.ebuild 2075 SHA256 c309f236c455e4e96a4737a18e1a0a22447395eec796e54608dc65fab1ab15e3 SHA512 6a1501a42d2bbef761c66e8abad7005126293fa4c5883e234d22915238a8685e5b1054c664918a8a276b3e0e24a3460f7ee93a16301a2db18b3dad9769fbcd82 WHIRLPOOL 25a5ad50e02e4ecc86b38a6f36039344e2791e979a86e053973504957fc8cf63ce390493c43218c79096e36ee7aee4d32f40d6673a1bdd2ae39c923ebe1fc67b
+MISC ChangeLog 11984 SHA256 beb6a1354d51ea13c93d1255ce19ddb879ee33c52533b00d9781c818218849b6 SHA512 19a58459eb77f3f7db4d484d34e7ca3292be0033da086a4192bf30620f6469a42e95fc44313556ae98cf1f2b281178ea270c8e4bddc2d437230b91afae9285e9 WHIRLPOOL eefb67e2f3494a4cbad2e2eba7422890b76bba9c8ee718cc11d39eaafc63ba75ce530276c280c21cda4531e95c3a6660d02bc67c6eba9c94b0e7a7306e71e49a
 MISC metadata.xml 2920 SHA256 390505368337501a27b0d5eb795582bd656627c828d4bb982375fecdfbea8dec SHA512 4795475271093f9a5537d6b485c3b2fc6b29291a57e48e7efb73e39ba94825216cb80e17c8e4f545accecc3af930161fc18a1e5c34c20901480723f7f5c0def3 WHIRLPOOL 0670b35d690693f9329de60396b7697ba12d16ba2118cfce397d97f36b2e7595d965f4d48afaf9c44332a197dec8bac81946763d1251ce6272362c6c65536d1b
diff --git a/dev-games/clanlib/clanlib-2.3.6.ebuild b/dev-games/clanlib/clanlib-2.3.6.ebuild
index 559ac67fc499..d7487c4223dd 100644
--- a/dev-games/clanlib/clanlib-2.3.6.ebuild
+++ b/dev-games/clanlib/clanlib-2.3.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-2.3.6.ebuild,v 1.4 2012/12/04 11:16:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-2.3.6.ebuild,v 1.5 2013/10/28 23:31:47 mr_bones_ Exp $
 
 EAPI=4
 inherit flag-o-matic eutils autotools-utils
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
-PATCHES=( "${FILESDIR}"/${P}-autotools.patch )
+PATCHES=( "${FILESDIR}"/${P}-{autotools,mesa}.patch )
 AUTOTOOLS_AUTORECONF=1
 AUTOTOOLS_IN_SOURCE_BUILD=1
 DOCS=(
diff --git a/dev-games/clanlib/clanlib-2.3.7.ebuild b/dev-games/clanlib/clanlib-2.3.7.ebuild
new file mode 100644
index 000000000000..95713d2b00d4
--- /dev/null
+++ b/dev-games/clanlib/clanlib-2.3.7.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-2.3.7.ebuild,v 1.1 2013/10/28 23:31:47 mr_bones_ Exp $
+
+EAPI=4
+inherit flag-o-matic eutils autotools-utils
+
+MY_P=ClanLib-${PV}
+
+DESCRIPTION="multi-platform game development library"
+HOMEPAGE="http://www.clanlib.org/"
+SRC_URI="http://clanlib.org/download/releases-2.0/${MY_P}.tgz"
+
+LICENSE="ZLIB"
+SLOT="2.3"
+KEYWORDS="~amd64 ~x86" #not big endian safe #82779
+IUSE="doc ipv6 mikmod opengl sound sqlite sse2 static-libs vorbis X"
+REQUIRED_USE="opengl? ( X )"
+
+RDEPEND="sys-libs/zlib
+	X? (
+		media-libs/libpng
+		virtual/jpeg
+		media-libs/freetype
+		media-libs/fontconfig
+		opengl? ( virtual/opengl )
+		app-arch/bzip2
+		x11-libs/libX11
+	)
+	sqlite? ( dev-db/sqlite )
+	sound? ( media-libs/alsa-lib )
+	mikmod? (
+		media-libs/libmikmod
+		media-libs/alsa-lib
+	)
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+		media-libs/alsa-lib
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen dev-lang/perl )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${P}-autotools.patch )
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+DOCS=(
+	CODING_STYLE
+	CREDITS
+	PATCHES
+	README
+)
+
+src_configure() {
+	myeconfargs=(
+		$(use_enable doc docs)
+		$(use_enable sse2)
+		$(use_enable opengl clanGL)
+		$(use_enable opengl clanGL1)
+		$(use_enable opengl clanGUI)
+		$(use_enable X clanDisplay)
+		$(use_enable vorbis clanVorbis)
+		$(use_enable mikmod clanMikMod)
+		$(use_enable sqlite clanSqlite)
+		$(use_enable ipv6 getaddr)
+	)
+	use sound \
+		|| use vorbis \
+		|| use mikmod \
+		|| myeconfargs+=( --disable-clanSound )
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+	use doc && autotools-utils_src_compile html
+}
+
+# html files are keeped in a directory that is dependent on the SLOT
+# so to keep eventual bookmarks to the doc from version to version
+src_install() {
+	autotools-utils_src_install
+	if use doc ; then
+		emake DESTDIR="${D}" install-html
+		dodoc -r Examples Resources
+	fi
+}
diff --git a/dev-games/clanlib/files/clanlib-2.3.6-mesa.patch b/dev-games/clanlib/files/clanlib-2.3.6-mesa.patch
new file mode 100644
index 000000000000..bd98492b9b46
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-2.3.6-mesa.patch
@@ -0,0 +1,14 @@
+--- ClanLib-2.3.6.orig/Sources/API/GL1/opengl1_defines.h
++++ ClanLib-2.3.6/Sources/API/GL1/opengl1_defines.h
+@@ -44,6 +44,11 @@
+ #ifndef CL_DISPLAYDEFINES_DEFINES
+ #define CL_DISPLAYDEFINES_DEFINES
+ 
++/* newer Mesa defines this and creates a conflict */
++#ifdef GL_TYPE
++#undef GL_TYPE
++#endif
++
+ #include <cstddef>
+ 
+ #ifndef __APPLE__
diff --git a/dev-games/clanlib/files/clanlib-2.3.7-autotools.patch b/dev-games/clanlib/files/clanlib-2.3.7-autotools.patch
new file mode 100644
index 000000000000..97db79ac4245
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-2.3.7-autotools.patch
@@ -0,0 +1,45 @@
+--- Documentation/Reference/Makefile.am.old	2012-09-25 10:39:25.973544935 +0200
++++ Documentation/Reference/Makefile.am	2012-09-25 10:39:42.560554053 +0200
+@@ -10,7 +10,7 @@
+ 	mkdir doxyoutput;
+ 	mkdir reftest
+ 	doxygen ./clanlib.doxygen
+-	make -C ../Utilities/ReferenceDocs
++	$(MAKE) -C ../Utilities/ReferenceDocs
+ 	../Utilities/ReferenceDocs/ReferenceDocs
+ 
+ install-html:
+--- configure.ac.old	2012-09-25 11:07:38.412537590 +0200
++++ configure.ac	2012-09-25 11:09:41.133939131 +0200
+@@ -337,11 +337,9 @@
+ 
+ 	dnl  Optional linux/joystick.h
+ 	AC_CHECK_HEADERS(linux/joystick.h, linux_joystick=yes)
+-	AM_CONDITIONAL(LINUX_JOYSTICK, test x$linux_joystick = xyes)
+ 
+ 	dnl Optional linux/input.h
+ 	AC_CHECK_HEADERS(linux/input.h, linux_input=yes)
+-	AM_CONDITIONAL(LINUX_INPUT, test x$linux_input = xyes)
+ 
+ 	if test "$WIN32" = "no" && test "$enable_clanDisplay" != "no"; then
+ 	CLANLIB_CHECK_LIB(fontconfig,  [`cat $srcdir/Setup/Tests/fontconfig.cpp`],  clanDisplay, [ *** Cannot find fontconfig (See http://fontconfig.org/ ) (Try libfontconfig1-dev or better) ], [-lfontconfig])
+@@ -358,6 +356,8 @@
+ 			clanDisplay, [ *** Cannot find version 8 of DirectInput], [-ldxguid -lole32 -ldinput8])
+ 	fi
+ fi
++AM_CONDITIONAL(LINUX_JOYSTICK, test x$linux_joystick = xyes)
++AM_CONDITIONAL(LINUX_INPUT, test x$linux_input = xyes)
+ 
+ have_xrender=no
+ 
+@@ -515,9 +515,9 @@
+ 	fi
+ 
+ 	if test "$enable_clanSound" = "auto"; then enable_clanSound=yes; fi
+-	AM_CONDITIONAL(ALSA, test x$have_alsa = xyes)
+ 
+ fi
++AM_CONDITIONAL(ALSA, test x$have_alsa = xyes)
+ 
+ if test "$enable_clanSound" != "no"; then
+ 	enable_clanSound=yes