From 6eeb82b3383397fb6a18f4a6f6aee26fab22abc7 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Mon, 21 Oct 2013 09:42:57 +0000 Subject: main/sdl: fix building against libx11-1.6 --- main/sdl/APKBUILD | 15 ++++-- main/sdl/SDL-1.2.15-const_XData32.patch | 86 +++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 3 deletions(-) create mode 100644 main/sdl/SDL-1.2.15-const_XData32.patch (limited to 'main/sdl') diff --git a/main/sdl/APKBUILD b/main/sdl/APKBUILD index 61a68822d..2ce1080ab 100644 --- a/main/sdl/APKBUILD +++ b/main/sdl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa 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 000000000..19d61cb86 --- /dev/null +++ b/main/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