From b915a21821423232052e2e48ea14f288b3098c32 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Wed, 5 Sep 2012 00:02:31 +0000
Subject: Wed Sep  5 00:02:30 UTC 2012

---
 multilib/lib32-sdl/PKGBUILD                     | 28 +++++++++++++++----------
 multilib/lib32-sdl/fix_joystick_misc_axes.diff  | 13 ++++++++++++
 multilib/lib32-sdl/sdl-1.2.14-disable-mmx.patch | 13 ++++++++++++
 3 files changed, 43 insertions(+), 11 deletions(-)
 create mode 100644 multilib/lib32-sdl/fix_joystick_misc_axes.diff
 create mode 100644 multilib/lib32-sdl/sdl-1.2.14-disable-mmx.patch

(limited to 'multilib/lib32-sdl')

diff --git a/multilib/lib32-sdl/PKGBUILD b/multilib/lib32-sdl/PKGBUILD
index ce944c163..f226f79d3 100644
--- a/multilib/lib32-sdl/PKGBUILD
+++ b/multilib/lib32-sdl/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 66918 2012-03-01 15:51:48Z bluewind $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# $Id: PKGBUILD 75857 2012-09-03 16:41:16Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 _pkgbasename=sdl
 pkgname=lib32-$_pkgbasename
 pkgver=1.2.15
-pkgrel=2
+pkgrel=2.1
 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (32-bit)"
 arch=('x86_64')
 url="http://www.libsdl.org"
@@ -15,27 +15,33 @@ depends=('lib32-libxext' 'lib32-libxrender' 'lib32-libx11' $_pkgbasename)
 makedepends=('lib32-alsa-lib' 'lib32-mesa' 'lib32-libpulse' gcc-multilib)
 options=('!libtool')
 source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
-        sdl-1.2.14-fix-mouse-clicking.patch)
+        sdl-1.2.14-fix-mouse-clicking.patch
+        sdl-1.2.14-disable-mmx.patch
+        fix_joystick_misc_axes.diff)
 md5sums=('9d96df8417572a2afb781a7c4c811a85'
-         '04d8c179f125e04bcd4c9d60e013c2d7')
+         '04d8c179f125e04bcd4c9d60e013c2d7'
+         'e5c16b7611f62c7cb25f0534eff68852'
+         '687586a108b597a2a6b73070c1d37e51')
 
 build() {
   export CC="gcc -m32"
   export CXX="g++ -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
-  cd ${srcdir}/SDL-${pkgver}
-  patch -Np1 -i $srcdir/sdl-1.2.14-fix-mouse-clicking.patch
+  cd SDL-$pkgver
+  patch -Np1 -i ../sdl-1.2.14-fix-mouse-clicking.patch
+  patch -Np1 -i ../sdl-1.2.14-disable-mmx.patch
+  patch -Np1 -i ../fix_joystick_misc_axes.diff
   ./configure --prefix=/usr --disable-nasm --enable-alsa \
-              --with-x --disable-rpath --libdir=/usr/lib32 --disable-static
+              --with-x --disable-rpath --disable-static --libdir=/usr/lib32
   make
 }
 
 package() {
-  cd ${srcdir}/SDL-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd SDL-$pkgver
+  make DESTDIR="$pkgdir" install
 
-  rm -rf "${pkgdir}"/usr/{include,share}
+  rm -rf "$pkgdir"/usr/{include,share}
 
   cd "$pkgdir/usr/bin"
   mv sdl-config sdl-config-32
diff --git a/multilib/lib32-sdl/fix_joystick_misc_axes.diff b/multilib/lib32-sdl/fix_joystick_misc_axes.diff
new file mode 100644
index 000000000..75e3755c9
--- /dev/null
+++ b/multilib/lib32-sdl/fix_joystick_misc_axes.diff
@@ -0,0 +1,13 @@
+diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c
+index ee43974..80e46e4 100644
+--- a/src/joystick/linux/SDL_sysjoystick.c
++++ b/src/joystick/linux/SDL_sysjoystick.c
+@@ -702,7 +702,7 @@ static SDL_bool EV_ConfigJoystick(SDL_Joystick *joystick, int fd)
+ 				++joystick->nbuttons;
+ 			}
+ 		}
+-		for ( i=0; i<ABS_MISC; ++i ) {
++		for ( i=0; i<ABS_MAX; ++i ) {
+ 			/* Skip hats */
+ 			if ( i == ABS_HAT0X ) {
+ 				i = ABS_HAT3Y;
diff --git a/multilib/lib32-sdl/sdl-1.2.14-disable-mmx.patch b/multilib/lib32-sdl/sdl-1.2.14-disable-mmx.patch
new file mode 100644
index 000000000..1bb6e0e47
--- /dev/null
+++ b/multilib/lib32-sdl/sdl-1.2.14-disable-mmx.patch
@@ -0,0 +1,13 @@
+# and another one from FS#26020
+
+--- a/src/video/SDL_yuv_sw.c    2009-10-13 06:07:15.000000000 +0700
++++ b/src/video/SDL_yuv_sw.c    2011-09-20 19:26:30.247742620 +0700
+@@ -89,6 +89,8 @@
+ #include "SDL_yuvfuncs.h"
+ #include "SDL_yuv_sw_c.h"
+ 
++#undef __OPTIMIZE__
++
+ /* The functions used to manipulate software video overlays */
+ static struct private_yuvhwfuncs sw_yuvfuncs = {
+ 	SDL_LockYUV_SW,
-- 
cgit v1.2.3-54-g00ecf