[SDL] Do not harness backing store by default

[Petr Pisar]

commit 81735fc2e1701430d006e874f882b56629e7ee5c
Author: Petr Písař <ppisar at redhat.com>
Date:   Fri Mar 7 10:24:37 2014 +0100

    Do not harness backing store by default

 SDL-1.2.15-no-default-backing-store.patch |   24 ++++++++++++++++++++++++
 SDL.spec                                  |   10 +++++++++-
 2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/SDL-1.2.15-no-default-backing-store.patch b/SDL-1.2.15-no-default-backing-store.patch
new file mode 100644
index 0000000..4d5209d
--- /dev/null
+++ b/SDL-1.2.15-no-default-backing-store.patch
@@ -0,0 +1,24 @@
+Do not harness backing store by default
+
+xorg-server 1.15 enables backing store if composite extension is enabled
+(default settings). Harnessing backing store through compositor leads to
+tearing effect.
+
+This patch reverts default harnessing backing store to conditional use if
+SDL_VIDEO_X11_BACKINGSTORE environment variable exists.
+
+<https://bugzilla.libsdl.org/show_bug.cgi?id=2383>
+<https://bugzilla.redhat.com/show_bug.cgi?id=1073057>
+
+diff -up SDL-1.2.15/src/video/x11/SDL_x11video.c.jx SDL-1.2.15/src/video/x11/SDL_x11video.c
+--- SDL-1.2.15/src/video/x11/SDL_x11video.c.jx	2012-01-19 01:30:06.000000000 -0500
++++ SDL-1.2.15/src/video/x11/SDL_x11video.c	2014-03-04 14:39:34.691545549 -0500
+@@ -1088,7 +1088,7 @@ static int X11_CreateWindow(_THIS, SDL_S
+ 		}
+ 	}
+ 
+-#if 0 /* This is an experiment - are the graphics faster now? - nope. */
++#if 1 /* This is an experiment - are the graphics faster now? - nope. */
+ 	if ( SDL_getenv("SDL_VIDEO_X11_BACKINGSTORE") )
+ #endif
+ 	/* Cache the window in the server, when possible */
diff --git a/SDL.spec b/SDL.spec
index 243f95a..ef5258b 100644
--- a/SDL.spec
+++ b/SDL.spec
@@ -10,7 +10,7 @@
 
 Name:       SDL
 Version:    1.2.15
-Release:    13%{?dist}
+Release:    14%{?dist}
 Summary:    A cross-platform multimedia library
 Group:      System Environment/Libraries
 URL:        http://www.libsdl.org/
@@ -34,6 +34,9 @@ Patch3:     SDL-1.2.15-const_XData32.patch
 Patch4:     SDL-1.2.15-add_sdl_config_man.patch
 # Upstream fix for sdl1486, rh990677
 Patch5:     SDL-1.2.15-ignore_insane_joystick_axis.patch
+# Do not use backing store by default, sdl2383, rh1073057, rejected by
+# upstream
+Patch6:     SDL-1.2.15-no-default-backing-store.patch
 
 BuildRequires:  alsa-lib-devel
 %if %{with arts}
@@ -102,6 +105,7 @@ applications.
 %patch3 -p1 -b .XData32
 %patch4 -p1 -b .sdl_config_man
 %patch5 -p1 -b .insane_axis
+%patch6 -p1 -b .backing_store
 for F in CREDITS; do 
     iconv -f iso8859-1 -t utf-8 < "$F" > "${F}.utf"
     touch --reference "$F" "${F}.utf"
@@ -177,6 +181,10 @@ rm -f %{buildroot}%{_libdir}/*.la
 %{_libdir}/lib*.a
 
 %changelog
+* Fri Mar 07 2014 Petr Pisar <ppisar at redhat.com> - 1.2.15-14
+- Do not harness backing store by default. Export SDL_VIDEO_X11_BACKINGSTORE
+  environment variable to enable it. (bug #1073057)
+
 * Fri Jan 17 2014 Petr Pisar <ppisar at redhat.com> - 1.2.15-13
 - Add support for ppc64le architecture (bug #1054397)