Fix for no xinerama in USE, bug #134386

Package-Manager: portage-2.1_rc3-r1

8 files changed, 107 insertions, 28 deletions

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index 8838c301e734..a3fb65c5b329 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.101 2006/05/26 05:26:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.102 2006/05/29 18:57:34 tupone Exp $
+
+  29 May 2006; <Tupone@gentoo.org> +files/libsdl-1.2.10-noxinerama.patch,
+  libsdl-1.2.10.ebuild:
+  Fix for no xinerama, bug #134386 by Takano Akio
 
 *libsdl-1.2.10 (26 May 2006)
 
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index 750a481c9426..ead0f8ec62e2 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -53,6 +53,10 @@ AUX libsdl-1.2.10-libcaca.patch 17034 RMD160 d6ee0da79f21fa69ef0d3ad4b1e9fa76815
 MD5 5110a1432def77889f6f88fae64e2c9d files/libsdl-1.2.10-libcaca.patch 17034
 RMD160 d6ee0da79f21fa69ef0d3ad4b1e9fa76815dfa01 files/libsdl-1.2.10-libcaca.patch 17034
 SHA256 930bda73223f4d00dd979ae2b7dd86c51ae57a310ec3a4d5e97dbac452d8e3a0 files/libsdl-1.2.10-libcaca.patch 17034
+AUX libsdl-1.2.10-noxinerama.patch 2254 RMD160 3effa528a0358d805ae421df5a3c7f47cedd4fcf SHA1 c7d86f162e6254fbe1ab3b081459d1a031e90f6d SHA256 3e4394d5727371a7b4b57a37f80f00fe4959a0cfb257af41baac6b8a1e7e8935
+MD5 d4a9a624e70ffc9adef9c09a4b62e4be files/libsdl-1.2.10-noxinerama.patch 2254
+RMD160 3effa528a0358d805ae421df5a3c7f47cedd4fcf files/libsdl-1.2.10-noxinerama.patch 2254
+SHA256 3e4394d5727371a7b4b57a37f80f00fe4959a0cfb257af41baac6b8a1e7e8935 files/libsdl-1.2.10-noxinerama.patch 2254
 AUX libsdl-1.2.10-sdl-config.patch 780 RMD160 63a3f86cd25011d0d1e983d89910d4bceb965e86 SHA1 01c8d54cb8a22ea2a1e898b3ca39f9baca07dc98 SHA256 1c73cc815ae4f6fdaee3dc899a9f38e9f29f88e3997070c9fba226b36dbed015
 MD5 2d9bced29ca7e5c69410ce1e3ff58e09 files/libsdl-1.2.10-sdl-config.patch 780
 RMD160 63a3f86cd25011d0d1e983d89910d4bceb965e86 files/libsdl-1.2.10-sdl-config.patch 780
@@ -122,13 +126,13 @@ MD5 7335dd719002ab81477446278b2f786f files/libsdl-1.2.9-sdl-blit-mmx-check.patch
 RMD160 18eb2d7b0b6fef9e0c47f4917fdb31faf37a0021 files/libsdl-1.2.9-sdl-blit-mmx-check.patch 551
 SHA256 2dc359619d9af0cd418577b364c3395d9e3093fcfdd0195e9a0ebe62df3e4aaf files/libsdl-1.2.9-sdl-blit-mmx-check.patch 551
 DIST SDL-1.2.10.tar.gz 2792344 RMD160 e2e73a580638ab29d4b000152ed80999545e9fb5 SHA1 ad64b3b58b3cf83a28a1c21bedf270da43118f67 SHA256 f4d384266a3174770234d40829c767ff7090f3e1a9c9fc9fd5e130f51ddf7a70
-DIST SDL-1.2.7.tar.gz 2470936
-DIST SDL-1.2.8.tar.gz 2602449
-DIST SDL-1.2.9.tar.gz 2688179
-EBUILD libsdl-1.2.10.ebuild 4356 RMD160 0c36aa7102a2e205a91fb5218256c4b6faf6211a SHA1 c5b275ede4b805b845b24dca854537fd338f0421 SHA256 4f0585ef5a904c4a73add5a79bad91be1b4be9358e6f53b45f9c838da3d8f47f
-MD5 166b0253ba9887a02fdca6d2f008bf4b libsdl-1.2.10.ebuild 4356
-RMD160 0c36aa7102a2e205a91fb5218256c4b6faf6211a libsdl-1.2.10.ebuild 4356
-SHA256 4f0585ef5a904c4a73add5a79bad91be1b4be9358e6f53b45f9c838da3d8f47f libsdl-1.2.10.ebuild 4356
+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.10.ebuild 4400 RMD160 910eabc1e1e827ddf12f477414e7d79102650cc7 SHA1 0ba2c988c0951e7696513cd7beeea15008f850b4 SHA256 e5792a79b8c12e553451c2290b47aa147a2571892b713632e777ecf989f56831
+MD5 c0249cd71e38d3412ca63d494ca0459d libsdl-1.2.10.ebuild 4400
+RMD160 910eabc1e1e827ddf12f477414e7d79102650cc7 libsdl-1.2.10.ebuild 4400
+SHA256 e5792a79b8c12e553451c2290b47aa147a2571892b713632e777ecf989f56831 libsdl-1.2.10.ebuild 4400
 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 16171 RMD160 004659b0083550723b26683246f98965e365d389 SHA1 bcb496fc824ea1fac4a950adf6aef3270ee9fec2 SHA256 6fc75b11ee3f666ecf6c4cd3736341b46a329e9e0dc033fccd1279939c757838
-MD5 0d9f0606b9ad003dd10ea4f3bc7b1a37 ChangeLog 16171
-RMD160 004659b0083550723b26683246f98965e365d389 ChangeLog 16171
-SHA256 6fc75b11ee3f666ecf6c4cd3736341b46a329e9e0dc033fccd1279939c757838 ChangeLog 16171
+MISC ChangeLog 16320 RMD160 fcc6e9970f626eac425ae36a407ad3389bed23f0 SHA1 0584ad704ef1ec600b7030e4145ead3dd0df0a0e SHA256 30482832514bda3775d249ab451131132fa4d86c0d18c667dbba2360d96c5299
+MD5 5b463c791448dd67ab2281b817a5287f ChangeLog 16320
+RMD160 fcc6e9970f626eac425ae36a407ad3389bed23f0 ChangeLog 16320
+SHA256 30482832514bda3775d249ab451131132fa4d86c0d18c667dbba2360d96c5299 ChangeLog 16320
 MISC metadata.xml 974 RMD160 61d8f32b069dc30e7b853b25d1d73020f73cda8f SHA1 8f8471103d29e564169640539c3a2a6a7de5b8c7 SHA256 e575130f8fd4925956581f5d4230469e915b1a8d63269cc0aa3510f3a4743b9b
 MD5 baaaa69f33ef9027dac84ee4ff02773b metadata.xml 974
 RMD160 61d8f32b069dc30e7b853b25d1d73020f73cda8f metadata.xml 974
@@ -156,22 +160,22 @@ SHA256 e575130f8fd4925956581f5d4230469e915b1a8d63269cc0aa3510f3a4743b9b metadata
 MD5 aa5d93c0540e95b816b1d90d0dbce35d files/digest-libsdl-1.2.10 235
 RMD160 09fcb1eff5bce9e196dfd3736e7ead0d0b520b57 files/digest-libsdl-1.2.10 235
 SHA256 884be8dbec06d8824f6e583f8f2ad16f057cb9708b70d7b914b55aa466975c7c files/digest-libsdl-1.2.10 235
-MD5 2e9d99f7ab858b5a64d124abea4565b9 files/digest-libsdl-1.2.7-r3 62
-RMD160 c04aa24561002b68478108efe776f5e3674362a9 files/digest-libsdl-1.2.7-r3 62
-SHA256 47186061882d9f9c723e8e6872fdd6e0e2b7040e8d335659cfdf4a6ae31a60ec files/digest-libsdl-1.2.7-r3 62
-MD5 4ce5ec18eafcf0b1c6caf31c9f67cb1d files/digest-libsdl-1.2.8-r1 62
-RMD160 df7cf704ae83eb933f91ee949f3188eb8a824daf files/digest-libsdl-1.2.8-r1 62
-SHA256 ccda51f5a47c21ffdf106acdfc794416f11080471d77d9e0447303cf875b64cc files/digest-libsdl-1.2.8-r1 62
-MD5 614874c27d89a83dba0cf9754f6fad6e files/digest-libsdl-1.2.9 62
-RMD160 12de9a79d9a7131d3ce3b4ba883e35d10acd1011 files/digest-libsdl-1.2.9 62
-SHA256 3cce938068213f4f37dff77781a8fd56736d5c68927c71f9b42bc0153992b39b files/digest-libsdl-1.2.9 62
-MD5 614874c27d89a83dba0cf9754f6fad6e files/digest-libsdl-1.2.9-r1 62
-RMD160 12de9a79d9a7131d3ce3b4ba883e35d10acd1011 files/digest-libsdl-1.2.9-r1 62
-SHA256 3cce938068213f4f37dff77781a8fd56736d5c68927c71f9b42bc0153992b39b files/digest-libsdl-1.2.9-r1 62
+MD5 7e12e011a146009e9cb3d75d5987624a files/digest-libsdl-1.2.7-r3 232
+RMD160 a86b949aa66febb54d4fde7a16ed2d7abb7180ce files/digest-libsdl-1.2.7-r3 232
+SHA256 eb73104e3f6dc374ae6d803d1600366aeab065c0ef3ee0754c97e47813e47092 files/digest-libsdl-1.2.7-r3 232
+MD5 52aabcc9bd8d380505e28a1377933756 files/digest-libsdl-1.2.8-r1 232
+RMD160 f7fe787dda8a0b7b7dbf0a211965be4776ff1a6b files/digest-libsdl-1.2.8-r1 232
+SHA256 62ddc76ccdbec2adf70d3f01ac729221ea55b45767de582fef8a5a147e85e74d files/digest-libsdl-1.2.8-r1 232
+MD5 9a82f7d6f977d33cf4798db219567aff files/digest-libsdl-1.2.9 232
+RMD160 7ee7dbb3ace160e63a7dc79446fa4ce633e9d1b8 files/digest-libsdl-1.2.9 232
+SHA256 8e70be29548aa63e313575f311c63363981a0fb40b69b689a923fd9b80fbeea7 files/digest-libsdl-1.2.9 232
+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.3 (GNU/Linux)
 
-iD8DBQFEdpJK2+ySkm8kpY0RArWOAKC+7w0rQTM31KWFjk4wPxLSthRFHwCeJEQt
-BT23OOtPpvUGh8hekTYUsBE=
-=ZV7c
+iD8DBQFEe0Qt2CTtIKiFlQIRAszTAJ9lJE3XFTkWUKmW2DXpPSmvK9qF0ACfZHMs
+c9eduurg0KeZ6Lcx1OCguO8=
+=yJuT
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libsdl/files/digest-libsdl-1.2.7-r3 b/media-libs/libsdl/files/digest-libsdl-1.2.7-r3
index e52820076cbe..81733274e550 100644
--- a/media-libs/libsdl/files/digest-libsdl-1.2.7-r3
+++ b/media-libs/libsdl/files/digest-libsdl-1.2.7-r3
@@ -1 +1,3 @@
 MD5 d29b34b6ba3ed213893fc9d8d35e357a SDL-1.2.7.tar.gz 2470936
+RMD160 2e19851fca8dac81c8d07cb39b8757aa54093023 SDL-1.2.7.tar.gz 2470936
+SHA256 f5708b3909261df2043859e771601a5ec973197b2c59d18c6649c1096b5151bd SDL-1.2.7.tar.gz 2470936
diff --git a/media-libs/libsdl/files/digest-libsdl-1.2.8-r1 b/media-libs/libsdl/files/digest-libsdl-1.2.8-r1
index e3eee3d4428d..36873368c3c6 100644
--- a/media-libs/libsdl/files/digest-libsdl-1.2.8-r1
+++ b/media-libs/libsdl/files/digest-libsdl-1.2.8-r1
@@ -1 +1,3 @@
 MD5 37aaf9f069f9c2c18856022f35de9f8c SDL-1.2.8.tar.gz 2602449
+RMD160 91aa02f6b52792b3ec7f5478bcaebda1542980dc SDL-1.2.8.tar.gz 2602449
+SHA256 6508abb6068df597896da4e926606bb80c0b03ebfb8cf0017471fdb41307125a SDL-1.2.8.tar.gz 2602449
diff --git a/media-libs/libsdl/files/digest-libsdl-1.2.9 b/media-libs/libsdl/files/digest-libsdl-1.2.9
index c3c1f27988af..e1fb636f47d7 100644
--- a/media-libs/libsdl/files/digest-libsdl-1.2.9
+++ b/media-libs/libsdl/files/digest-libsdl-1.2.9
@@ -1 +1,3 @@
 MD5 80919ef556425ff82a8555ff40a579a0 SDL-1.2.9.tar.gz 2688179
+RMD160 9faeeda9cf8f649a2b506e9db7c5cedb4512cfe7 SDL-1.2.9.tar.gz 2688179
+SHA256 d5a168968051536641ab5a3ba5fc234383511c77a8bc5ceb8bed619bdd42e5f9 SDL-1.2.9.tar.gz 2688179
diff --git a/media-libs/libsdl/files/digest-libsdl-1.2.9-r1 b/media-libs/libsdl/files/digest-libsdl-1.2.9-r1
index c3c1f27988af..e1fb636f47d7 100644
--- a/media-libs/libsdl/files/digest-libsdl-1.2.9-r1
+++ b/media-libs/libsdl/files/digest-libsdl-1.2.9-r1
@@ -1 +1,3 @@
 MD5 80919ef556425ff82a8555ff40a579a0 SDL-1.2.9.tar.gz 2688179
+RMD160 9faeeda9cf8f649a2b506e9db7c5cedb4512cfe7 SDL-1.2.9.tar.gz 2688179
+SHA256 d5a168968051536641ab5a3ba5fc234383511c77a8bc5ceb8bed619bdd42e5f9 SDL-1.2.9.tar.gz 2688179
diff --git a/media-libs/libsdl/files/libsdl-1.2.10-noxinerama.patch b/media-libs/libsdl/files/libsdl-1.2.10-noxinerama.patch
new file mode 100644
index 000000000000..399dd9937abc
--- /dev/null
+++ b/media-libs/libsdl/files/libsdl-1.2.10-noxinerama.patch
@@ -0,0 +1,62 @@
+diff -urN SDL-1.2.10.orig/src/video/x11/SDL_x11modes.c SDL-1.2.10/src/video/x11/SDL_x11modes.c
+--- SDL-1.2.10.orig/src/video/x11/SDL_x11modes.c	2006-05-07 00:47:58.000000000 -0300
++++ SDL-1.2.10/src/video/x11/SDL_x11modes.c	2006-05-26 23:55:29.000000000 -0300
+@@ -629,7 +629,9 @@
+ #if SDL_VIDEO_DRIVER_X11_VIDMODE
+     /* XVidMode */
+     if ( !use_xrandr &&
++#if SDL_VIDEO_DRIVER_X11_XINERAMA
+          (!use_xinerama || xinerama_info.screen_number == 0) &&
++#endif
+          CheckVidMode(this, &vm_major, &vm_minor) &&
+          SDL_NAME(XF86VidModeGetAllModeLines)(SDL_Display, SDL_Screen,&nmodes,&modes) )
+     {
+@@ -901,6 +903,7 @@
+     screen_h = DisplayHeight(SDL_Display, SDL_Screen);
+ 
+ #if SDL_VIDEO_DRIVER_X11_VIDMODE
++#if SDL_VIDEO_DRIVER_X11_XINERAMA
+     if ( use_xinerama &&
+          window_w <= xinerama_info.width &&
+          window_h <= xinerama_info.height ) {
+@@ -908,6 +911,7 @@
+         y = xinerama_info.y_org;
+     }
+ #endif
++#endif
+     if ( currently_fullscreen ) {
+         /* Switch resolution and cover it with the FSwindow */
+         move_cursor_to(this, x, y);
+@@ -963,6 +967,7 @@
+     X11_GrabInputNoLock(this, SDL_GRAB_OFF);
+ 
+ #if SDL_VIDEO_DRIVER_X11_VIDMODE
++#if SDL_VIDEO_DRIVER_X11_XINERAMA
+     if ( use_xinerama &&
+          window_w <= xinerama_info.width &&
+          window_h <= xinerama_info.height ) {
+@@ -970,6 +975,7 @@
+         y = xinerama_info.y_org;
+     }
+ #endif
++#endif
+     /* Map the fullscreen window to blank the screen */
+     screen_w = DisplayWidth(SDL_Display, SDL_Screen);
+     screen_h = DisplayHeight(SDL_Display, SDL_Screen);
+diff -urN SDL-1.2.10.orig/src/video/x11/SDL_x11video.c SDL-1.2.10/src/video/x11/SDL_x11video.c
+--- SDL-1.2.10.orig/src/video/x11/SDL_x11video.c	2006-05-08 03:43:14.000000000 -0300
++++ SDL-1.2.10/src/video/x11/SDL_x11video.c	2006-05-26 23:55:32.000000000 -0300
+@@ -330,11 +330,13 @@
+ 	XDestroyWindow(SDL_Display, FSwindow);
+ 
+ #if SDL_VIDEO_DRIVER_X11_VIDMODE
++#if SDL_VIDEO_DRIVER_X11_XINERAMA
+     if ( use_xinerama ) {
+         x = xinerama_info.x_org;
+         y = xinerama_info.y_org;
+     }
+ #endif
++#endif
+     xattr.override_redirect = True;
+     xattr.background_pixel = def_vis ? BlackPixel(SDL_Display, SDL_Screen) : 0;
+     xattr.border_pixel = 0;
diff --git a/media-libs/libsdl/libsdl-1.2.10.ebuild b/media-libs/libsdl/libsdl-1.2.10.ebuild
index 7cee87c2817a..6aca6043f01d 100644
--- a/media-libs/libsdl/libsdl-1.2.10.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.10.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.10.ebuild,v 1.1 2006/05/26 05:26:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.10.ebuild,v 1.2 2006/05/29 18:57:35 tupone Exp $
 
 inherit flag-o-matic toolchain-funcs eutils libtool
 
@@ -78,6 +78,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.10-PIC-hidden-symbols.patch
+	epatch "${FILESDIR}/${P}"-noxinerama.patch
 
 	./autogen.sh || die "autogen failed"
 	elibtoolize