Date: Saturday, January 21, 2012 @ 12:52:15 Author: heftig Revision: 147082
1.2.15 Modified: sdl/trunk/PKGBUILD sdl/trunk/sdl-1.2.14-disable-mmx.patch Deleted: sdl/trunk/fs27469.patch sdl/trunk/sdl-1.2.14-fix-disappearing-cursor.patch sdl/trunk/sdl-1.2.14-joystick-crash.diff ------------------------------------------+ PKGBUILD | 23 +++-------- fs27469.patch | 23 ----------- sdl-1.2.14-disable-mmx.patch | 60 ----------------------------- sdl-1.2.14-fix-disappearing-cursor.patch | 17 -------- sdl-1.2.14-joystick-crash.diff | 14 ------ 5 files changed, 7 insertions(+), 130 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-01-21 17:52:09 UTC (rev 147081) +++ PKGBUILD 2012-01-21 17:52:15 UTC (rev 147082) @@ -1,11 +1,11 @@ # $Id$ -# Maintainer: Jan "heftig" Steffens <[email protected]> +# Maintainer: Jan Alexander Steffens (heftig) <[email protected]> # Contributor: Allan McRae <[email protected]> # Contributor: dorphell <[email protected]> pkgname=sdl -pkgver=1.2.14 -pkgrel=10 +pkgver=1.2.15 +pkgrel=1 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard" arch=('i686' 'x86_64') url="http://www.libsdl.org"; @@ -14,27 +14,18 @@ makedepends=('alsa-lib' 'mesa' 'libpulse') options=('!libtool') source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz - sdl-1.2.14-joystick-crash.diff sdl-1.2.14-fix-mouse-clicking.patch - sdl-1.2.14-fix-disappearing-cursor.patch - sdl-1.2.14-disable-mmx.patch - fs27469.patch) -md5sums=('e52086d1b508fa0b76c52ee30b55bec4' - '9d8890b3817736a5d365f7497f096634' + sdl-1.2.14-disable-mmx.patch) +md5sums=('9d96df8417572a2afb781a7c4c811a85' '04d8c179f125e04bcd4c9d60e013c2d7' - 'a6cf3e71b653aa97d0d8ae6c0a789807' - '9ffecb9932a132ee5cefb4112e950761' - '89091617e27fcad64451bc0b28e48501') + 'e5c16b7611f62c7cb25f0534eff68852') build() { cd ${srcdir}/SDL-${pkgver} - patch -Np1 -i $srcdir/sdl-1.2.14-joystick-crash.diff patch -Np1 -i $srcdir/sdl-1.2.14-fix-mouse-clicking.patch - patch -Np1 -i $srcdir/sdl-1.2.14-fix-disappearing-cursor.patch patch -Np1 -i $srcdir/sdl-1.2.14-disable-mmx.patch - patch -Np1 -i $srcdir/fs27469.patch ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \ - --with-x --disable-rpath + --with-x --disable-rpath --disable-static make } Deleted: fs27469.patch =================================================================== --- fs27469.patch 2012-01-21 17:52:09 UTC (rev 147081) +++ fs27469.patch 2012-01-21 17:52:15 UTC (rev 147082) @@ -1,23 +0,0 @@ - -# HG changeset patch -# User Sam Lantinga <[email protected]> -# Date 1297938710 28800 -# Node ID d898ee5431f52dd630e311b325eb5a42c8607a60 -# Parent 6bb01861c4c0d28dcea67e04ef723feaaf730d07 -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. - -diff -r 6bb01861c4c0 -r d898ee5431f5 src/video/SDL_blit.c ---- a/src/video/SDL_blit.c Wed Feb 16 04:49:07 2011 -0800 -+++ b/src/video/SDL_blit.c Thu Feb 17 02:31:50 2011 -0800 -@@ -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: sdl-1.2.14-disable-mmx.patch =================================================================== --- sdl-1.2.14-disable-mmx.patch 2012-01-21 17:52:09 UTC (rev 147081) +++ sdl-1.2.14-disable-mmx.patch 2012-01-21 17:52:15 UTC (rev 147082) @@ -1,63 +1,3 @@ -2 changesets to fix FS#26020 - -# HG changeset patch -# User Ryan C. Gordon <[email protected]> -# Date 1315711279 14400 -# Node ID 739ad55fe50d77a2ce84d6e3d59e97c550719d0d -# Parent 32558685a9042e79cb773c37c09349b0a5ff5d72 -Disabled MMX blitters on GCC. They break the build on tons of machines now. - -diff -r 32558685a904 -r 739ad55fe50d src/video/SDL_RLEaccel.c ---- a/src/video/SDL_RLEaccel.c Sat Sep 10 19:37:20 2011 -0400 -+++ b/src/video/SDL_RLEaccel.c Sat Sep 10 23:21:19 2011 -0400 -@@ -91,7 +91,8 @@ - #include "SDL_blit.h" - #include "SDL_RLEaccel_c.h" - --#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) && SDL_ASSEMBLY_ROUTINES -+/* Force MMX to 0; this blows up on almost every major compiler now. --ryan. */ -+#if 0 && defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) && SDL_ASSEMBLY_ROUTINES - #define MMX_ASMBLIT - #endif - -diff -r 32558685a904 -r 739ad55fe50d src/video/SDL_blit_A.c ---- a/src/video/SDL_blit_A.c Sat Sep 10 19:37:20 2011 -0400 -+++ b/src/video/SDL_blit_A.c Sat Sep 10 23:21:19 2011 -0400 -@@ -32,7 +32,8 @@ - - #if SDL_ASSEMBLY_ROUTINES - # if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) --# define MMX_ASMBLIT 1 -+ /* forced MMX to 0...it breaks on most compilers now. --ryan. */ -+# define MMX_ASMBLIT 0 - # define GCC_ASMBLIT 1 - # elif defined(_MSC_VER) && defined(_M_IX86) - # if (_MSC_VER <= 1200) - -# HG changeset patch -# User Ryan C. Gordon <[email protected]> -# Date 1315939378 14400 -# Node ID 867c4c3604b79a810cf8ff16590001d9ef9c2824 -# Parent 614c2583703af89b3197f4fef73174ddc903eccf -Turned off the rest of the MMX code in SDL_blit_A.c. - -It also seems to blow up everywhere. - -Fixes Bugzilla #1278. - -diff -r 614c2583703a -r 867c4c3604b7 src/video/SDL_blit_A.c ---- a/src/video/SDL_blit_A.c Mon Sep 12 00:29:18 2011 -0400 -+++ b/src/video/SDL_blit_A.c Tue Sep 13 14:42:58 2011 -0400 -@@ -34,7 +34,7 @@ - # if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) - /* forced MMX to 0...it breaks on most compilers now. --ryan. */ - # define MMX_ASMBLIT 0 --# define GCC_ASMBLIT 1 -+# define GCC_ASMBLIT 0 - # elif defined(_MSC_VER) && defined(_M_IX86) - # if (_MSC_VER <= 1200) - # include <malloc.h> - # and another one from FS#26020 --- a/src/video/SDL_yuv_sw.c 2009-10-13 06:07:15.000000000 +0700 Deleted: sdl-1.2.14-fix-disappearing-cursor.patch =================================================================== --- sdl-1.2.14-fix-disappearing-cursor.patch 2012-01-21 17:52:09 UTC (rev 147081) +++ sdl-1.2.14-fix-disappearing-cursor.patch 2012-01-21 17:52:15 UTC (rev 147082) @@ -1,17 +0,0 @@ -Index: SDL-1.2.14/src/video/x11/SDL_x11events.c -=================================================================== ---- SDL-1.2.14.orig/src/video/x11/SDL_x11events.c 2010-04-30 09:16:35.000000000 -0400 -+++ SDL-1.2.14/src/video/x11/SDL_x11events.c 2010-04-30 09:16:35.000000000 -0400 -@@ -444,8 +444,10 @@ - if ( xevent.xcrossing.mode == NotifyUngrab ) - printf("Mode: NotifyUngrab\n"); - #endif -- if ( xevent.xcrossing.detail != NotifyInferior ) { -- if ( this->input_grab == SDL_GRAB_OFF ) { -+ if ( (xevent.xcrossing.mode != NotifyGrab) && -+ (xevent.xcrossing.mode != NotifyUngrab) && -+ (xevent.xcrossing.detail != NotifyInferior) ) { -+ if ( this->input_grab == SDL_GRAB_OFF ) { - posted = SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS); - } else { - posted = SDL_PrivateMouseMotion(0, 0, Deleted: sdl-1.2.14-joystick-crash.diff =================================================================== --- sdl-1.2.14-joystick-crash.diff 2012-01-21 17:52:09 UTC (rev 147081) +++ sdl-1.2.14-joystick-crash.diff 2012-01-21 17:52:15 UTC (rev 147082) @@ -1,14 +0,0 @@ -Description: Fix crash with joystick detection. -Index: libsdl1.2-1.2.14/src/joystick/linux/SDL_sysjoystick.c -=================================================================== ---- libsdl1.2-1.2.14.orig/src/joystick/linux/SDL_sysjoystick.c 2010-01-12 12:37:36.000000000 -0500 -+++ libsdl1.2-1.2.14/src/joystick/linux/SDL_sysjoystick.c 2010-01-12 12:38:27.000000000 -0500 -@@ -700,7 +700,7 @@ - continue; - } - if ( test_bit(i, absbit) ) { -- int values[5]; -+ int values[6]; - - if ( ioctl(fd, EVIOCGABS(i), values) < 0 ) - continue;
