From 1260f86b565660da72dc1519a8e559bf6698ec2f Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Mon, 9 Jul 2018 22:43:31 -0500 Subject: user/sdl: pull in, take, fix a bit --- user/sdl/APKBUILD | 51 ++++++++++++++++++ user/sdl/SDL-1.2.10-GrabNotViewable.patch | 22 ++++++++ user/sdl/SDL-1.2.15-const_XData32.patch | 86 +++++++++++++++++++++++++++++++ 3 files changed, 159 insertions(+) create mode 100644 user/sdl/APKBUILD create mode 100644 user/sdl/SDL-1.2.10-GrabNotViewable.patch create mode 100644 user/sdl/SDL-1.2.15-const_XData32.patch (limited to 'user/sdl') diff --git a/user/sdl/APKBUILD b/user/sdl/APKBUILD new file mode 100644 index 000000000..176ac36b9 --- /dev/null +++ b/user/sdl/APKBUILD @@ -0,0 +1,51 @@ +# Maintainer: A. Wilcox +pkgname=sdl +pkgver=1.2.15 +pkgrel=9 +pkgdesc="Library for low-level graphics, audio, and input access" +url="http://www.libsdl.org" +arch="all" +options="!check" # Tests are all interactive. +license="LGPL-2.1+" +subpackages="$pkgname-dev $pkgname-doc" +depends= +depends_dev="libx11-dev" +makedepends="$depends_dev libxext-dev libxrender-dev libx11-dev libice-dev + libsm-dev libxrandr-dev mesa-dev alsa-lib-dev glu-dev" +source="http://www.libsdl.org/release/SDL-$pkgver.tar.gz + SDL-1.2.10-GrabNotViewable.patch + SDL-1.2.15-const_XData32.patch + " +builddir="$srcdir"/SDL-$pkgver + +prepare() { + cd "$builddir" + update_config_sub + default_prepare +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --disable-nasm \ + --disable-esd \ + --disable-video-svga \ + --disable-video-ggi \ + --disable-video-aalib \ + --enable-alsa \ + --with-x \ + --disable-rpath + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="ac392d916e6953b0925a7cbb0f232affea33339ef69b47a0a7898492afb9784b93138986df53d6da6d3e2ad79af1e9482df565ecca30f89428be0ae6851b1adc SDL-1.2.15.tar.gz +20049408d4c00d895c39a7901d889d1874ebcd382e93b2e8df38bd3726e2236f4e9a980720724cf176a35d05fb0db5dbcabd42089423adeb404f2dba16d52b7b SDL-1.2.10-GrabNotViewable.patch +ae7cdb61930199a7989e1690be37133eddeb8d446fef3fb5bbe0008d5e3b30abb28f4cc8ffea5d7a186ec242f158ed06dbd2b9ea98ca3e3caeed5ab12bac6875 SDL-1.2.15-const_XData32.patch" diff --git a/user/sdl/SDL-1.2.10-GrabNotViewable.patch b/user/sdl/SDL-1.2.10-GrabNotViewable.patch new file mode 100644 index 000000000..128cf3510 --- /dev/null +++ b/user/sdl/SDL-1.2.10-GrabNotViewable.patch @@ -0,0 +1,22 @@ +Makes SDL-1.2 SDL_WM_GrabInput() non-blocking in case of SDL window is not +viewable. Patch provided by . +See . + +--- ./src/video/x11/SDL_x11wm.c 2007-12-31 04:48:13.000000000 +0000 ++++ ./src/video/x11/SDL_x11wm.c 2009-01-15 10:27:14.000000000 +0000 +@@ -351,13 +351,14 @@ SDL_GrabMode X11_GrabInputNoLock(_THIS, + result = XGrabPointer(SDL_Display, SDL_Window, True, 0, + GrabModeAsync, GrabModeAsync, + SDL_Window, None, CurrentTime); +- if ( result == GrabSuccess ) { ++ if ( result == GrabSuccess || result == GrabNotViewable ) { + break; + } + SDL_Delay(100); + } + if ( result != GrabSuccess ) { + /* Uh, oh, what do we do here? */ ; ++ return(SDL_GRAB_OFF); + } + /* Now grab the keyboard */ + XGrabKeyboard(SDL_Display, WMwindow, True, diff --git a/user/sdl/SDL-1.2.15-const_XData32.patch b/user/sdl/SDL-1.2.15-const_XData32.patch new file mode 100644 index 000000000..19d61cb86 --- /dev/null +++ b/user/sdl/SDL-1.2.15-const_XData32.patch @@ -0,0 +1,86 @@ + + + +SDL.git - SDL + + + + + + +
+ + + + +
+summaryrefslogtreecommitdiffstats
+ + + +
+
+
path: root/SDL-1.2.15-const_XData32.patch
blob: 0f1c07cfb113e4cc650589e199d4e79a538c44e0 (plain) + + +
1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+
libX11-1.5.99.901 has changed prototype of _XData32
+
+<http://bugzilla.libsdl.org/show_bug.cgi?id=1769>
+
+diff -r b6b2829cd7ef src/video/x11/SDL_x11sym.h
+--- a/src/video/x11/SDL_x11sym.h	Wed Feb 27 15:20:31 2013 -0800
++++ b/src/video/x11/SDL_x11sym.h	Wed Mar 27 16:07:23 2013 +0100
+@@ -165,7 +165,7 @@
+  */
+ #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
+ 
+
+
+
generated by cgit v0.9.2 at 2013-10-21 09:41:28 (GMT)
+
+ + -- cgit v1.2.3-70-g09d2