Improve xinerama handling #145917 by Diego Pettenò.

Package-Manager: portage-2.1.1_rc1-r2

4 files changed, 45 insertions, 14 deletions

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index c3694bb01d93..9139f7dd3a26 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libsdl
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.105 2006/06/27 07:05:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.106 2006/09/04 02:06:45 vapier Exp $
+
+  04 Sep 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/libsdl-1.2.11-xinerama-head-0.patch, libsdl-1.2.11.ebuild:
+  Improve xinerama handling #145917 by Diego Pettenò.
 
 *libsdl-1.2.11 (27 Jun 2006)
 
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index 236124f644c3..dddc4b360c6d 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -57,6 +57,10 @@ AUX libsdl-1.2.10-sdl-config.patch 780 RMD160 63a3f86cd25011d0d1e983d89910d4bceb
 MD5 2d9bced29ca7e5c69410ce1e3ff58e09 files/libsdl-1.2.10-sdl-config.patch 780
 RMD160 63a3f86cd25011d0d1e983d89910d4bceb965e86 files/libsdl-1.2.10-sdl-config.patch 780
 SHA256 1c73cc815ae4f6fdaee3dc899a9f38e9f29f88e3997070c9fba226b36dbed015 files/libsdl-1.2.10-sdl-config.patch 780
+AUX libsdl-1.2.11-xinerama-head-0.patch 882 RMD160 41cd75c0eaeff10484c363c829a7f022c3dcc261 SHA1 ff63d7c1e8e4876a15a0b13e3b3f99fb7c14accb SHA256 612b6e5aeb0b155fa516124dce73a62a57ee5ab46b39c2ab67ae77de69ec0b8d
+MD5 28c2c921b567ca84a2df0ba29d8d0ba6 files/libsdl-1.2.11-xinerama-head-0.patch 882
+RMD160 41cd75c0eaeff10484c363c829a7f022c3dcc261 files/libsdl-1.2.11-xinerama-head-0.patch 882
+SHA256 612b6e5aeb0b155fa516124dce73a62a57ee5ab46b39c2ab67ae77de69ec0b8d files/libsdl-1.2.11-xinerama-head-0.patch 882
 AUX libsdl-1.2.6-fullscreen.patch 1094 RMD160 6e76b71881b42712d88413a601bec8b3193d732f SHA1 f3c3d3592f209cce92efef9b0da755303aaad4d9 SHA256 e9a4a17e98761c8e2e202bed06dbe614f45dd44e4382f0e855880a5bf4c82887
 MD5 419d8c241f85b4deba895c615faa5612 files/libsdl-1.2.6-fullscreen.patch 1094
 RMD160 6e76b71881b42712d88413a601bec8b3193d732f files/libsdl-1.2.6-fullscreen.patch 1094
@@ -125,10 +129,10 @@ DIST SDL-1.2.11.tar.gz 2796143 RMD160 1ea73d45dcecde9df8e4b5c18e7cbcaedb1e4c59 S
 DIST SDL-1.2.7.tar.gz 2470936 RMD160 2e19851fca8dac81c8d07cb39b8757aa54093023 SHA1 1a840c50668f230df9e9163ef1a282d9f3355383 SHA256 f5708b3909261df2043859e771601a5ec973197b2c59d18c6649c1096b5151bd
 DIST SDL-1.2.8.tar.gz 2602449 RMD160 91aa02f6b52792b3ec7f5478bcaebda1542980dc SHA1 26f2104a60a28914b809d3cb77d5790bfdfd024c SHA256 6508abb6068df597896da4e926606bb80c0b03ebfb8cf0017471fdb41307125a
 DIST SDL-1.2.9.tar.gz 2688179 RMD160 9faeeda9cf8f649a2b506e9db7c5cedb4512cfe7 SHA1 8140de00e73ccdbdee196fa8fd9952ddb3cc75f1 SHA256 d5a168968051536641ab5a3ba5fc234383511c77a8bc5ceb8bed619bdd42e5f9
-EBUILD libsdl-1.2.11.ebuild 4567 RMD160 070dc4ee9a0670b0ade3364f037c8afd750c123a SHA1 626ca039643717e20513de3a71983b43972b9288 SHA256 892140be821730540d821fd44ecc4ce50103a263bb05b9a4e7ed7b8f930911ad
-MD5 b3969aefe488a18f644336da7594fdd9 libsdl-1.2.11.ebuild 4567
-RMD160 070dc4ee9a0670b0ade3364f037c8afd750c123a libsdl-1.2.11.ebuild 4567
-SHA256 892140be821730540d821fd44ecc4ce50103a263bb05b9a4e7ed7b8f930911ad libsdl-1.2.11.ebuild 4567
+EBUILD libsdl-1.2.11.ebuild 4633 RMD160 5066e7c8145d4ae87d7bb10ac10acb3e9561974e SHA1 3ea9176f3f03e08d08150f7a99dc4b10f0147687 SHA256 c6795cad19bad31462a0fa7d105c9536a8a58ae788b516232f35369f1a123116
+MD5 e8c9a3f0a566dc5eb90e91ba62a8222d libsdl-1.2.11.ebuild 4633
+RMD160 5066e7c8145d4ae87d7bb10ac10acb3e9561974e libsdl-1.2.11.ebuild 4633
+SHA256 c6795cad19bad31462a0fa7d105c9536a8a58ae788b516232f35369f1a123116 libsdl-1.2.11.ebuild 4633
 EBUILD libsdl-1.2.7-r3.ebuild 4269 RMD160 78ca7654af8eca755e73c58b1c5d6d6b6998612e SHA1 61c2d2c90e4e31551fac4c557823b4b25016a557 SHA256 1eb38d7e30a20096b1480a62a6a759a436fa4b40688dbd2ca86da0e434a1fc05
 MD5 5c56de3cfb83340e0d889828dd372194 libsdl-1.2.7-r3.ebuild 4269
 RMD160 78ca7654af8eca755e73c58b1c5d6d6b6998612e libsdl-1.2.7-r3.ebuild 4269
@@ -145,10 +149,10 @@ EBUILD libsdl-1.2.9.ebuild 4643 RMD160 aac01c7a3f935649f1d64a166c3892ca62b9282c
 MD5 62041b7bb258830e75ef4464d7124598 libsdl-1.2.9.ebuild 4643
 RMD160 aac01c7a3f935649f1d64a166c3892ca62b9282c libsdl-1.2.9.ebuild 4643
 SHA256 2aa67035dea53f4f861205e03998be56b93980af0783b3cfd1b8c886f2cee74c libsdl-1.2.9.ebuild 4643
-MISC ChangeLog 16775 RMD160 75e833d989f5a92a756f1b513423f7bc980e9b10 SHA1 bca252224ada0654fe0b4b9f3d77f1cf4d66a54e SHA256 eb7f6b42f7b186a126b8024014f152d805070acf2d246cd5401f8e7d990d7c34
-MD5 05101fd0f8da9bfdace3c38fa7d0b5cf ChangeLog 16775
-RMD160 75e833d989f5a92a756f1b513423f7bc980e9b10 ChangeLog 16775
-SHA256 eb7f6b42f7b186a126b8024014f152d805070acf2d246cd5401f8e7d990d7c34 ChangeLog 16775
+MISC ChangeLog 16949 RMD160 4538b357eae298ec9541ff750532e3c5c1a9a365 SHA1 943065b6494db25c41acd7ba31d28fb61f5959aa SHA256 9e4ffa51b69787c9c8b3a30eca2eedfce07013e19a6bdb8b9cea68abd761ac4d
+MD5 66eb1346bc2989e452e785fa0db80968 ChangeLog 16949
+RMD160 4538b357eae298ec9541ff750532e3c5c1a9a365 ChangeLog 16949
+SHA256 9e4ffa51b69787c9c8b3a30eca2eedfce07013e19a6bdb8b9cea68abd761ac4d ChangeLog 16949
 MISC metadata.xml 974 RMD160 61d8f32b069dc30e7b853b25d1d73020f73cda8f SHA1 8f8471103d29e564169640539c3a2a6a7de5b8c7 SHA256 e575130f8fd4925956581f5d4230469e915b1a8d63269cc0aa3510f3a4743b9b
 MD5 baaaa69f33ef9027dac84ee4ff02773b metadata.xml 974
 RMD160 61d8f32b069dc30e7b853b25d1d73020f73cda8f metadata.xml 974
@@ -169,9 +173,9 @@ MD5 9a82f7d6f977d33cf4798db219567aff files/digest-libsdl-1.2.9-r1 232
 RMD160 7ee7dbb3ace160e63a7dc79446fa4ce633e9d1b8 files/digest-libsdl-1.2.9-r1 232
 SHA256 8e70be29548aa63e313575f311c63363981a0fb40b69b689a923fd9b80fbeea7 files/digest-libsdl-1.2.9-r1 232
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE1iDeamhnQswr0vIRAmfAAJ9c78GvCu9CrQtk4i1xVurLW7EHDQCeIRVR
-f0jCKumzXwFS/NqoJFaBqCQ=
-=WyTB
+iD8DBQFE+4phamhnQswr0vIRAjyRAKCbFaCbuScut4REP1+Y6RwkcvVebACfWbOM
+6V0UM0qUR69N7RVjS1HnDz0=
+=D17c
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libsdl/files/libsdl-1.2.11-xinerama-head-0.patch b/media-libs/libsdl/files/libsdl-1.2.11-xinerama-head-0.patch
new file mode 100644
index 000000000000..56c8af1a6a4b
--- /dev/null
+++ b/media-libs/libsdl/files/libsdl-1.2.11-xinerama-head-0.patch
@@ -0,0 +1,22 @@
+http://bugs.gentoo.org/145917
+
+--- SDL-1.2.11/src/video/x11/SDL_x11modes.c
++++ SDL-1.2.11/src/video/x11/SDL_x11modes.c
+@@ -509,7 +509,7 @@ int X11_GetVideoModes(_THIS)
+     /* Query Xinerama extention */
+     if ( CheckXinerama(this, &xinerama_major, &xinerama_minor) ) {
+         /* Find out which screen is the desired one */
+-        int desired = 0;
++        int desired = -1;
+         int screens;
+         int w, h;
+         SDL_NAME(XineramaScreenInfo) *xinerama;
+@@ -630,7 +630,7 @@ int X11_GetVideoModes(_THIS)
+     /* XVidMode */
+     if ( !use_xrandr &&
+ #if SDL_VIDEO_DRIVER_X11_XINERAMA
+-         (!use_xinerama || xinerama_info.screen_number == 0) &&
++         (!use_xinerama || xinerama_info.screen_number == -1) &&
+ #endif
+          CheckVidMode(this, &vm_major, &vm_minor) &&
+          SDL_NAME(XF86VidModeGetAllModeLines)(SDL_Display, SDL_Screen,&nmodes,&modes) )
diff --git a/media-libs/libsdl/libsdl-1.2.11.ebuild b/media-libs/libsdl/libsdl-1.2.11.ebuild
index 787d226f8add..66c082db98fd 100644
--- a/media-libs/libsdl/libsdl-1.2.11.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.11.ebuild,v 1.3 2006/08/06 17:03:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.11.ebuild,v 1.4 2006/09/04 02:06:45 vapier Exp $
 
 inherit flag-o-matic toolchain-funcs eutils libtool
 
@@ -77,6 +77,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/libsdl-1.2.10-libcaca.patch #40224
 	epatch "${FILESDIR}"/libsdl-1.2.10-sdl-config.patch
+	epatch "${FILESDIR}"/libsdl-1.2.11-xinerama-head-0.patch #145917
 
 	# add yasm-compatible defines to nasm code (hopefully we
 	# can get this killed soonish)