diff options
| -rw-r--r-- | libre-multilib/lib32-sdl/PKGBUILD (renamed from libre-multilib/lib32-sdl-libre/PKGBUILD) | 39 | ||||
| -rw-r--r-- | libre-multilib/lib32-sdl/X11_KeyToUnicode.patch | 52 | ||||
| -rw-r--r-- | libre-multilib/lib32-sdl/fix_joystick_misc_axes.diff (renamed from libre-multilib/lib32-sdl-libre/fix_joystick_misc_axes.diff) | 0 | ||||
| -rw-r--r-- | libre-multilib/lib32-sdl/libre.patch (renamed from libre-multilib/lib32-sdl-libre/libre.patch) | 0 | ||||
| -rw-r--r-- | libre-multilib/lib32-sdl/libsdl-1.2.15-resizing.patch (renamed from libre-multilib/lib32-sdl-libre/libsdl-1.2.15-resizing.patch) | 0 | ||||
| -rw-r--r-- | libre-multilib/lib32-sdl/sdl-1.2.14-disable-mmx.patch (renamed from libre-multilib/lib32-sdl-libre/sdl-1.2.14-disable-mmx.patch) | 0 | ||||
| -rw-r--r-- | libre-multilib/lib32-sdl/sdl-1.2.14-fix-mouse-clicking.patch (renamed from libre-multilib/lib32-sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch) | 0 | ||||
| -rw-r--r-- | libre-multilib/lib32-sdl/sdl_x11sym.patch | 12 |
8 files changed, 88 insertions, 15 deletions
diff --git a/libre-multilib/lib32-sdl-libre/PKGBUILD b/libre-multilib/lib32-sdl/PKGBUILD index 1b294adf0..4bb815cfe 100644 --- a/libre-multilib/lib32-sdl-libre/PKGBUILD +++ b/libre-multilib/lib32-sdl/PKGBUILD @@ -1,35 +1,48 @@ -# $Id: PKGBUILD 78820 2012-10-25 06:47:28Z foutrelis $ +# $Id: PKGBUILD 114755 2014-07-03 20:47:41Z heftig $ # Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor (Arch): Allan McRae <allan@archlinux.org> # Contributor (Arch): dorphell <dorphell@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> -_pkgbasename=sdl-libre +_pkgbasename=sdl pkgname=lib32-$_pkgbasename pkgver=1.2.15 -pkgrel=3 +pkgrel=6.parabola1 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (32-bit), without nonfree riva_mmio.h file" arch=('x86_64') url="http://www.libsdl.org" license=('LGPL') -provides=("lib32-sdl=${pkgver}") -conflicts=('lib32-sdl') -replaces=('lib32-sdl') +conflicts=('lib32-sdl-libre') +replaces=('lib32-sdl-libre') depends=('lib32-libxext' 'lib32-libxrender' 'lib32-libx11' $_pkgbasename) -makedepends=('lib32-alsa-lib' 'lib32-mesa' 'lib32-libpulse' gcc-multilib) +makedepends=('lib32-alsa-lib' 'lib32-mesa' 'lib32-libpulse' 'lib32-glu' gcc-multilib) optdepends=('lib32-alsa-lib: ALSA audio driver' 'lib32-libpulse: PulseAudio audio driver') -options=('!libtool') -source=(https://repo.parabolagnulinux.org/other/$pkgname/SDL-libre-${pkgver}.tar.gz +options=('staticlibs') +source=(https://repo.parabolagnulinux.org/other/sdl-libre/SDL-libre-${pkgver}.tar.gz sdl-1.2.14-fix-mouse-clicking.patch sdl-1.2.14-disable-mmx.patch fix_joystick_misc_axes.diff - libsdl-1.2.15-resizing.patch) + libsdl-1.2.15-resizing.patch + sdl_x11sym.patch + X11_KeyToUnicode.patch) md5sums=('c6e53ef16fa347ed066c3d68fe93c378' '04d8c179f125e04bcd4c9d60e013c2d7' 'e5c16b7611f62c7cb25f0534eff68852' '687586a108b597a2a6b73070c1d37e51' - '3dd50347d8856160a9cbd7f80383a1f8') + '3dd50347d8856160a9cbd7f80383a1f8' + '148b285bccee9d21bb96db807363b962' + 'edea272dff4698470877c016d818918d') + +prepare() { + 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 + patch -Np1 -i ../libsdl-1.2.15-resizing.patch + patch -Np0 -i ../sdl_x11sym.patch + patch -Np1 -i ../X11_KeyToUnicode.patch +} build() { export CC="gcc -m32" @@ -37,10 +50,6 @@ build() { export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" 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 - patch -Np1 -i ../libsdl-1.2.15-resizing.patch ./configure --prefix=/usr --disable-nasm --enable-alsa \ --with-x --disable-rpath --disable-static --libdir=/usr/lib32 make diff --git a/libre-multilib/lib32-sdl/X11_KeyToUnicode.patch b/libre-multilib/lib32-sdl/X11_KeyToUnicode.patch new file mode 100644 index 000000000..5f0f325b1 --- /dev/null +++ b/libre-multilib/lib32-sdl/X11_KeyToUnicode.patch @@ -0,0 +1,52 @@ + +# HG changeset patch +# User Sam Lantinga <slouken@libsdl.org> +# Date 1327258041 18000 +# Node ID 900a0fae90ca65cff55a70a17b9ec39d2ddccbcf +# Parent 5273dfd19a5e8c5736a0d417bd441f704c5355f8 +Fixed bug 1390 - X11_KeyToUnicode + +manuel.montezelo 2012-01-22 08:56:18 PST + +We had the following bug report at Debian: +http://bugs.debian.org/376560 + +Same one in Ubuntu: +https://bugs.launchpad.net/ubuntu/+source/libsdl1.2/+bug/66217 + +We've been including a patch since then (attached) to actually export the +symbol, since 2006. In the last release the function seems to be there, alive +and kicking. + +It's affecting other people too: +http://www.garagegames.com/community/forums/viewthread/52287 + +diff -r 5273dfd19a5e -r 900a0fae90ca src/video/x11/SDL_x11events.c +--- a/src/video/x11/SDL_x11events.c Sat Jan 21 12:06:51 2012 -0500 ++++ b/src/video/x11/SDL_x11events.c Sun Jan 22 13:47:21 2012 -0500 +@@ -1246,8 +1246,11 @@ + * sequences (dead accents, compose key sequences) will not work since the + * state has been irrevocably lost. + */ ++extern DECLSPEC Uint16 SDLCALL X11_KeyToUnicode(SDLKey, SDLMod); ++ + Uint16 X11_KeyToUnicode(SDLKey keysym, SDLMod modifiers) + { ++ static int warning = 0; + struct SDL_VideoDevice *this = current_video; + char keybuf[32]; + int i; +@@ -1255,6 +1258,12 @@ + XKeyEvent xkey; + Uint16 unicode; + ++ if ( warning ) { ++ warning = 0; ++ fprintf(stderr, "WARNING: Application is using X11_KeyToUnicode().\n"); ++ fprintf(stderr, "This is not an official SDL function, please report this as a bug.\n"); ++ } ++ + if ( !this || !SDL_Display ) { + return 0; + } + diff --git a/libre-multilib/lib32-sdl-libre/fix_joystick_misc_axes.diff b/libre-multilib/lib32-sdl/fix_joystick_misc_axes.diff index 75e3755c9..75e3755c9 100644 --- a/libre-multilib/lib32-sdl-libre/fix_joystick_misc_axes.diff +++ b/libre-multilib/lib32-sdl/fix_joystick_misc_axes.diff diff --git a/libre-multilib/lib32-sdl-libre/libre.patch b/libre-multilib/lib32-sdl/libre.patch index 72f7da56a..72f7da56a 100644 --- a/libre-multilib/lib32-sdl-libre/libre.patch +++ b/libre-multilib/lib32-sdl/libre.patch diff --git a/libre-multilib/lib32-sdl-libre/libsdl-1.2.15-resizing.patch b/libre-multilib/lib32-sdl/libsdl-1.2.15-resizing.patch index 0655a13e1..0655a13e1 100644 --- a/libre-multilib/lib32-sdl-libre/libsdl-1.2.15-resizing.patch +++ b/libre-multilib/lib32-sdl/libsdl-1.2.15-resizing.patch diff --git a/libre-multilib/lib32-sdl-libre/sdl-1.2.14-disable-mmx.patch b/libre-multilib/lib32-sdl/sdl-1.2.14-disable-mmx.patch index 1bb6e0e47..1bb6e0e47 100644 --- a/libre-multilib/lib32-sdl-libre/sdl-1.2.14-disable-mmx.patch +++ b/libre-multilib/lib32-sdl/sdl-1.2.14-disable-mmx.patch diff --git a/libre-multilib/lib32-sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch b/libre-multilib/lib32-sdl/sdl-1.2.14-fix-mouse-clicking.patch index 7d3e5acfc..7d3e5acfc 100644 --- a/libre-multilib/lib32-sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch +++ b/libre-multilib/lib32-sdl/sdl-1.2.14-fix-mouse-clicking.patch diff --git a/libre-multilib/lib32-sdl/sdl_x11sym.patch b/libre-multilib/lib32-sdl/sdl_x11sym.patch new file mode 100644 index 000000000..9aaa2353b --- /dev/null +++ b/libre-multilib/lib32-sdl/sdl_x11sym.patch @@ -0,0 +1,12 @@ +--- src/video/x11/SDL_x11sym.h-orig 2013-07-16 23:56:46.718523385 -0600 ++++ src/video/x11/SDL_x11sym.h 2013-07-16 23:58:27.025186485 -0600 +@@ -165,7 +165,8 @@ + */ + #ifdef LONG64 + SDL_X11_MODULE(IO_32BIT) +-SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return) ++ ++SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return) + SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),) + #endif + |