user/sdl: pull in, take, fix a bit

author: A. Wilcox <AWilcox@Wilcox-Tech.com> 2018-07-09 22:43:31 -0500
committer: A. Wilcox <AWilcox@Wilcox-Tech.com> 2018-07-09 22:43:31 -0500
commit: 1260f86b565660da72dc1519a8e559bf6698ec2f (patch)
tree: c3d99a3ca0ec0419d9122f08d8339ed462b89867
parent: 8e4a0999462da95f45199a637dd461d04154e590 (diff)
download: packages-1260f86b565660da72dc1519a8e559bf6698ec2f.tar.gz
packages-1260f86b565660da72dc1519a8e559bf6698ec2f.tar.bz2
packages-1260f86b565660da72dc1519a8e559bf6698ec2f.tar.xz
packages-1260f86b565660da72dc1519a8e559bf6698ec2f.zip
3 files changed, 159 insertions, 0 deletions
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 <awilfox@adelielinux.org>
+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 <pbonzini@redhat.com>.
+See <http://bugzilla.libsdl.org/show_bug.cgi?id=1155>.
+
+--- ./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 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
+<head>
+<title>SDL.git - SDL</title>
+<meta name='generator' content='cgit v0.9.2'/>
+<meta name='robots' content='index, nofollow'/>
+<link rel='stylesheet' type='text/css' href='/cgit-data/cgit.css'/>
+<link rel='alternate' title='Atom feed' href='http://pkgs.fedoraproject.org/cgit/SDL.git/atom/SDL-1.2.15-const_XData32.patch?h=master' type='application/atom+xml'/>
+</head>
+<body>
+<div id='cgit'><table id='header'>
+<tr>
+<td class='logo' rowspan='2'><a href='/cgit/'><img src='/cgit-data/cgit.png' alt='cgit logo'/></a></td>
+<td class='main'><a href='/cgit/'>index</a> : <a title='SDL.git' href='/cgit/SDL.git/'>SDL.git</a></td><td class='form'><form method='get' action=''>
+<select name='h' onchange='this.form.submit();'>
+<option value='f10'>f10</option>
+<option value='f11'>f11</option>
+<option value='f12'>f12</option>
+<option value='f13'>f13</option>
+<option value='f14'>f14</option>
+<option value='f15'>f15</option>
+<option value='f16'>f16</option>
+<option value='f17'>f17</option>
+<option value='f18'>f18</option>
+<option value='f19'>f19</option>
+<option value='f20'>f20</option>
+<option value='f7'>f7</option>
+<option value='f8'>f8</option>
+<option value='f9'>f9</option>
+<option value='master' selected='selected'>master</option>
+</select> <input type='submit' name='' value='switch'/></form></td></tr>
+<tr><td class='sub'>SDL</td><td class='sub right'>Jesse Keating</td></tr></table>
+<table class='tabs'><tr><td>
+<a href='/cgit/SDL.git/'>summary</a><a href='/cgit/SDL.git/refs/'>refs</a><a href='/cgit/SDL.git/log/SDL-1.2.15-const_XData32.patch'>log</a><a class='active' href='/cgit/SDL.git/tree/SDL-1.2.15-const_XData32.patch'>tree</a><a href='/cgit/SDL.git/commit/SDL-1.2.15-const_XData32.patch'>commit</a><a href='/cgit/SDL.git/diff/SDL-1.2.15-const_XData32.patch'>diff</a><a href='/cgit/SDL.git/stats/SDL-1.2.15-const_XData32.patch'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit/SDL.git/log/SDL-1.2.15-const_XData32.patch'>
+<select name='qt'>
+<option value='grep'>log msg</option>
+<option value='author'>author</option>
+<option value='committer'>committer</option>
+<option value='range'>range</option>
+</select>
+<input class='txt' type='text' size='10' name='q' value=''/>
+<input type='submit' value='search'/>
+</form>
+</td></tr></table>
+<div class='path'>path: <a href='/cgit/SDL.git/tree/'>root</a>/<a href='/cgit/SDL.git/tree/SDL-1.2.15-const_XData32.patch'>SDL-1.2.15-const_XData32.patch</a></div><div class='content'>blob: 0f1c07cfb113e4cc650589e199d4e79a538c44e0 (<a href='/cgit/SDL.git/plain/SDL-1.2.15-const_XData32.patch'>plain</a>)
+<table summary='blob content' class='blob'>
+<tr><td class='linenumbers'><pre><a class='no' id='n1' name='n1' href='#n1'>1</a>
+<a class='no' id='n2' name='n2' href='#n2'>2</a>
+<a class='no' id='n3' name='n3' href='#n3'>3</a>
+<a class='no' id='n4' name='n4' href='#n4'>4</a>
+<a class='no' id='n5' name='n5' href='#n5'>5</a>
+<a class='no' id='n6' name='n6' href='#n6'>6</a>
+<a class='no' id='n7' name='n7' href='#n7'>7</a>
+<a class='no' id='n8' name='n8' href='#n8'>8</a>
+<a class='no' id='n9' name='n9' href='#n9'>9</a>
+<a class='no' id='n10' name='n10' href='#n10'>10</a>
+<a class='no' id='n11' name='n11' href='#n11'>11</a>
+<a class='no' id='n12' name='n12' href='#n12'>12</a>
+<a class='no' id='n13' name='n13' href='#n13'>13</a>
+<a class='no' id='n14' name='n14' href='#n14'>14</a>
+<a class='no' id='n15' name='n15' href='#n15'>15</a>
+<a class='no' id='n16' name='n16' href='#n16'>16</a>
+</pre></td>
+<td class='lines'><pre><code>libX11-1.5.99.901 has changed prototype of _XData32
+
+&lt;http://bugzilla.libsdl.org/show_bug.cgi?id=1769&gt;
+
+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
+ 
+</code></pre></td></tr></table>
+</div> <!-- class=content -->
+<div class='footer'>generated  by cgit v0.9.2 at 2013-10-21 09:41:28 (GMT)</div>
+</div> <!-- id=cgit -->
+</body>
+</html>
author	A. Wilcox <AWilcox@Wilcox-Tech.com>	2018-07-09 22:43:31 -0500
committer	A. Wilcox <AWilcox@Wilcox-Tech.com>	2018-07-09 22:43:31 -0500
commit	1260f86b565660da72dc1519a8e559bf6698ec2f (patch)
tree	c3d99a3ca0ec0419d9122f08d8339ed462b89867
parent	8e4a0999462da95f45199a637dd461d04154e590 (diff)
download	packages-1260f86b565660da72dc1519a8e559bf6698ec2f.tar.gz packages-1260f86b565660da72dc1519a8e559bf6698ec2f.tar.bz2 packages-1260f86b565660da72dc1519a8e559bf6698ec2f.tar.xz packages-1260f86b565660da72dc1519a8e559bf6698ec2f.zip