Fix for no xinerama in USE, bug #134386

(Portage version: 2.1_rc3-r1)

5 files changed, 70 insertions, 0 deletions

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;