Ubuntu

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

Proposed by Dave Gilbert on 2011-03-13
Status: Merged
Merged at revision: 31
Proposed branch: lp:~ubuntu-treblig/ubuntu/natty/libsdl1.2/libsdl1.2.fix-725044
Merge into: lp:ubuntu/natty/libsdl1.2
Diff against target: 47 lines (+27/-0) 3 files modified
To merge this branch: bzr merge lp:~ubuntu-treblig/ubuntu/natty/libsdl1.2/libsdl1.2.fix-725044
Reviewer Review Type Date Requested Status
Ubuntu branches 2011-03-13 Pending
Review via email: mp+53157@code.launchpad.net

Description of the Change

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.

To post a comment you must log in.
32. By Dave Gilbert on 2011-03-13

Added patch header as per comment

Scott Moser (smoser) wrote :

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.

33. By Dave Gilbert on 2011-03-19

Rename patch as per comment from Scott Moser

Marc Deslauriers (mdeslaur) wrote :

looks good to me, so ACK. Thanks!

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

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2011-02-15 12:57:15 +0000
3+++ debian/changelog 2011-03-19 23:48:29 +0000
4@@ -1,3 +1,11 @@
5+libsdl1.2 (1.2.14-6.1ubuntu3) natty; urgency=low
6+
7+ * Replace memcpy by memmove in SDL_blit.c, as per SDL bug 1090
8+ see http://hg.libsdl.org/SDL/rev/d898ee5431f5
9+ (LP: #725044).
10+
11+ -- Dr. David Alan Gilbert <dave@treblig.org> Sun, 13 Mar 2011 01:05:52 +0000
12+
13 libsdl1.2 (1.2.14-6.1ubuntu2) natty; urgency=low
14
15 * Disable PlayStation 3 Cell driver on ppc64 as well as on powerpc.
16
17=== added file 'debian/patches/900_sdlblitmemcpyfix.diff'
18--- debian/patches/900_sdlblitmemcpyfix.diff 1970-01-01 00:00:00 +0000
19+++ debian/patches/900_sdlblitmemcpyfix.diff 2011-03-19 23:48:29 +0000
20@@ -0,0 +1,18 @@
21+From: Sam Lantinga <slouken@libsdl.org>
22+Description: Fixed bug #1090 (SDL_BlitCopyOverlap() assumes memcpy() operates in order)
23+ The much more complete fix is in SDL 1.3, but this is a band-aid that will fix the bug for 1.2.
24+Origin: http://hg.libsdl.org/SDL/rev/d898ee5431f5
25+Bug: http://bugzilla.libsdl.org/show_bug.cgi?id=1090
26+Bug-Ubuntu: https://launchpad.net/bugs/725044
27+
28+--- a/src/video/SDL_blit.c
29++++ b/src/video/SDL_blit.c
30+@@ -214,7 +214,7 @@
31+ dstskip = w+info->d_skip;
32+ if ( dst < src ) {
33+ while ( h-- ) {
34+- SDL_memcpy(dst, src, w);
35++ SDL_memmove(dst, src, w);
36+ src += srcskip;
37+ dst += dstskip;
38+ }
39
40=== modified file 'debian/patches/series'
41--- debian/patches/series 2010-10-12 15:59:02 +0000
42+++ debian/patches/series 2011-03-19 23:48:29 +0000
43@@ -17,3 +17,4 @@
44 300_dont_propagate_lpthread.diff
45 310_fixmouseclicks
46 320_disappearingcursor.diff
47+900_sdlblitmemcpyfix.diff

Subscribers

People subscribed via source and target branches

to all changes: