Revision bump: add fix for segfault issue during video device detection, discovered in bug #458504

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

4 files changed, 84 insertions, 2 deletions

diff --git a/games-arcade/sdl-sopwith/ChangeLog b/games-arcade/sdl-sopwith/ChangeLog
index 37a691f627cd..8e8b167be3b6 100644
--- a/games-arcade/sdl-sopwith/ChangeLog
+++ b/games-arcade/sdl-sopwith/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-arcade/sdl-sopwith
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/sdl-sopwith/ChangeLog,v 1.16 2013/01/21 05:09:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/sdl-sopwith/ChangeLog,v 1.17 2013/02/21 18:22:27 pinkbyte Exp $
+
+*sdl-sopwith-1.7.5-r1 (21 Feb 2013)
+
+  21 Feb 2013; Sergey Popov <pinkbyte@gentoo.org> +sdl-sopwith-1.7.5-r1.ebuild,
+  +files/sdl-sopwith-1.7.5-video-fix.patch:
+  Revision bump: add fix for segfault issue during video device detection,
+  discovered in bug #458504
 
 *sdl-sopwith-1.7.5 (21 Jan 2013)
 
diff --git a/games-arcade/sdl-sopwith/Manifest b/games-arcade/sdl-sopwith/Manifest
index 2d10815c0e4b..c4770d4bf8d3 100644
--- a/games-arcade/sdl-sopwith/Manifest
+++ b/games-arcade/sdl-sopwith/Manifest
@@ -1,8 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX sdl-sopwith-1.7.4-nogtk.patch 972 SHA256 b77bd7f2c78777ec0dc738fd3121277bbf0dd4ca5cc22ad23d714cd225f3cb72 SHA512 2ae4ae6ace64af55d46fe543c7573d5306c1c410e0e21c6ab58cb893cdb79c8c5e6ac49a4203671c3697c2590d85f0e6d776ae43ed29a76acf2e6669efa81c17 WHIRLPOOL 300cdcbf635bfe4a8784b2ac1678efa7cba6af3c1d5ff8702c5bbf196a0c8210006e03a55360cc106d70ee73878d81c5a1b11aff2700336424bdb9cbf042dc29
 AUX sdl-sopwith-1.7.5-nogtk.patch 972 SHA256 b77bd7f2c78777ec0dc738fd3121277bbf0dd4ca5cc22ad23d714cd225f3cb72 SHA512 2ae4ae6ace64af55d46fe543c7573d5306c1c410e0e21c6ab58cb893cdb79c8c5e6ac49a4203671c3697c2590d85f0e6d776ae43ed29a76acf2e6669efa81c17 WHIRLPOOL 300cdcbf635bfe4a8784b2ac1678efa7cba6af3c1d5ff8702c5bbf196a0c8210006e03a55360cc106d70ee73878d81c5a1b11aff2700336424bdb9cbf042dc29
+AUX sdl-sopwith-1.7.5-video-fix.patch 670 SHA256 ea725ad194ae303aede2614799ea32f1aca32c3720f297c089dd7dcbc27d8d78 SHA512 0ecfd8c7cd3161c1b398a27330e4ce26d52e8c42add2ab0bade235d41c716a522eb7499f2960a2ce0748585045b15f5580054acddf5f8707d6f4552d4db7c701 WHIRLPOOL 3e4384a0554807e0fcb78f91e6f9051a5278ec9dcfe7ce4e24225ee484e1caa44c700908cf6af4112d6754bd4c08d0b49cc486b4308d7edacd17b80da60cba4c
 DIST sopwith-1.7.4.tar.gz 278793 SHA256 eadbcae0190d874896a73a621d99f55ca5d063710c7a80f58b8bfa928a9a8126
 DIST sopwith-1.7.5.tar.gz 280883 SHA256 71cfffb56cfa8c44cb4e5ffdd826ca7146ef2879d679219d92c06be6b5248b9a SHA512 ea78706d0190648be269142a29d10340c5181563959b0a329b802b9d9128a9dcb1e01760737269ec22883adf5b6c02c5049c8fc7b44e4eaa9f381b87abc7acae WHIRLPOOL 11c7ff9a6c333f46bb98b40e1943e78fb9a6079742dac7fcd3c621def3a0109b49b987627af00dd3112a9bef8c5a0fb9631d787b5b27a452656c06ed8aeb67d6
 EBUILD sdl-sopwith-1.7.4.ebuild 825 SHA256 e8294d9745ae5fa1cd0a40ac10a23bffa8c31630391fee9076c2d8688e1026ba SHA512 f6317c10f480adbdcfa4b0f8d6f1015845d2d4f269f76133ef1e34af950d94139a6006d0a2e7376afba3ac35d02fa5d348205426ee472b3058e52f6384fa399b WHIRLPOOL e9bf59e199478842d86e4a3f83dc865fdfaabf251111df9eef5bc4df29aa306e30e1c05eb3188c172840e1405634f1a1873d620ded9e9a6d0b445e6a8e13c13d
+EBUILD sdl-sopwith-1.7.5-r1.ebuild 889 SHA256 a03a3bbf1c98f29b010bdc3783c72c7b5830bcb91dad767fa25ae9e3745350ee SHA512 ca5407048f86f4b986980b459f8d2dfeeee7606d1b619ad876029c08f08220f87b6456295ed69e884a6c341c106544cc326b6abd34a4dc3342d059bc9883c095 WHIRLPOOL d397eac4713f18c4eedd8b32b1ed3237a8ce2432809a3031181fd893da85a256fca92a9fd133b3daa20ad896647ddb930225e457ce97e652dc6fa5f4d04f99b8
 EBUILD sdl-sopwith-1.7.5.ebuild 830 SHA256 135bbf9231e71ef16722287ecd21292a57a57788fa38182e6af39ab7a577cc2d SHA512 4642e2385c537d3514d60fd42195161b45e20f7adfd7b78a44f698471c0574de8d6af6e1eaeb8d8623f33dc74768c6e305ef99bc7f6d0bd8dbef871c17fbb11e WHIRLPOOL fec89c0d15bc708c13b934da4768268dbc8833d1c3a3446c498742f0083f747c2651a6a07025ccc34de20d2c3a7675c3ef9361c3e1df600ba27e911f08015a01
-MISC ChangeLog 2450 SHA256 5835e77638ef354398cd1c374fc38bfeeb4695393e5c1142def25e18591f8bc2 SHA512 0bdda813f3f7ebb8c0cdff3360f4e6e93268ab94b160e311c3854d91298f6bb93b774efccf23c732aae748415bd3d94a04d6bd47ac8d8acb93ef9bf1c9b5356c WHIRLPOOL 78dfbe5ab5d230f86a8c340c132defdf3b0a122d05d794fa19642effb320b9b24032696be9f69a7c7e87813fba2b8c3dbbf82ef9179c6b5c78afa7f3aa2cfdf3
+MISC ChangeLog 2714 SHA256 1c561030d185396a67353889018ef9cc9aa38f1aa98341f42b9f77aa173d6e61 SHA512 177987583c92bce50971609dbfde9ef185a576e4236b41a9fbfd4ed8803a2250c2011ad60cb7c86eace83af054b1d1a3b2e15468257d5850997e204f22813b7b WHIRLPOOL ae21b6b2530d34acbf1fd9f4eabffebcd50ed028755cd2c85f5a79b1cfe5189e60a587a685fa1d6c2a7b59b2f596ef3240e40fbc697de6ffb37fdb3c587efd00
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRJmXkAAoJECo/aRed9267414IALsB/H4axOgsdDo8NHjxoBUH
+n1PRIF1wKoMZV66A/ckPhiXeCHg1/xEAK512AnH7rJbHMR34sJVBs2BcL9vYPxi6
+rzXUEMApR5Dt7ZkAi52tgGD19IHQS9GCOom9IuAevi4oYNJYc/4P2tKXqkRihsPS
+auvBpCeI3CTryQ0VBnQute45zniRo0W3uvQuuFCSGjPomnMIUfoD+u+9eEwTMsZs
+mcp0qJsZWo0x1AsWbcQhzSxVuBFTUh+aV7qnTvPMeD5sZiQo0Vd5A2RopajAblcG
+O4MkNHuCuBOHsebZdV5asHD8KjYuDQeFN3x/lwp6n3IQGpra+XjwCpq2NdZ5nsQ=
+=J9jt
+-----END PGP SIGNATURE-----
diff --git a/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-video-fix.patch b/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-video-fix.patch
new file mode 100644
index 000000000000..feab635518f1
--- /dev/null
+++ b/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-video-fix.patch
@@ -0,0 +1,24 @@
+Upstream patch: fix segfault while video device detection.
+Discovered here - https://bugs.gentoo.org/show_bug.cgi?id=458504
+
+--- src/sdl/video.c.orig	2013-02-21 11:48:57.000000000 -0400
++++ src/sdl/video.c	2013-02-21 11:49:35.000000000 -0400
+@@ -364,11 +364,17 @@
+ 	int n;
+ 	int w, h;
+ 	int flags = 0;
++        int status;
+ 
+ 	printf("CGA Screen Emulation\n");
+ 	printf("init screen: ");
+ 
+-	SDL_Init(SDL_INIT_VIDEO);
++	status = SDL_Init(SDL_INIT_VIDEO);
++        if (status == -1)
++        {
++          fprintf(stderr, "Unable to locate video device. Exiting.\n");
++          exit(1);
++        }
+
+ 	srand(time(NULL));
+ 	set_icon(symbol_plane[rand() % 2][rand() % 16]);
diff --git a/games-arcade/sdl-sopwith/sdl-sopwith-1.7.5-r1.ebuild b/games-arcade/sdl-sopwith/sdl-sopwith-1.7.5-r1.ebuild
new file mode 100644
index 000000000000..63a2348b2615
--- /dev/null
+++ b/games-arcade/sdl-sopwith/sdl-sopwith-1.7.5-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/sdl-sopwith/sdl-sopwith-1.7.5-r1.ebuild,v 1.1 2013/02/21 18:22:27 pinkbyte Exp $
+
+EAPI=2
+inherit eutils autotools games
+
+MY_P=${P/sdl-/}
+DESCRIPTION="Port of the classic Sopwith game using LibSDL"
+HOMEPAGE="http://sdl-sopwith.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=media-libs/libsdl-1.1.3[video]"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	rm acconfig.h
+	epatch "${FILESDIR}"/${P}-nogtk.patch
+	# bug 458504
+	epatch "${FILESDIR}"/${P}-video-fix.patch
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog FAQ NEWS README TODO doc/*txt
+	rm -rf "${D}/usr/games/share/"
+	prepgamesdirs
+}