revbump, fix crash bug wrt #500544

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

4 files changed, 172 insertions, 19 deletions

diff --git a/games-action/openclonk/ChangeLog b/games-action/openclonk/ChangeLog
index 0053103fc1a8..26554232e9b2 100644
--- a/games-action/openclonk/ChangeLog
+++ b/games-action/openclonk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-action/openclonk
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/openclonk/ChangeLog,v 1.12 2013/09/05 19:44:52 mgorny Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/openclonk/ChangeLog,v 1.13 2014/02/06 20:34:40 hasufell Exp $
+
+*openclonk-5.3.3-r1 (06 Feb 2014)
+
+  06 Feb 2014; Julian Ospald <hasufell@gentoo.org> +openclonk-5.3.3-r1.ebuild,
+  +files/openclonk-5.3.3-xrandr-primary-output.patch:
+  revbump, fix crash bug wrt #500544
 
   05 Sep 2013; Michał Górny <mgorny@gentoo.org> openclonk-5.3.3.ebuild:
   Clean up PYTHON_COMPAT from old implementations.
diff --git a/games-action/openclonk/Manifest b/games-action/openclonk/Manifest
index c1f3f00c1e2b..70f09ef126e9 100644
--- a/games-action/openclonk/Manifest
+++ b/games-action/openclonk/Manifest
@@ -2,30 +2,24 @@
 Hash: SHA256
 
 AUX openclonk-5.2.2-zlib-1.2.6.patch 7636 SHA256 a3c9750ca092235f51c8b34af9335b720c44ab7d5554b0504ca6ed28e3d819c6 SHA512 fa319f4ccb21238406932d5a650d5b41754aba2a4916a4808cd7315cc650504a9fbc8eda203c88eaa59c09e4fb81aa0917a6dbbf968819be7a17afc454e77d1e WHIRLPOOL 1be78b87e18d110ec57c9a33fd18d96e14763ac98705643ab6e77f805ee0ebf616f989a4b5acd6a2a1d28a1fdbb34d21a7349b7c2182ac18f8dfcfb0f7b376d7
+AUX openclonk-5.3.3-xrandr-primary-output.patch 1119 SHA256 d312008f038a6aca9281c3de1c45806b5104e0107ed6ba8455a7125cb0784233 SHA512 d075bcb847899508245f074178ae420681099e92711db236aec4fee5b9a64c24a701f84cc71955eeff1b6e2eb18ed39d2ac48ef3ee4bf4aff5d45f99a95d565e WHIRLPOOL 9a129f0c6091949e5eee0eb77362429c4fcb123a3c55c80de0b6f063cca125b06f2d0cfd5a0b29d9b959cd70e58b4339635d4de6ba322fc8655416f9bfdc4376
 AUX openclonk-wrapper-script.sh 229 SHA256 96fbef61769c0b4950dfde6d35648f9f5b2d9261c4b99687cfc02c24635ed939 SHA512 d31a2ffa6dbb014cfe3761d5a8b52b33f6b658cda317d0f7fc91ad8cc869fd93c486f9808da9ebe03e75255b7b2fedc2ef6c4f6372f1dce0575771ae9471a8a3 WHIRLPOOL 5395e432dab01140abcedcbf49573094bf13269b15fc7a1758a6c00258e1246560c1f50ae658fe27ef2cf579633debb4ed8efcd64d028bc9be2e2fb9603112d0
 DIST openclonk-5.3.3.tar.xz 46516448 SHA256 e6352a695ccb1f7905b2e3014b229e25a9660e82f2a96696521862efaa163abe SHA512 2351b2ec8d3931a05c7f8a4c7ca9ef0285535b1a15da0b02de9046139806211ed64fe3b08a56c3d1712aad07e0a6eea0074ff47d9dbaa874605a788f4c3ab100 WHIRLPOOL 6cc87894b2ab03de35c42fcd3e617f82b66ac06ccdb2ad167a67a0d14ad22fecc048d2d3f2504a5c96efe94103830bcf2f0deaa7a535bea66fb115f12aab4e82
 DIST openclonk-release-5.2.2-src.tar.gz 43078356 SHA256 87bf6c4836ed5c15e8ae66f7f2b0eec097e0d641a36bf1b328568be8d8fe39a9 SHA512 41549f2c7061b093f44f0b430801535de121405ba846f7aa2ef4e0a02d0f8c97099fbb2b789b74598bceb47f505b4cc9a8ed5b7dcf4b05c7b942650662a42833 WHIRLPOOL b905111fb911edbc796409a30a144c1352e397c515c31e30db26bb8efd663f4f91c7ff7aaa5fdcd368f1a821d6708f2b751d1c47312c61fe845afaf48f69b81c
 DIST openclonk.png 8487 SHA256 93ff9f479e166f30f1c1042c32624b7e54b4d917813a4f46cce57e39a1f30233 SHA512 3bd2bb20167349130d767719f6732d9682ec32a09f5e8c13fe6245648185eee28edfe564ae64bdc5539c19de701f321887c7fa71e8d1f1f640e0ec6b933544de WHIRLPOOL 190876380614e82092a0d825612cec9dbd0294aec1caf9fe00a137d75525736d87e56507851f61292b736601c1124aac1d1724e94cd0846fa60f5fcab714ef13
 EBUILD openclonk-5.2.2.ebuild 2283 SHA256 5c07a8f6d1bd1bec18a7caa88ec8c9999bdb5e5ca7e0e4ba1e774201faa38a81 SHA512 1f4afb486f7c2d48a3f8f5b1c548b9e7b4334125a99dfe5a943196758508a6927cd562ce78c7316abb7fa1dafbb3abd42fbd3bf4746cec5c26bb32c223799129 WHIRLPOOL 1aca402b3c81d628c80cc0c8f93e1321d70e90a3a531b99ad5fd5363e9f4e15d0e7c74812824bdcaeed976de3892fefbfd800907424f868a0c13b5a0059ac115
+EBUILD openclonk-5.3.3-r1.ebuild 2389 SHA256 62dbb8e0c8a8ae5e5ddc41171ae927e78e31820b9fd484258940526f2f28f78a SHA512 c80b29755820bfa80f1e260c0e488c16e839d87c276af2250ca5e9d761440bafe45ce0e9e74a9808393da22a809dea84d705d4b5f7403e4465c64f7e5baff962 WHIRLPOOL 0fff8c6d5831f78d8031c5ab0cf262650158b47d7cf0ebfab274e7e4e7221f1f5f8d827763995e4687012523f15e2d815cf06c6a8a80f1889bd615721b26febf
 EBUILD openclonk-5.3.3.ebuild 2326 SHA256 888e496c25b4f24c8d195ca628ba55815cabaf5e77b54842e9ac3bdfb83101bd SHA512 f1820c86467e5169a5ad2830d205c2e33f867a33b08b691f7d898317c97cd96b68d562281f988fcec95ba56c03e691b1e97cf5b1dc92b6421deb643cbcff8a68 WHIRLPOOL 6a8bf6c0f9fb02501ffcbd894334e8848241c8e505f588d55d5e023f066ea06b7ce97744c14955a0be8ba521b80558327049f32fa5e50068d9dbdeb082b2d0bb
-MISC ChangeLog 1691 SHA256 6f2f48b9297a36605e014bcaf5e6e18e061176d483f02e1ab1b11cb17ddc432f SHA512 2bb09c2789268f1adf5b0f598fa7a6fdc8b03ebf93a9d4a3880bf13adb7d8c14cfdf2fbfec0a6c2666c3cb21e07443acf430510ab2b1d669ce684c8f76299359 WHIRLPOOL c413fce58041332952a9a6343bd344850d3fb2c90c9dbd59382caf3f5168d155bf101b1c6d8d2a0eb205288e8d52a01701c6143582949c846b7633ad87325ef8
+MISC ChangeLog 1899 SHA256 4b44f90e6cb994cdb867837b940800e50dc6ea902be2743c351fe4e99f3d6a9e SHA512 123e2ed5d00142ecc77f65804c6b12ff0a38122b03964171955085ba810eaa28e552ebcde13c2ee1eb534aeee636fae369925da541b69275f984cfce07ee1aee WHIRLPOOL f291d1fc3b431bdbbf028d3bee44d52c05f27a487d4753ba447b46d2c139197b8104ee0c73e45b134c1866cf3e58e978404fc8a26e3dd6514bd5838b2c983a7f
 MISC metadata.xml 1089 SHA256 d1d9811cfc3649763d90d459c42c68b2c8bcf08c419e03de8b1616263628ab90 SHA512 3a212632f94dfd01128b9c27ea782ab7f499857346d468de7d375eca0f0dd8c7319d03e64c80bb66b6c24836146bae6d305cbc618b6cc8b9fc1c7a2dc369b8c8 WHIRLPOOL 08a4b45f9b3463df0dbbfbdcbade30492697d5102272a9e758536ed1c24f2ea5113fa91271dfd2050ef5cbcdd2768e3b49fb45c4b3e0a5a1a11100710d5d1923
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSKN99XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOB6YQAMIVozOnemc8ure/h8Pn6yC+
-wZuz6t2MkRu0p2SNsvqegkQ/3WAZt8pSJBr4UpNFNIEGNi0K3Sh2deEzbjwIHB8s
-6SMMmy9B8r0QaW0jSpMa6AE7KznV7uwsDZycxj0zEM+2xShNZGGmrzd51Fya2pfH
-GXFRnmGuk7kgn4mph3jcNRTLKYyNcCVwcVahCLokZ9016umlj2F0n4oFA0RHpCng
-UuL0R+xHkpV2zwthVqBRB88S4Mk7TYg3gmBY1pSnU1OZzz89nqmWUupGU3Z3zrNM
-61oPDMUfR6yh6m0mfi3kEej1bLY/iyQyLOfsT6BmMoE6asgDJrnNWKi9uzJNdMn9
-6gSWoUexxSHMOEuY7J0zvNefaiDuJl4ox57iThhr1kdVzXZtq7E9d9DTt4ZSEyrs
-5mGptGMyPcI1hnWz5lUcA2nGpmlsMk9VdB1M3Z5izm3z35DMClUKPU7XtyuaezkL
-B8Cxqbmp1AI0930x+EfCdabhijFeKBf6GSi8O4YdYy+76tCBrBrQxm4CWTcv1Qaa
-41FuOSxpUkogUTYQ27XWUdqzTJ26eMs935gYB1Zd+xWubTbc0dzmf5VZofolrNxE
-c6cUX0UP4DLV4SEtT3hmdw0iwP74HAcFybFWnqHhUCDm6J58MdqyM82pAGSKNr8d
-IlpgZhfBis80gaUB2Tv1
-=pkz/
+iQEcBAEBCAAGBQJS8/HfAAoJEFpvPKfnPDWzqvoH/2+MtC/5wWMEuLe78qPNvWOu
+eRvpqaBjmBtU3HtMe8lCmyCA9UBO6lvJ0nW0z9Tl0J52xRkbCiD1OPwozqtDBnbL
+vsTGhVMnLrwRUv0St+rWxuBzf89XugxuLaZxU7EUrFduATOGZFB4syQY5OQDqSkJ
+g02LpVkMtNaCDnEYmHmhNOWOoZYF9MXJlSfqXDlkyx0jdFxOzAI6LERGfw94vxF/
+96vZ3oKao3NJWvCQgzPxTQcxJBiBaYs6a432W1ArP4TchBZalGroOzOo/8VtQ+ML
+2TL8X+fyxiJz2zI4yBFTsq8mwzwq3rQvQGDss8DEErN8QbFxrfYEP9aBBT0aNLo=
+=7s+V
 -----END PGP SIGNATURE-----
diff --git a/games-action/openclonk/files/openclonk-5.3.3-xrandr-primary-output.patch b/games-action/openclonk/files/openclonk-5.3.3-xrandr-primary-output.patch
new file mode 100644
index 000000000000..55fb423bb498
--- /dev/null
+++ b/games-action/openclonk/files/openclonk-5.3.3-xrandr-primary-output.patch
@@ -0,0 +1,38 @@
+Description: fix XRandr use
+Author: Guillem Jover <guillem@debian.org>
+
+--- a/src/platform/C4AppGTK.cpp
++++ b/src/platform/C4AppGTK.cpp
+@@ -212,20 +212,25 @@ static XRROutputInfo* GetXRROutputInfoFo
+ 	XRRScreenResources * r = XRRGetScreenResources(dpy, w);
+ 	if (!r) return NULL;
+ 
+-	XRROutputInfo * info = XRRGetOutputInfo(dpy, r, XRRGetOutputPrimary(dpy, w));
+-	if (!info)
++	XRROutputInfo * info;
++	RROutput primary = XRRGetOutputPrimary(dpy, w);
++	if (primary == None)
++		info = NULL;
++	else
+ 	{
+-		XRRFreeScreenResources(r);
+-		return NULL;
++		info = XRRGetOutputInfo(dpy, r, primary);
++		if (info->connection == RR_Disconnected || info->crtc == 0)
++		{
++			XRRFreeOutputInfo(info);
++			info = NULL;
++		}
+ 	}
+ 
+-	if(info->connection == RR_Disconnected || info->crtc == 0)
++	if (info == NULL)
+ 	{
+ 		// The default "primary" output does not seem to be connected
+ 		// to a piece of actual hardware. As a fallback, go through
+ 		// all outputs and choose the first active one.
+-		XRRFreeOutputInfo(info);
+-		info = NULL;
+ 		for(int i = 0; i < r->noutput; ++i)
+ 		{
+ 			info = XRRGetOutputInfo(dpy, r, r->outputs[i]);
diff --git a/games-action/openclonk/openclonk-5.3.3-r1.ebuild b/games-action/openclonk/openclonk-5.3.3-r1.ebuild
new file mode 100644
index 000000000000..cae9e31922ca
--- /dev/null
+++ b/games-action/openclonk/openclonk-5.3.3-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/openclonk/openclonk-5.3.3-r1.ebuild,v 1.1 2014/02/06 20:34:40 hasufell Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_6 python2_7 )
+inherit autotools eutils flag-o-matic gnome2-utils python-any-r1 toolchain-funcs games
+
+MY_P=${PN}-release-${PV}-src
+
+DESCRIPTION="A free multiplayer action game where you control clonks"
+HOMEPAGE="http://openclonk.org/"
+SRC_URI="http://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz
+	http://${PN}.org/homepage/icon.png -> ${PN}.png"
+
+LICENSE="BSD ISC CLONK-trademark LGPL-2.1 POSTGRESQL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated doc mp3 sound upnp"
+
+RDEPEND="
+	media-libs/libpng:0
+	sys-libs/zlib
+	virtual/jpeg
+	!dedicated? (
+		media-libs/freetype:2
+		media-libs/glew
+		media-libs/libsdl[X,opengl,video]
+		virtual/opengl
+		virtual/glu
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:3
+		x11-libs/libXrandr
+		x11-libs/libX11
+		sound? (
+			media-libs/libsdl[audio]
+			media-libs/sdl-mixer[mp3?,vorbis,wav]
+		)
+	)
+	dedicated? ( sys-libs/readline:0 )
+	upnp? ( net-libs/libupnp )"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.40
+	virtual/pkgconfig
+	doc? (
+		${PYTHON_DEPS}
+		dev-libs/libxml2[python]
+		sys-devel/gettext
+		)"
+
+pkg_setup() {
+	games_pkg_setup
+	use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# remove license files
+	sed \
+		-e '/dist_doc_DATA/s#planet/COPYING ##' \
+		-e '/dist_doc_DATA/s#licenses/LGPL.txt ##' \
+		-i Makefile.am || die
+
+	epatch "${FILESDIR}"/${P}-xrandr-primary-output.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	egamesconf \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_enable dedicated console) \
+		$(use_enable sound) \
+		$(use_enable mp3) \
+		$(usex dedicated "--with-gtk=no" "--with-gtk=3.0") \
+		$(use_with upnp) \
+		--without-openal \
+		--disable-autoupdate
+}
+
+src_compile() {
+	emake AR=$(tc-getAR)
+
+	if use doc ; then
+		emake -C docs
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if ! use dedicated; then
+		newgamesbin "${FILESDIR}"/${PN}-wrapper-script.sh ${PN}
+		doicon -s 64 "${DISTDIR}"/${PN}.png
+		make_desktop_entry ${PN}
+	fi
+	use doc && dohtml -r docs/online/*
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}