add patches from Vitaly Minko for better user experience (bug #351672)

Package-Manager: portage-2.1.9.25/cvs/Linux i686

5 files changed, 58 insertions, 6 deletions

diff --git a/games-arcade/xrick/ChangeLog b/games-arcade/xrick/ChangeLog
index f0ebf9057ee0..1308cd02a0d7 100644
--- a/games-arcade/xrick/ChangeLog
+++ b/games-arcade/xrick/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-arcade/xrick
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/xrick/ChangeLog,v 1.13 2010/09/20 15:50:01 mr_bones_ Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/xrick/ChangeLog,v 1.14 2011/02/11 03:01:06 mr_bones_ Exp $
+
+  11 Feb 2011; Michael Sterrett <mr_bones_@gentoo.org>
+  xrick-021212-r1.ebuild, +files/xrick-021212-exit.patch,
+  +files/xrick-021212-fullscreen.patch:
+  add patches from Vitaly Minko for better user experience (bug #351672)
 
   20 Sep 2010; Michael Sterrett <mr_bones_@gentoo.org>
   xrick-021212-r1.ebuild:
diff --git a/games-arcade/xrick/Manifest b/games-arcade/xrick/Manifest
index d9844ade44f1..64b6a37b1002 100644
--- a/games-arcade/xrick/Manifest
+++ b/games-arcade/xrick/Manifest
@@ -1,4 +1,6 @@
+AUX xrick-021212-exit.patch 702 RMD160 4868489d991be507a3a3b13deca951ed5adbb724 SHA1 e2455e355bfb116c756fc56c7c41592082ffe5cd SHA256 98ed84db1512a57223ec81fb1b0e3f03de7719ff91ccd3a7457d3d8b699e3631
+AUX xrick-021212-fullscreen.patch 950 RMD160 4aefef04883ebc60111dad12f55e67a03d6eedab SHA1 feb0ef72d7a57d1ed348ab1ddb0e988094157391 SHA256 a92a56ee05537cdd2832d5ea46c78cbc7b5ed71728808af7d4e780d10ea7f98a
 DIST xrick-021212.tgz 1648538 RMD160 c73afbf495ec9bd6c72b67c91661143e6d93cb08 SHA1 1a84eac20a22ab86d2013cc1c8ff7e0097b4466a SHA256 aa8542120bec97a730258027a294bd16196eb8b3d66134483d085f698588fc2b
-EBUILD xrick-021212-r1.ebuild 1320 RMD160 bf11e0d9a040d9a80bcd8dfca2e7df47389ab17e SHA1 30260e2bcfd4301bb9b1683f53dffd3fec3308d7 SHA256 2a89d32ac6181049b7f5c04ad6330f1c8d6ae35e37dd2c0adb6c435cd5662a57
-MISC ChangeLog 2134 RMD160 53a586878ec5c8cfee7f9527d55a40e89ef43bf9 SHA1 2679afad0a2e02522e9aca137d9e7f9fab4e8ecc SHA256 bb882214cf2cc93686b0e6718a46d65c9039ee1174d9939946ce3391095d638f
+EBUILD xrick-021212-r1.ebuild 1354 RMD160 d8c0d0dfbdb310bcfb4d48f521151f8e80f1f7cf SHA1 297baf81a9d73fc981e36973fe6420316d82a889 SHA256 d65d82788e1e845592345d542c00736318b497aa387c2312e3be86ac1e449f04
+MISC ChangeLog 2361 RMD160 12adb8ea588ae4ba34ceaa5e9886eb747d9e2551 SHA1 832eabaea437ee888d23303d5fc85ebb8606b26b SHA256 eee0076a946fb6abbf9dc3e85f9e8928735922c16a68695d121a1278aaf1abf3
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-arcade/xrick/files/xrick-021212-exit.patch b/games-arcade/xrick/files/xrick-021212-exit.patch
new file mode 100644
index 000000000000..4486a969b346
--- /dev/null
+++ b/games-arcade/xrick/files/xrick-021212-exit.patch
@@ -0,0 +1,23 @@
+diff -ur xrick-021212/src/sysjoy.c xrick-021212.patched/src/sysjoy.c
+--- xrick-021212/src/sysjoy.c	2010-10-23 00:33:33.000000000 +0400
++++ xrick-021212.patched/src/sysjoy.c	2010-10-23 00:42:25.000000000 +0400
+@@ -56,6 +56,7 @@
+ {
+   if (j)
+     SDL_JoystickClose(j);
++  j = NULL;
+ }
+ 
+ #endif /* ENABLE_JOYSTICK */
+diff -ur xrick-021212/src/xrick.c xrick-021212.patched/src/xrick.c
+--- xrick-021212/src/xrick.c	2010-10-23 00:33:33.000000000 +0400
++++ xrick-021212.patched/src/xrick.c	2010-10-23 00:40:47.000000000 +0400
+@@ -29,7 +29,7 @@
+ 		data_setpath("/usr/games/lib/xrick/data.zip");
+ 	game_run();
+ 	data_closepath();
+-	sys_shutdown();
++    /* sys_shutdown is called via atexit */
+ 	return 0;
+ }
+ 
diff --git a/games-arcade/xrick/files/xrick-021212-fullscreen.patch b/games-arcade/xrick/files/xrick-021212-fullscreen.patch
new file mode 100644
index 000000000000..97271a33a28e
--- /dev/null
+++ b/games-arcade/xrick/files/xrick-021212-fullscreen.patch
@@ -0,0 +1,21 @@
+diff -ur xrick-021212/src/sysvid.c xrick-021212.patched/src/sysvid.c
+--- xrick-021212/src/sysvid.c	2002-12-24 16:33:43.000000000 +0300
++++ xrick-021212.patched/src/sysvid.c	2011-01-14 03:03:16.636668016 +0300
+@@ -145,10 +145,14 @@
+     IFDEBUG_VIDEO(sys_printf("xrick/video: SDL says, use these modes:\n"););
+     for (i = 0; modes[i]; i++) {
+       IFDEBUG_VIDEO(sys_printf("  %dx%d\n", modes[i]->w, modes[i]->h););
+-      if (modes[i]->w <= modes[mode]->w && modes[i]->w >= SYSVID_WIDTH &&
+-	  modes[i]->h * SYSVID_WIDTH >= modes[i]->w * SYSVID_HEIGHT) {
++      if ((!fszoom && modes[i]->w <= modes[mode] &&
++	   modes[i]->w >= SYSVID_WIDTH) ||
++	  (fszoom && modes[i]->w > modes[mode]->w)) {
+ 	mode = i;
+-	fszoom = modes[mode]->w / SYSVID_WIDTH;
++	if (modes[i]->h * SYSVID_WIDTH >= modes[i]->w * SYSVID_HEIGHT)
++	  fszoom = modes[mode]->w / SYSVID_WIDTH;
++	else
++	  fszoom = modes[mode]->h / SYSVID_HEIGHT;
+       }
+     }
+     if (fszoom != 0) {
diff --git a/games-arcade/xrick/xrick-021212-r1.ebuild b/games-arcade/xrick/xrick-021212-r1.ebuild
index 3571a4fdf740..c7ee9585bafe 100644
--- a/games-arcade/xrick/xrick-021212-r1.ebuild
+++ b/games-arcade/xrick/xrick-021212-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/xrick/xrick-021212-r1.ebuild,v 1.14 2010/09/20 15:50:01 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/xrick/xrick-021212-r1.ebuild,v 1.15 2011/02/11 03:01:06 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils games
@@ -24,6 +24,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}*.patch
 	sed -i \
 		-e "/^run from/d" \
 		-e "/data.zip/ s:the directory where xrick is:$(games_get_libdir)/${PN}.:" \