Merge lp:~timo-jyrinki/ubuntu/trusty/libsdl1.2/fix_backingstore_tearing into lp:ubuntu/trusty/libsdl1.2

[Timo Jyrinki]

* debian/patches/sdl-check-for-SDL_VIDEO_X11_BACKINGSTORE.patch:
  - Restore old backingstore behavior to prevent tearing
    (LP: #1280665)

[lp:~timo-jyrinki/ubuntu/trusty/libsdl1.2/fix_backingstore_tearing]

48. By Timo Jyrinki on 2014-04-24

propose releasing for trusty

[Brian Murray (brian-murray)]

This looks good to me, I'll go ahead and upload it.

=== modified file 'debian/changelog'
--- debian/changelog	2014-01-13 20:25:49 +0000
+++ debian/changelog	2014-04-24 08:42:26 +0000
@@ -1,3 +1,11 @@
+libsdl1.2 (1.2.15-8ubuntu1.1) trusty; urgency=medium
+
+  * debian/patches/sdl-check-for-SDL_VIDEO_X11_BACKINGSTORE.patch:
+    - Restore old backingstore behavior to prevent tearing
+      (LP: #1280665)
+
+ -- Timo Jyrinki <[e-mail]>  Sat, 19 Apr 2014 23:22:43 +0300
+
 libsdl1.2 (1.2.15-8ubuntu1) trusty; urgency=medium
 
   * Merge from Debian unstable, remaining changes:

=== added file 'debian/patches/sdl-check-for-SDL_VIDEO_X11_BACKINGSTORE.patch'
--- debian/patches/sdl-check-for-SDL_VIDEO_X11_BACKINGSTORE.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/sdl-check-for-SDL_VIDEO_X11_BACKINGSTORE.patch	2014-04-24 08:42:26 +0000
@@ -0,0 +1,14 @@
+--- a/src/video/x11/SDL_x11video.c
++++ b/src/video/x11/SDL_x11video.c
+@@ -1088,10 +1088,8 @@
+ 		}
+ 	}
+ 
+-#if 0 /* 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 */
++	/* Cache the window in the server when possible, on request */
+ 	{
+ 		Screen *xscreen;
+ 		XSetWindowAttributes a;

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-01-13 20:25:49 +0000
+++ debian/patches/series	2014-04-24 08:42:26 +0000
@@ -4,3 +4,4 @@
 fix_window_resizing.diff
 fix_joystick_misc_axes.diff
 proper-autotools.patch
+sdl-check-for-SDL_VIDEO_X11_BACKINGSTORE.patch