diff options
Diffstat (limited to 'libre/sdl-libre')
-rwxr-xr-x[-rw-r--r--] | libre/sdl-libre/PKGBUILD | 40 | ||||
-rw-r--r-- | libre/sdl-libre/fix_joystick_misc_axes.diff | 13 | ||||
-rw-r--r-- | libre/sdl-libre/libre.patch (renamed from libre/sdl-libre/riva_mmio.patch) | 24 | ||||
-rw-r--r-- | libre/sdl-libre/libsdl-1.2.15-resizing.patch | 63 | ||||
-rw-r--r-- | libre/sdl-libre/no-riva-accel.patch | 24 | ||||
-rwxr-xr-x[-rw-r--r--] | libre/sdl-libre/sdl-1.2.14-disable-mmx.patch | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | libre/sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch | 0 |
7 files changed, 123 insertions, 41 deletions
diff --git a/libre/sdl-libre/PKGBUILD b/libre/sdl-libre/PKGBUILD index 662bcba99..9822d5df7 100644..100755 --- a/libre/sdl-libre/PKGBUILD +++ b/libre/sdl-libre/PKGBUILD @@ -1,46 +1,52 @@ -# $Id: PKGBUILD 135310 2011-08-12 14:45:48Z ibiru $ -#mips64el Maintainer: Allan McRae <allan@archlinux.org> +# $Id: PKGBUILD 166672 2012-09-15 09:39:11Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Allan McRae <allan@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> -# Maintainer (Connochaetos): Henry Jensen <hjensen@connochaetos.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> +# Maintainer (Connochaetos): Henry Jensen <hjensen@connochaetos.org> pkgname=sdl-libre pkgver=1.2.15 -pkgrel=1.2 +pkgrel=3 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') provides=("sdl=${pkgver}") conflicts=('sdl') +replaces=('sdl') depends=('glibc' 'libxext' 'libxrender' 'libx11') makedepends=('alsa-lib' 'mesa' 'libpulse') -replaces=('sdl') +optdepends=('alsa-lib: ALSA audio driver' + 'libpulse: PulseAudio audio driver') options=('!libtool') source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz sdl-1.2.14-fix-mouse-clicking.patch sdl-1.2.14-disable-mmx.patch - riva_mmio.patch - no-riva-accel.patch) + fix_joystick_misc_axes.diff + libsdl-1.2.15-resizing.patch + libre.patch) md5sums=('9d96df8417572a2afb781a7c4c811a85' '04d8c179f125e04bcd4c9d60e013c2d7' 'e5c16b7611f62c7cb25f0534eff68852' - 'f5ab9ba6ba2bb8df74d0f768f9df3ea8' - 'eb2f5899db608ad27b379faa5e0beb80') + '687586a108b597a2a6b73070c1d37e51' + '3dd50347d8856160a9cbd7f80383a1f8' + '5c665f72b8a2adc97a91f6db6f2da79a') build() { - cd ${srcdir}/SDL-${pkgver} - patch -Np1 -i $srcdir/sdl-1.2.14-fix-mouse-clicking.patch - patch -Np1 -i $srcdir/sdl-1.2.14-disable-mmx.patch - patch -Np0 -i $srcdir/riva_mmio.patch - patch -Np0 -i $srcdir/no-riva-accel.patch - ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \ + 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 ../libre.patch + ./configure --prefix=/usr --disable-nasm --enable-alsa \ --with-x --disable-rpath --disable-static make } package() { - cd ${srcdir}/SDL-${pkgver} - make DESTDIR=${pkgdir} install + cd SDL-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/libre/sdl-libre/fix_joystick_misc_axes.diff b/libre/sdl-libre/fix_joystick_misc_axes.diff new file mode 100644 index 000000000..75e3755c9 --- /dev/null +++ b/libre/sdl-libre/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/libre/sdl-libre/riva_mmio.patch b/libre/sdl-libre/libre.patch index 945d9bf9b..72f7da56a 100644 --- a/libre/sdl-libre/riva_mmio.patch +++ b/libre/sdl-libre/libre.patch @@ -552,3 +552,27 @@ /* The Riva has an accelerated color fill */ this->info.blit_fill = 1; +--- src/video/fbcon/SDL_fbvideo.c.orig 2011-09-08 17:30:03.670583685 +0200 ++++ src/video/fbcon/SDL_fbvideo.c 2011-09-08 17:30:24.230582737 +0200 +@@ -46,7 +46,6 @@ + #include "SDL_fbevents_c.h" + #include "SDL_fb3dfx.h" + #include "SDL_fbmatrox.h" +-#include "SDL_fbriva.h" + + /*#define FBCON_DEBUG*/ + +@@ -769,13 +768,6 @@ + #endif + FB_3DfxAccel(this, finfo.accel); + break; +- case FB_ACCEL_NV3: +- case FB_ACCEL_NV4: +-#ifdef FBACCEL_DEBUG +- printf("NVidia hardware accelerator!\n"); +-#endif +- FB_RivaAccel(this, finfo.accel); +- break; + default: + #ifdef FBACCEL_DEBUG + printf("Unknown hardware accelerator.\n"); diff --git a/libre/sdl-libre/libsdl-1.2.15-resizing.patch b/libre/sdl-libre/libsdl-1.2.15-resizing.patch new file mode 100644 index 000000000..0655a13e1 --- /dev/null +++ b/libre/sdl-libre/libsdl-1.2.15-resizing.patch @@ -0,0 +1,63 @@ +Description: Revert change that breaks window corner resizing + http://bugzilla.libsdl.org/show_bug.cgi?id=1430 +Author: Andrew Caudwell <acaudwell@gmail.com> +Last-Update: 2012-04-10 +Bug-Debian: http://bugs.debian.org/665779 + +diff -r c787fb1b5699 src/video/x11/SDL_x11events.c +--- a/src/video/x11/SDL_x11events.c Mon Feb 20 23:51:08 2012 -0500 ++++ b/src/video/x11/SDL_x11events.c Mon Mar 26 12:26:52 2012 +1300 +@@ -57,12 +57,6 @@ + static SDLKey MISC_keymap[256]; + SDLKey X11_TranslateKeycode(Display *display, KeyCode kc); + +-/* +- Pending resize target for ConfigureNotify (so outdated events don't +- cause inappropriate resize events) +-*/ +-int X11_PendingConfigureNotifyWidth = -1; +-int X11_PendingConfigureNotifyHeight = -1; + + #ifdef X_HAVE_UTF8_STRING + Uint32 Utf8ToUcs4(const Uint8 *utf8) +@@ -825,16 +819,6 @@ + #ifdef DEBUG_XEVENTS + printf("ConfigureNotify! (resize: %dx%d)\n", xevent.xconfigure.width, xevent.xconfigure.height); + #endif +- if ((X11_PendingConfigureNotifyWidth != -1) && +- (X11_PendingConfigureNotifyHeight != -1)) { +- if ((xevent.xconfigure.width != X11_PendingConfigureNotifyWidth) && +- (xevent.xconfigure.height != X11_PendingConfigureNotifyHeight)) { +- /* Event is from before the resize, so ignore. */ +- break; +- } +- X11_PendingConfigureNotifyWidth = -1; +- X11_PendingConfigureNotifyHeight = -1; +- } + if ( SDL_VideoSurface ) { + if ((xevent.xconfigure.width != SDL_VideoSurface->w) || + (xevent.xconfigure.height != SDL_VideoSurface->h)) { +diff -r c787fb1b5699 src/video/x11/SDL_x11events_c.h +--- a/src/video/x11/SDL_x11events_c.h Mon Feb 20 23:51:08 2012 -0500 ++++ b/src/video/x11/SDL_x11events_c.h Mon Mar 26 12:26:52 2012 +1300 +@@ -27,8 +27,3 @@ + extern void X11_InitOSKeymap(_THIS); + extern void X11_PumpEvents(_THIS); + extern void X11_SetKeyboardState(Display *display, const char *key_vec); +- +-/* Variables to be exported */ +-extern int X11_PendingConfigureNotifyWidth; +-extern int X11_PendingConfigureNotifyHeight; +- +diff -r c787fb1b5699 src/video/x11/SDL_x11video.c +--- a/src/video/x11/SDL_x11video.c Mon Feb 20 23:51:08 2012 -0500 ++++ b/src/video/x11/SDL_x11video.c Mon Mar 26 12:26:52 2012 +1300 +@@ -1182,8 +1182,6 @@ + current = NULL; + goto done; + } +- X11_PendingConfigureNotifyWidth = width; +- X11_PendingConfigureNotifyHeight = height; + } else { + if (X11_CreateWindow(this,current,width,height,bpp,flags) < 0) { + current = NULL; diff --git a/libre/sdl-libre/no-riva-accel.patch b/libre/sdl-libre/no-riva-accel.patch deleted file mode 100644 index 89f8ebeed..000000000 --- a/libre/sdl-libre/no-riva-accel.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- src/video/fbcon/SDL_fbvideo.c.orig 2011-09-08 17:30:03.670583685 +0200 -+++ src/video/fbcon/SDL_fbvideo.c 2011-09-08 17:30:24.230582737 +0200 -@@ -46,7 +46,6 @@ - #include "SDL_fbevents_c.h" - #include "SDL_fb3dfx.h" - #include "SDL_fbmatrox.h" --#include "SDL_fbriva.h" - - /*#define FBCON_DEBUG*/ - -@@ -769,13 +768,6 @@ - #endif - FB_3DfxAccel(this, finfo.accel); - break; -- case FB_ACCEL_NV3: -- case FB_ACCEL_NV4: --#ifdef FBACCEL_DEBUG -- printf("NVidia hardware accelerator!\n"); --#endif -- FB_RivaAccel(this, finfo.accel); -- break; - default: - #ifdef FBACCEL_DEBUG - printf("Unknown hardware accelerator.\n"); diff --git a/libre/sdl-libre/sdl-1.2.14-disable-mmx.patch b/libre/sdl-libre/sdl-1.2.14-disable-mmx.patch index 1bb6e0e47..1bb6e0e47 100644..100755 --- a/libre/sdl-libre/sdl-1.2.14-disable-mmx.patch +++ b/libre/sdl-libre/sdl-1.2.14-disable-mmx.patch diff --git a/libre/sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch b/libre/sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch index 7d3e5acfc..7d3e5acfc 100644..100755 --- a/libre/sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch +++ b/libre/sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch |