Date: Friday, September 16, 2011 @ 04:54:11
Author: heftig
Revision: 138096
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
sdl/repos/extra-i686/PKGBUILD
(from rev 138093, sdl/trunk/PKGBUILD)
sdl/repos/extra-i686/sdl-1.2.14-disable-mmx.patch
(from rev 138093, sdl/trunk/sdl-1.2.14-disable-mmx.patch)
sdl/repos/extra-i686/sdl-1.2.14-fix-disappearing-cursor.patch
(from rev 138093, sdl/trunk/sdl-1.2.14-fix-disappearing-cursor.patch)
sdl/repos/extra-i686/sdl-1.2.14-fix-mouse-clicking.patch
(from rev 138093, sdl/trunk/sdl-1.2.14-fix-mouse-clicking.patch)
sdl/repos/extra-i686/sdl-1.2.14-joystick-crash.diff
(from rev 138093, sdl/trunk/sdl-1.2.14-joystick-crash.diff)
sdl/repos/extra-x86_64/PKGBUILD
(from rev 138095, sdl/trunk/PKGBUILD)
sdl/repos/extra-x86_64/sdl-1.2.14-disable-mmx.patch
(from rev 138095, sdl/trunk/sdl-1.2.14-disable-mmx.patch)
sdl/repos/extra-x86_64/sdl-1.2.14-fix-disappearing-cursor.patch
(from rev 138095, sdl/trunk/sdl-1.2.14-fix-disappearing-cursor.patch)
sdl/repos/extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch
(from rev 138095, sdl/trunk/sdl-1.2.14-fix-mouse-clicking.patch)
sdl/repos/extra-x86_64/sdl-1.2.14-joystick-crash.diff
(from rev 138095, sdl/trunk/sdl-1.2.14-joystick-crash.diff)
Deleted:
sdl/repos/extra-i686/PKGBUILD
sdl/repos/extra-i686/sdl-1.2.14-fix-disappearing-cursor.patch
sdl/repos/extra-i686/sdl-1.2.14-fix-mouse-clicking.patch
sdl/repos/extra-i686/sdl-1.2.14-joystick-crash.diff
sdl/repos/extra-x86_64/PKGBUILD
sdl/repos/extra-x86_64/sdl-1.2.14-fix-disappearing-cursor.patch
sdl/repos/extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch
sdl/repos/extra-x86_64/sdl-1.2.14-joystick-crash.diff
-------------------------------------------------------+
extra-i686/PKGBUILD | 78 ++++++++--------
extra-i686/sdl-1.2.14-disable-mmx.patch | 59 ++++++++++++
extra-i686/sdl-1.2.14-fix-disappearing-cursor.patch | 34 +++---
extra-i686/sdl-1.2.14-fix-mouse-clicking.patch | 46 ++++-----
extra-i686/sdl-1.2.14-joystick-crash.diff | 28 ++---
extra-x86_64/PKGBUILD | 78 ++++++++--------
extra-x86_64/sdl-1.2.14-disable-mmx.patch | 59 ++++++++++++
extra-x86_64/sdl-1.2.14-fix-disappearing-cursor.patch | 34 +++---
extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch | 46 ++++-----
extra-x86_64/sdl-1.2.14-joystick-crash.diff | 28 ++---
10 files changed, 308 insertions(+), 182 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-09-16 08:53:25 UTC (rev 138095)
+++ extra-i686/PKGBUILD 2011-09-16 08:54:11 UTC (rev 138096)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Allan McRae <al...@archlinux.org>
-# Contributor: dorphell <dorph...@archlinux.org>
-
-pkgname=sdl
-pkgver=1.2.14
-pkgrel=7
-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";
-license=('LGPL')
-depends=('glibc' 'libxext' 'libxrender' 'libx11')
-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)
-md5sums=('e52086d1b508fa0b76c52ee30b55bec4'
- '9d8890b3817736a5d365f7497f096634'
- '04d8c179f125e04bcd4c9d60e013c2d7'
- 'a6cf3e71b653aa97d0d8ae6c0a789807')
-
-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
- ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \
- --with-x --disable-rpath
- make
-}
-
-package() {
- cd ${srcdir}/SDL-${pkgver}
- make DESTDIR=${pkgdir} install
-}
Copied: sdl/repos/extra-i686/PKGBUILD (from rev 138093, sdl/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-09-16 08:54:11 UTC (rev 138096)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Jan "heftig" Steffens <jan.steff...@gmail.com>
+# Contributor: Allan McRae <al...@archlinux.org>
+# Contributor: dorphell <dorph...@archlinux.org>
+
+pkgname=sdl
+pkgver=1.2.14
+pkgrel=8
+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";
+license=('LGPL')
+depends=('glibc' 'libxext' 'libxrender' 'libx11')
+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)
+md5sums=('e52086d1b508fa0b76c52ee30b55bec4'
+ '9d8890b3817736a5d365f7497f096634'
+ '04d8c179f125e04bcd4c9d60e013c2d7'
+ 'a6cf3e71b653aa97d0d8ae6c0a789807'
+ 'e5e89389a55cd7a2fee44cb53af8dd6e')
+
+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
+ ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \
+ --with-x --disable-rpath
+ make
+}
+
+package() {
+ cd ${srcdir}/SDL-${pkgver}
+ make DESTDIR=${pkgdir} install
+}
Copied: sdl/repos/extra-i686/sdl-1.2.14-disable-mmx.patch (from rev 138093,
sdl/trunk/sdl-1.2.14-disable-mmx.patch)
===================================================================
--- extra-i686/sdl-1.2.14-disable-mmx.patch (rev 0)
+++ extra-i686/sdl-1.2.14-disable-mmx.patch 2011-09-16 08:54:11 UTC (rev
138096)
@@ -0,0 +1,59 @@
+2 changesets to fix FS#26020
+
+# HG changeset patch
+# User Ryan C. Gordon <iccu...@icculus.org>
+# 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 <iccu...@icculus.org>
+# 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>
Deleted: extra-i686/sdl-1.2.14-fix-disappearing-cursor.patch
===================================================================
--- extra-i686/sdl-1.2.14-fix-disappearing-cursor.patch 2011-09-16 08:53:25 UTC
(rev 138095)
+++ extra-i686/sdl-1.2.14-fix-disappearing-cursor.patch 2011-09-16 08:54:11 UTC
(rev 138096)
@@ -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,
Copied: sdl/repos/extra-i686/sdl-1.2.14-fix-disappearing-cursor.patch (from rev
138093, sdl/trunk/sdl-1.2.14-fix-disappearing-cursor.patch)
===================================================================
--- extra-i686/sdl-1.2.14-fix-disappearing-cursor.patch
(rev 0)
+++ extra-i686/sdl-1.2.14-fix-disappearing-cursor.patch 2011-09-16 08:54:11 UTC
(rev 138096)
@@ -0,0 +1,17 @@
+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: extra-i686/sdl-1.2.14-fix-mouse-clicking.patch
===================================================================
--- extra-i686/sdl-1.2.14-fix-mouse-clicking.patch 2011-09-16 08:53:25 UTC
(rev 138095)
+++ extra-i686/sdl-1.2.14-fix-mouse-clicking.patch 2011-09-16 08:54:11 UTC
(rev 138096)
@@ -1,23 +0,0 @@
---- SDL-1.2.14/src/video/x11/SDL_x11events.c.orig 2010-04-08
11:57:05.003169834 -0700
-+++ SDL-1.2.14/src/video/x11/SDL_x11events.c 2010-04-08 12:33:51.690926340
-0700
-@@ -423,12 +423,15 @@
- if ( xevent.xcrossing.mode == NotifyUngrab )
- printf("Mode: NotifyUngrab\n");
- #endif
-- if ( this->input_grab == SDL_GRAB_OFF ) {
-- posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
-+ if ( (xevent.xcrossing.mode != NotifyGrab) &&
-+ (xevent.xcrossing.mode != NotifyUngrab) ) {
-+ if ( this->input_grab == SDL_GRAB_OFF ) {
-+ posted = SDL_PrivateAppActive(1,
SDL_APPMOUSEFOCUS);
-+ }
-+ posted = SDL_PrivateMouseMotion(0, 0,
-+ xevent.xcrossing.x,
-+ xevent.xcrossing.y);
- }
-- posted = SDL_PrivateMouseMotion(0, 0,
-- xevent.xcrossing.x,
-- xevent.xcrossing.y);
- }
- break;
-
Copied: sdl/repos/extra-i686/sdl-1.2.14-fix-mouse-clicking.patch (from rev
138093, sdl/trunk/sdl-1.2.14-fix-mouse-clicking.patch)
===================================================================
--- extra-i686/sdl-1.2.14-fix-mouse-clicking.patch
(rev 0)
+++ extra-i686/sdl-1.2.14-fix-mouse-clicking.patch 2011-09-16 08:54:11 UTC
(rev 138096)
@@ -0,0 +1,23 @@
+--- SDL-1.2.14/src/video/x11/SDL_x11events.c.orig 2010-04-08
11:57:05.003169834 -0700
++++ SDL-1.2.14/src/video/x11/SDL_x11events.c 2010-04-08 12:33:51.690926340
-0700
+@@ -423,12 +423,15 @@
+ if ( xevent.xcrossing.mode == NotifyUngrab )
+ printf("Mode: NotifyUngrab\n");
+ #endif
+- if ( this->input_grab == SDL_GRAB_OFF ) {
+- posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
++ if ( (xevent.xcrossing.mode != NotifyGrab) &&
++ (xevent.xcrossing.mode != NotifyUngrab) ) {
++ if ( this->input_grab == SDL_GRAB_OFF ) {
++ posted = SDL_PrivateAppActive(1,
SDL_APPMOUSEFOCUS);
++ }
++ posted = SDL_PrivateMouseMotion(0, 0,
++ xevent.xcrossing.x,
++ xevent.xcrossing.y);
+ }
+- posted = SDL_PrivateMouseMotion(0, 0,
+- xevent.xcrossing.x,
+- xevent.xcrossing.y);
+ }
+ break;
+
Deleted: extra-i686/sdl-1.2.14-joystick-crash.diff
===================================================================
--- extra-i686/sdl-1.2.14-joystick-crash.diff 2011-09-16 08:53:25 UTC (rev
138095)
+++ extra-i686/sdl-1.2.14-joystick-crash.diff 2011-09-16 08:54:11 UTC (rev
138096)
@@ -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;
Copied: sdl/repos/extra-i686/sdl-1.2.14-joystick-crash.diff (from rev 138093,
sdl/trunk/sdl-1.2.14-joystick-crash.diff)
===================================================================
--- extra-i686/sdl-1.2.14-joystick-crash.diff (rev 0)
+++ extra-i686/sdl-1.2.14-joystick-crash.diff 2011-09-16 08:54:11 UTC (rev
138096)
@@ -0,0 +1,14 @@
+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;
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2011-09-16 08:53:25 UTC (rev 138095)
+++ extra-x86_64/PKGBUILD 2011-09-16 08:54:11 UTC (rev 138096)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Allan McRae <al...@archlinux.org>
-# Contributor: dorphell <dorph...@archlinux.org>
-
-pkgname=sdl
-pkgver=1.2.14
-pkgrel=7
-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";
-license=('LGPL')
-depends=('glibc' 'libxext' 'libxrender' 'libx11')
-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)
-md5sums=('e52086d1b508fa0b76c52ee30b55bec4'
- '9d8890b3817736a5d365f7497f096634'
- '04d8c179f125e04bcd4c9d60e013c2d7'
- 'a6cf3e71b653aa97d0d8ae6c0a789807')
-
-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
- ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \
- --with-x --disable-rpath
- make
-}
-
-package() {
- cd ${srcdir}/SDL-${pkgver}
- make DESTDIR=${pkgdir} install
-}
Copied: sdl/repos/extra-x86_64/PKGBUILD (from rev 138095, sdl/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-09-16 08:54:11 UTC (rev 138096)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Jan "heftig" Steffens <jan.steff...@gmail.com>
+# Contributor: Allan McRae <al...@archlinux.org>
+# Contributor: dorphell <dorph...@archlinux.org>
+
+pkgname=sdl
+pkgver=1.2.14
+pkgrel=8
+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";
+license=('LGPL')
+depends=('glibc' 'libxext' 'libxrender' 'libx11')
+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)
+md5sums=('e52086d1b508fa0b76c52ee30b55bec4'
+ '9d8890b3817736a5d365f7497f096634'
+ '04d8c179f125e04bcd4c9d60e013c2d7'
+ 'a6cf3e71b653aa97d0d8ae6c0a789807'
+ 'e5e89389a55cd7a2fee44cb53af8dd6e')
+
+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
+ ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \
+ --with-x --disable-rpath
+ make
+}
+
+package() {
+ cd ${srcdir}/SDL-${pkgver}
+ make DESTDIR=${pkgdir} install
+}
Copied: sdl/repos/extra-x86_64/sdl-1.2.14-disable-mmx.patch (from rev 138095,
sdl/trunk/sdl-1.2.14-disable-mmx.patch)
===================================================================
--- extra-x86_64/sdl-1.2.14-disable-mmx.patch (rev 0)
+++ extra-x86_64/sdl-1.2.14-disable-mmx.patch 2011-09-16 08:54:11 UTC (rev
138096)
@@ -0,0 +1,59 @@
+2 changesets to fix FS#26020
+
+# HG changeset patch
+# User Ryan C. Gordon <iccu...@icculus.org>
+# 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 <iccu...@icculus.org>
+# 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>
Deleted: extra-x86_64/sdl-1.2.14-fix-disappearing-cursor.patch
===================================================================
--- extra-x86_64/sdl-1.2.14-fix-disappearing-cursor.patch 2011-09-16
08:53:25 UTC (rev 138095)
+++ extra-x86_64/sdl-1.2.14-fix-disappearing-cursor.patch 2011-09-16
08:54:11 UTC (rev 138096)
@@ -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,
Copied: sdl/repos/extra-x86_64/sdl-1.2.14-fix-disappearing-cursor.patch (from
rev 138095, sdl/trunk/sdl-1.2.14-fix-disappearing-cursor.patch)
===================================================================
--- extra-x86_64/sdl-1.2.14-fix-disappearing-cursor.patch
(rev 0)
+++ extra-x86_64/sdl-1.2.14-fix-disappearing-cursor.patch 2011-09-16
08:54:11 UTC (rev 138096)
@@ -0,0 +1,17 @@
+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: extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch
===================================================================
--- extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch 2011-09-16 08:53:25 UTC
(rev 138095)
+++ extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch 2011-09-16 08:54:11 UTC
(rev 138096)
@@ -1,23 +0,0 @@
---- SDL-1.2.14/src/video/x11/SDL_x11events.c.orig 2010-04-08
11:57:05.003169834 -0700
-+++ SDL-1.2.14/src/video/x11/SDL_x11events.c 2010-04-08 12:33:51.690926340
-0700
-@@ -423,12 +423,15 @@
- if ( xevent.xcrossing.mode == NotifyUngrab )
- printf("Mode: NotifyUngrab\n");
- #endif
-- if ( this->input_grab == SDL_GRAB_OFF ) {
-- posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
-+ if ( (xevent.xcrossing.mode != NotifyGrab) &&
-+ (xevent.xcrossing.mode != NotifyUngrab) ) {
-+ if ( this->input_grab == SDL_GRAB_OFF ) {
-+ posted = SDL_PrivateAppActive(1,
SDL_APPMOUSEFOCUS);
-+ }
-+ posted = SDL_PrivateMouseMotion(0, 0,
-+ xevent.xcrossing.x,
-+ xevent.xcrossing.y);
- }
-- posted = SDL_PrivateMouseMotion(0, 0,
-- xevent.xcrossing.x,
-- xevent.xcrossing.y);
- }
- break;
-
Copied: sdl/repos/extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch (from rev
138095, sdl/trunk/sdl-1.2.14-fix-mouse-clicking.patch)
===================================================================
--- extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch
(rev 0)
+++ extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch 2011-09-16 08:54:11 UTC
(rev 138096)
@@ -0,0 +1,23 @@
+--- SDL-1.2.14/src/video/x11/SDL_x11events.c.orig 2010-04-08
11:57:05.003169834 -0700
++++ SDL-1.2.14/src/video/x11/SDL_x11events.c 2010-04-08 12:33:51.690926340
-0700
+@@ -423,12 +423,15 @@
+ if ( xevent.xcrossing.mode == NotifyUngrab )
+ printf("Mode: NotifyUngrab\n");
+ #endif
+- if ( this->input_grab == SDL_GRAB_OFF ) {
+- posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
++ if ( (xevent.xcrossing.mode != NotifyGrab) &&
++ (xevent.xcrossing.mode != NotifyUngrab) ) {
++ if ( this->input_grab == SDL_GRAB_OFF ) {
++ posted = SDL_PrivateAppActive(1,
SDL_APPMOUSEFOCUS);
++ }
++ posted = SDL_PrivateMouseMotion(0, 0,
++ xevent.xcrossing.x,
++ xevent.xcrossing.y);
+ }
+- posted = SDL_PrivateMouseMotion(0, 0,
+- xevent.xcrossing.x,
+- xevent.xcrossing.y);
+ }
+ break;
+
Deleted: extra-x86_64/sdl-1.2.14-joystick-crash.diff
===================================================================
--- extra-x86_64/sdl-1.2.14-joystick-crash.diff 2011-09-16 08:53:25 UTC (rev
138095)
+++ extra-x86_64/sdl-1.2.14-joystick-crash.diff 2011-09-16 08:54:11 UTC (rev
138096)
@@ -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;
Copied: sdl/repos/extra-x86_64/sdl-1.2.14-joystick-crash.diff (from rev 138095,
sdl/trunk/sdl-1.2.14-joystick-crash.diff)
===================================================================
--- extra-x86_64/sdl-1.2.14-joystick-crash.diff (rev 0)
+++ extra-x86_64/sdl-1.2.14-joystick-crash.diff 2011-09-16 08:54:11 UTC (rev
138096)
@@ -0,0 +1,14 @@
+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;
