Merge lp:~ubuntu-treblig/ubuntu/natty/libsdl1.2/libsdl1.2.fix-725044 into lp:ubuntu/natty/libsdl1.2

[Dave Gilbert]

This fixes LP bug 725044, using the patch here: http://hg.libsdl.org/SDL/rev/d898ee5431f5

I used a simple test with wesnoth to check it was OK (scrolling right). - It's only a light test.

[lp:~ubuntu-treblig/ubuntu/natty/libsdl1.2/libsdl1.2.fix-725044]

32. By Dave Gilbert on 2011-03-13

Added patch header as per comment

[Scott Moser (smoser)]

The only nitpick i have is that the patch in debian/series should be named consistently with the others. Ie, it should be named 330_sdlblitmemcpyfix.diff .

Other than that I think this should be pulled.

[lp:~ubuntu-treblig/ubuntu/natty/libsdl1.2/libsdl1.2.fix-725044]

33. By Dave Gilbert on 2011-03-19

Rename patch as per comment from Scott Moser

[Marc Deslauriers (mdeslaur)]

looks good to me, so ACK. Thanks!

We are currently in beta freeze, so someone should upload this once beta freeze is over.

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-15 12:57:15 +0000
+++ debian/changelog	2011-03-19 23:48:29 +0000
@@ -1,3 +1,11 @@
+libsdl1.2 (1.2.14-6.1ubuntu3) natty; urgency=low
+
+  * Replace memcpy by memmove in SDL_blit.c, as per SDL bug 1090
+    see http://hg.libsdl.org/SDL/rev/d898ee5431f5
+    (LP: #725044).
+
+ -- Dr. David Alan Gilbert <[e-mail]>  Sun, 13 Mar 2011 01:05:52 +0000
+
 libsdl1.2 (1.2.14-6.1ubuntu2) natty; urgency=low
 
   * Disable PlayStation 3 Cell driver on ppc64 as well as on powerpc.

=== added file 'debian/patches/900_sdlblitmemcpyfix.diff'
--- debian/patches/900_sdlblitmemcpyfix.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/900_sdlblitmemcpyfix.diff	2011-03-19 23:48:29 +0000
@@ -0,0 +1,18 @@
+From: Sam Lantinga <[e-mail]>
+Description: Fixed bug #1090 (SDL_BlitCopyOverlap() assumes memcpy() operates in order)
+  The much more complete fix is in SDL 1.3, but this is a band-aid that will fix the bug for 1.2.
+Origin: http://hg.libsdl.org/SDL/rev/d898ee5431f5
+Bug: http://bugzilla.libsdl.org/show_bug.cgi?id=1090
+Bug-Ubuntu: https://launchpad.net/bugs/725044
+
+--- a/src/video/SDL_blit.c
++++ b/src/video/SDL_blit.c
+@@ -214,7 +214,7 @@
+ 	dstskip = w+info->d_skip;
+ 	if ( dst < src ) {
+ 		while ( h-- ) {
+-			SDL_memcpy(dst, src, w);
++			SDL_memmove(dst, src, w);
+ 			src += srcskip;
+ 			dst += dstskip;
+ 		}

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-10-12 15:59:02 +0000
+++ debian/patches/series	2011-03-19 23:48:29 +0000
@@ -17,3 +17,4 @@
 300_dont_propagate_lpthread.diff
 310_fixmouseclicks
 320_disappearingcursor.diff
+900_sdlblitmemcpyfix.diff