summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2020-04-05 12:23:59 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2020-04-05 12:23:59 +0000
commit39a48d409358e7e0ae865d97f126fcfc2e79f854 (patch)
tree1314a2d65abf239bdcb8ce4371b50be2b27c90e9
parentaa7357466ec0b6bd44b92aa6effffc13fc3fcda5 (diff)
downloadpackages-39a48d409358e7e0ae865d97f126fcfc2e79f854.tar.gz
packages-39a48d409358e7e0ae865d97f126fcfc2e79f854.tar.bz2
packages-39a48d409358e7e0ae865d97f126fcfc2e79f854.tar.xz
packages-39a48d409358e7e0ae865d97f126fcfc2e79f854.zip
user/sdl2: Update to 2.0.12
-rw-r--r--user/sdl2/APKBUILD10
-rw-r--r--user/sdl2/gles.patch12
-rw-r--r--user/sdl2/sdl2-soname.patch2
3 files changed, 5 insertions, 19 deletions
diff --git a/user/sdl2/APKBUILD b/user/sdl2/APKBUILD
index e11d9d7ae..c7dd81e68 100644
--- a/user/sdl2/APKBUILD
+++ b/user/sdl2/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: August Klein <amatcoder@gmail.com>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=sdl2
-pkgver=2.0.10
-pkgrel=1
+pkgver=2.0.12
+pkgrel=0
pkgdesc="Low level audio, keyboard, mouse, joystick and graphics library"
url="https://www.libsdl.org/"
arch="all"
@@ -14,7 +14,6 @@ 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,6 +37,5 @@ package() {
make DESTDIR="$pkgdir" -C build install
}
-sha512sums="f49b869362699b3282f6e82920e59c7fac581bcbf955f18a81cc126293c08093a90df7fcb39517cc8bc32708d2213fe645a42b655d6d811c1386efebb3d3c798 SDL2-2.0.10.tar.gz
-c345096eb98617c41ea5a7b79864082d869800dd54fb9d4aa565446dfafc9ec345193555c25c03f318fa13ed82f267eab6b164a1870ead5fb98a1216cbfd4a0b gles.patch
-23fbb178730f0955732cbb3a61145e7ec1bf7810a2589c259cd715557cb4ff5bcbc676197db375ad31be46dab93c6ea7e06b3549414205ae56e1b65a8c8ab21a sdl2-soname.patch"
+sha512sums="3f1f04af0f3d9dda9c84a2e9274ae8d83ea0da3fc367970a820036cc4dc1dbf990cfc37e4975ae05f0b45a4ffa739c6c19e470c00bf3f2bce9b8b63717b8b317 SDL2-2.0.12.tar.gz
+81b5807cd9f2683231c14562e961467fcd7ba257140d1a266932d6a6a5103633e3af896c09b261620b2934d521809e08ed79d3287c0897f4783c6afc1c01a566 sdl2-soname.patch"
diff --git a/user/sdl2/gles.patch b/user/sdl2/gles.patch
deleted file mode 100644
index c400577e1..000000000
--- a/user/sdl2/gles.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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 */
-
diff --git a/user/sdl2/sdl2-soname.patch b/user/sdl2/sdl2-soname.patch
index 8f040e30c..7ed5b14bf 100644
--- a/user/sdl2/sdl2-soname.patch
+++ b/user/sdl2/sdl2-soname.patch
@@ -2,7 +2,7 @@ The library name is SDL2-2.0, not SDL2. This fixes builds against SDL.
--- SDL2-2.0.10/CMakeLists.txt.old 2019-07-25 04:32:36.000000000 +0000
+++ SDL2-2.0.10/CMakeLists.txt 2020-01-03 17:23:42.451699149 +0000
-@@ -224,7 +224,7 @@
+@@ -233,7 +233,7 @@
# Those are used for pkg-config and friends, so that the SDL2.pc, sdl2-config,
# etc. are created correctly.