summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/sdl-libre/PKGBUILD15
-rw-r--r--libre/sdl-libre/sdl_x11sym.patch12
2 files changed, 23 insertions, 4 deletions
diff --git a/libre/sdl-libre/PKGBUILD b/libre/sdl-libre/PKGBUILD
index cab25d91e..e16042e95 100644
--- a/libre/sdl-libre/PKGBUILD
+++ b/libre/sdl-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 166672 2012-09-15 09:39:11Z heftig $
+# $Id: PKGBUILD 197193 2013-10-23 17:24:50Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: dorphell <dorphell@archlinux.org>
@@ -8,7 +8,7 @@
pkgname=sdl-libre
pkgver=1.2.15
-pkgrel=3
+pkgrel=4
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"
@@ -17,7 +17,7 @@ provides=("sdl=${pkgver}")
conflicts=('sdl')
replaces=('sdl')
depends=('glibc' 'libxext' 'libxrender' 'libx11')
-makedepends=('alsa-lib' 'mesa' 'libpulse')
+makedepends=('alsa-lib' 'mesa' 'libpulse' 'glu')
optdepends=('alsa-lib: ALSA audio driver'
'libpulse: PulseAudio audio driver')
options=('!libtool')
@@ -26,21 +26,28 @@ source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
sdl-1.2.14-disable-mmx.patch
fix_joystick_misc_axes.diff
libsdl-1.2.15-resizing.patch
+ sdl_x11sym.patch
libre.patch)
md5sums=('9d96df8417572a2afb781a7c4c811a85'
'04d8c179f125e04bcd4c9d60e013c2d7'
'e5c16b7611f62c7cb25f0534eff68852'
'687586a108b597a2a6b73070c1d37e51'
'3dd50347d8856160a9cbd7f80383a1f8'
+ '148b285bccee9d21bb96db807363b962'
'5c665f72b8a2adc97a91f6db6f2da79a')
-build() {
+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 -Np0 -i ../libre.patch
+}
+
+build() {
+ cd SDL-$pkgver
./configure --prefix=/usr --disable-nasm --enable-alsa \
--with-x --disable-rpath --disable-static
make
diff --git a/libre/sdl-libre/sdl_x11sym.patch b/libre/sdl-libre/sdl_x11sym.patch
new file mode 100644
index 000000000..9aaa2353b
--- /dev/null
+++ b/libre/sdl-libre/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
+