From d66e2ddf1eaff25f83d00afdc336c10252f56162 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Tue, 6 Sep 2011 15:07:55 -0300 Subject: libre/sdl-libre-1.2.14-7 --- libre/sdl-libre/PKGBUILD | 41 ++++++++++++++++++++++ .../sdl-1.2.14-fix-disappearing-cursor.patch | 17 +++++++++ .../sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch | 23 ++++++++++++ libre/sdl-libre/sdl-1.2.14-joystick-crash.diff | 14 ++++++++ 4 files changed, 95 insertions(+) create mode 100644 libre/sdl-libre/PKGBUILD create mode 100644 libre/sdl-libre/sdl-1.2.14-fix-disappearing-cursor.patch create mode 100644 libre/sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch create mode 100644 libre/sdl-libre/sdl-1.2.14-joystick-crash.diff diff --git a/libre/sdl-libre/PKGBUILD b/libre/sdl-libre/PKGBUILD new file mode 100644 index 000000000..6d1767ec6 --- /dev/null +++ b/libre/sdl-libre/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 135310 2011-08-12 14:45:48Z ibiru $ +#mips64el Maintainer: Allan McRae +# Contributor: dorphell +# Maintainer: Henry Jensen + +pkgname=sdl-libre +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') +provides=("sdl=${pkgver}") +conflicts=('sdl') +depends=('glibc' 'libxext' 'libxrender' 'libx11') +makedepends=('alsa-lib' 'mesa') +replaces=('sdl') +options=('!libtool') +source=(http://repo.parabolagnulinux.org/other/SDL-${pkgver}-libre.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=('b8ac7254fe5425a0fb238fb535d3d14c' + '9d8890b3817736a5d365f7497f096634' + '04d8c179f125e04bcd4c9d60e013c2d7' + 'a6cf3e71b653aa97d0d8ae6c0a789807') + +build() { + cd ${srcdir}/SDL-${pkgver}-libre + 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}-libre + make DESTDIR=${pkgdir} install +} diff --git a/libre/sdl-libre/sdl-1.2.14-fix-disappearing-cursor.patch b/libre/sdl-libre/sdl-1.2.14-fix-disappearing-cursor.patch new file mode 100644 index 000000000..fcd3c314d --- /dev/null +++ b/libre/sdl-libre/sdl-1.2.14-fix-disappearing-cursor.patch @@ -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, 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 new file mode 100644 index 000000000..7d3e5acfc --- /dev/null +++ b/libre/sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch @@ -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; + diff --git a/libre/sdl-libre/sdl-1.2.14-joystick-crash.diff b/libre/sdl-libre/sdl-1.2.14-joystick-crash.diff new file mode 100644 index 000000000..949e18b96 --- /dev/null +++ b/libre/sdl-libre/sdl-1.2.14-joystick-crash.diff @@ -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; -- cgit v1.2.3-2-g168b