diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-10-21 09:42:57 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-10-21 09:43:54 +0000 |
| commit | 6eeb82b3383397fb6a18f4a6f6aee26fab22abc7 (patch) | |
| tree | 12abd3bb74870f0944de6a4d55e9585bab19c2ac /main | |
| parent | 6c2fb0dcea181e9d268e36fe5fa963951f02d852 (diff) | |
| download | aports-6eeb82b3383397fb6a18f4a6f6aee26fab22abc7.tar.bz2 aports-6eeb82b3383397fb6a18f4a6f6aee26fab22abc7.tar.xz | |
main/sdl: fix building against libx11-1.6
Diffstat (limited to 'main')
| -rw-r--r-- | main/sdl/APKBUILD | 15 | ||||
| -rw-r--r-- | main/sdl/SDL-1.2.15-const_XData32.patch | 86 |
2 files changed, 98 insertions, 3 deletions
diff --git a/main/sdl/APKBUILD b/main/sdl/APKBUILD index 61a68822d0..2ce1080ab2 100644 --- a/main/sdl/APKBUILD +++ b/main/sdl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sdl pkgver=1.2.15 -pkgrel=4 +pkgrel=5 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard" url="http://www.libsdl.org" arch="all" @@ -12,7 +12,9 @@ depends_dev="libx11-dev libiconv-dev" makedepends="$depends_dev libxext-dev libxrender-dev libx11-dev libice-dev libsm-dev libxrandr-dev mesa-dev alsa-lib-dev libiconv-dev glu-dev" source="http://www.libsdl.org/release/SDL-$pkgver.tar.gz - SDL-1.2.10-GrabNotViewable.patch" + SDL-1.2.10-GrabNotViewable.patch + SDL-1.2.15-const_XData32.patch + " _builddir="$srcdir"/SDL-$pkgver prepare() { @@ -51,4 +53,11 @@ package() { } md5sums="9d96df8417572a2afb781a7c4c811a85 SDL-1.2.15.tar.gz -37ad001a4d2ff924a5fab356b49f8a78 SDL-1.2.10-GrabNotViewable.patch" +37ad001a4d2ff924a5fab356b49f8a78 SDL-1.2.10-GrabNotViewable.patch +d9ad0c726f7d3f3e3c8bbf83368cd38d SDL-1.2.15-const_XData32.patch" +sha256sums="d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00 SDL-1.2.15.tar.gz +ea2042b8a45a083b1447d5c56e52b23b79f2ddb0d717ec7b287b34ef71bd2d1a SDL-1.2.10-GrabNotViewable.patch +465c611d4a9db44a6d7f0a8f6ef9583ec4b85383b17a2b706b3a811294220173 SDL-1.2.15-const_XData32.patch" +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/main/sdl/SDL-1.2.15-const_XData32.patch b/main/sdl/SDL-1.2.15-const_XData32.patch new file mode 100644 index 0000000000..19d61cb86a --- /dev/null +++ b/main/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 + +<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 + +</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> |