[arch-commits] Commit in lib32-sdl2/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Friday, December 24, 2021 @ 17:15:22
  Author: arojas
Revision: 1083427

Update to 2.0.18

Modified:
  lib32-sdl2/trunk/PKGBUILD

----------+
 PKGBUILD |   27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-24 17:04:14 UTC (rev 1083426)
+++ PKGBUILD	2021-12-24 17:15:22 UTC (rev 1083427)
@@ -3,7 +3,7 @@
 # Contributor: J0k3r <moebius282 at gmail.com>
 
 pkgname=lib32-sdl2
-pkgver=2.0.16
+pkgver=2.0.18
 pkgrel=1
 pkgdesc='A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard'
 arch=(x86_64)
@@ -37,21 +37,20 @@
   'lib32-libpulse: PulseAudio audio driver'
   'lib32-jack: JACK audio driver'
 )
-_tag=25f9ed87ff6947d9576fc9d79dee0784e638ac58
-source=(git+https://github.com/libsdl-org/SDL.git#tag=${_tag})
-sha512sums=(SKIP)
+source=("https://www.libsdl.org/release/SDL2-${pkgver}.tar.gz"{,.sig}
+         sdl2-wayland1.20.patch::https://github.com/libsdl-org/SDL/pull/5092.patch)
+sha512sums=('8688b855ce15d574fb0726dd2a44109bb7b34d81c652c51025a32bf7eb7015ceb685834cf9fc3f97a2f5f5a3203f548ce6845420fafae7e5dc6bb9d11ce1740d'
+            'SKIP'
+            'efa2d01a5861f99597eac0cff7e67efc03bd3877d8ad53d711b1ab54a59f93ef5bc6ffe776b9ac7e3103688a56f79e7d0e4155852dedd0d1982a1e334a2f8d37')
+validpgpkeys=('1528635D8053A57F77D1E08630A59377A7763BE6') # Sam Lantinga
 
-pkgver() {
-  cd SDL
-
-  git describe --tags | sed 's/^release-//'
-}
-
 prepare() {
   # fix libdir
-  sed -i 's|lib/cmake|lib32/cmake|' SDL/CMakeLists.txt
+  sed -i 's|lib/cmake|lib32/cmake|' SDL2-${pkgver}/CMakeLists.txt
   # Don't try to link against ibus
-  sed -i '/pkg_search_module.*ibus-1.0/d' SDL/CMakeLists.txt
+  sed -i '/pkg_search_module.*ibus-1.0/d' SDL2-${pkgver}/CMakeLists.txt
+  # Fix build with wayland 1.20
+  patch -d SDL2-${pkgver} -p1 < sdl2-wayland1.20.patch
 }
 
 build() {
@@ -59,9 +58,9 @@
   export CXX='g++ -m32'
   export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
 
-  cmake -S SDL -B build \
+  cmake -S SDL2-${pkgver} -B build \
       -DCMAKE_INSTALL_PREFIX=/usr \
-      -DLIB_SUFFIX=32 \
+      -DCMAKE_INSTALL_LIBDIR=lib32 \
       -DSDL_STATIC=OFF \
       -DSDL_DLOPEN=ON \
       -DARTS=OFF \