diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-20 17:49:38 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-20 17:49:38 +0000 |
| commit | c360fb7ccd7fcf5e08088a5f179b47112d0d374e (patch) | |
| tree | 49dc8eb0e926ee9ff36de85697be97425a572fdd | |
| parent | cbccfe59728846f22ad196a4ba5c58e0a705a6b6 (diff) | |
| download | packages-c360fb7ccd7fcf5e08088a5f179b47112d0d374e.tar.gz packages-c360fb7ccd7fcf5e08088a5f179b47112d0d374e.tar.bz2 packages-c360fb7ccd7fcf5e08088a5f179b47112d0d374e.tar.xz packages-c360fb7ccd7fcf5e08088a5f179b47112d0d374e.zip | |
user/sdl2: Fix 32-bit build with GLES
| -rw-r--r-- | user/sdl2/APKBUILD | 4 | ||||
| -rw-r--r-- | user/sdl2/gles.patch | 12 |
2 files changed, 15 insertions, 1 deletions
diff --git a/user/sdl2/APKBUILD b/user/sdl2/APKBUILD index 36e3ee8bf..e11d9d7ae 100644 --- a/user/sdl2/APKBUILD +++ b/user/sdl2/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=sdl2 pkgver=2.0.10 -pkgrel=0 +pkgrel=1 pkgdesc="Low level audio, keyboard, mouse, joystick and graphics library" url="https://www.libsdl.org/" arch="all" @@ -14,6 +14,7 @@ makedepends="alsa-lib-dev libx11-dev libxcursor-dev libxext-dev libxi-dev libxscrnsaver-dev dbus-dev eudev-dev pulseaudio-dev cmake" subpackages="$pkgname-dev" source="https://www.libsdl.org/release/SDL2-$pkgver.tar.gz + gles.patch sdl2-soname.patch " builddir="$srcdir/SDL2-$pkgver" @@ -38,4 +39,5 @@ package() { } sha512sums="f49b869362699b3282f6e82920e59c7fac581bcbf955f18a81cc126293c08093a90df7fcb39517cc8bc32708d2213fe645a42b655d6d811c1386efebb3d3c798 SDL2-2.0.10.tar.gz +c345096eb98617c41ea5a7b79864082d869800dd54fb9d4aa565446dfafc9ec345193555c25c03f318fa13ed82f267eab6b164a1870ead5fb98a1216cbfd4a0b gles.patch 23fbb178730f0955732cbb3a61145e7ec1bf7810a2589c259cd715557cb4ff5bcbc676197db375ad31be46dab93c6ea7e06b3549414205ae56e1b65a8c8ab21a sdl2-soname.patch" diff --git a/user/sdl2/gles.patch b/user/sdl2/gles.patch new file mode 100644 index 000000000..c400577e1 --- /dev/null +++ b/user/sdl2/gles.patch @@ -0,0 +1,12 @@ +--- SDL2-2.0.10/src/video/SDL_video.c.old 2019-07-25 04:32:37.000000000 +0000 ++++ SDL2-2.0.10/src/video/SDL_video.c 2020-01-20 17:32:52.918453596 +0000 +@@ -37,7 +37,8 @@ + #include "SDL_opengl.h" + #endif /* SDL_VIDEO_OPENGL */ + +-#if SDL_VIDEO_OPENGL_ES ++/* GL and GLES headers conflict on Linux 32 bits */ ++#if SDL_VIDEO_OPENGL_ES && !SDL_VIDEO_OPENGL + #include "SDL_opengles.h" + #endif /* SDL_VIDEO_OPENGL_ES */ + |