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

[Jan Steffens]

    Date: Tuesday, August 31, 2021 @ 23:07:38
  Author: heftig
Revision: 1010233

build from git

Modified:
  sdl/trunk/PKGBUILD

----------+
 PKGBUILD |   50 +++++++++++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-08-31 22:44:49 UTC (rev 1010232)
+++ PKGBUILD	2021-08-31 23:07:38 UTC (rev 1010233)
@@ -1,4 +1,4 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
 # Contributor: Allan McRae <allan at archlinux.org>
 # Contributor: dorphell <dorphell at archlinux.org>
 
@@ -10,11 +10,12 @@
 url="https://www.libsdl.org"
 license=('LGPL')
 depends=('glibc' 'libxext' 'libxrender' 'libx11')
-makedepends=('alsa-lib' 'mesa' 'libpulse' 'glu')
+makedepends=('alsa-lib' 'mesa' 'libpulse' 'glu' 'git')
 optdepends=('alsa-lib: ALSA audio driver'
             'libpulse: PulseAudio audio driver')
 options=('staticlibs')
-source=(https://www.libsdl.org/release/SDL-${pkgver}.tar.gz{,.sig}
+_commit=457d4e55ffe1b6ad4c4fa4559dbda8360bf8253d  # tags/release-1.2.15
+source=("git+https://github.com/libsdl-org/SDL-1.2#commit=$_commit"
         SDL-1.2.10-GrabNotViewable.patch
         SDL-1.2.15-SDL_EnableUNICODE_drops_keyboard_events.patch
         SDL-1.2.15-const_XData32.patch
@@ -25,21 +26,20 @@
         sdl-1.2.14-disable-mmx.patch
         libsdl-1.2.15-resizing.patch
         X11_KeyToUnicode.patch
-	SDL-1.2.15-CVE-2019-13616-validate_image_size_when_loading_BMP_files.patch
-	SDL-1.2.15-CVE-2019-7572-Fix-a-buffer-overread-in-IMA_ADPCM_nib.patch
-	SDL-1.2.15-CVE-2019-7572-Fix-a-buffer-overwrite-in-IMA_ADPCM_de.patch
-	SDL-1.2.15-CVE-2019-7573-CVE-2019-7576-Fix-buffer-overreads-in-.patch
-	SDL-1.2.15-CVE-2019-7574-Fix-a-buffer-overread-in-IMA_ADPCM_dec.patch
-	SDL-1.2.15-CVE-2019-7575-Fix-a-buffer-overwrite-in-MS_ADPCM_dec.patch
-	SDL-1.2.15-CVE-2019-7577-Fix-a-buffer-overread-in-MS_ADPCM_deco.patch
-	SDL-1.2.15-CVE-2019-7577-Fix-a-buffer-overread-in-MS_ADPCM_nibb.patch
-	SDL-1.2.15-CVE-2019-7578-Fix-a-buffer-overread-in-InitIMA_ADPCM.patch
-	SDL-1.2.15-CVE-2019-7635-Reject-BMP-images-with-pixel-colors-ou.patch
-	SDL-1.2.15-CVE-2019-7637-Fix-in-integer-overflow-in-SDL_Calcula.patch
-	SDL-1.2.15-CVE-2019-7638-CVE-2019-7636-Refuse-loading-BMP-image.patch
-	SDL-1.2.15-Reject-2-3-5-6-7-bpp-BMP-images.patch)
-sha256sums=('d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00'
-            'SKIP'
+        SDL-1.2.15-CVE-2019-13616-validate_image_size_when_loading_BMP_files.patch
+        SDL-1.2.15-CVE-2019-7572-Fix-a-buffer-overread-in-IMA_ADPCM_nib.patch
+        SDL-1.2.15-CVE-2019-7572-Fix-a-buffer-overwrite-in-IMA_ADPCM_de.patch
+        SDL-1.2.15-CVE-2019-7573-CVE-2019-7576-Fix-buffer-overreads-in-.patch
+        SDL-1.2.15-CVE-2019-7574-Fix-a-buffer-overread-in-IMA_ADPCM_dec.patch
+        SDL-1.2.15-CVE-2019-7575-Fix-a-buffer-overwrite-in-MS_ADPCM_dec.patch
+        SDL-1.2.15-CVE-2019-7577-Fix-a-buffer-overread-in-MS_ADPCM_deco.patch
+        SDL-1.2.15-CVE-2019-7577-Fix-a-buffer-overread-in-MS_ADPCM_nibb.patch
+        SDL-1.2.15-CVE-2019-7578-Fix-a-buffer-overread-in-InitIMA_ADPCM.patch
+        SDL-1.2.15-CVE-2019-7635-Reject-BMP-images-with-pixel-colors-ou.patch
+        SDL-1.2.15-CVE-2019-7637-Fix-in-integer-overflow-in-SDL_Calcula.patch
+        SDL-1.2.15-CVE-2019-7638-CVE-2019-7636-Refuse-loading-BMP-image.patch
+        SDL-1.2.15-Reject-2-3-5-6-7-bpp-BMP-images.patch)
+sha256sums=('SKIP'
             'ea2042b8a45a083b1447d5c56e52b23b79f2ddb0d717ec7b287b34ef71bd2d1a'
             '292046466d52a2ebe995a0121404864e4ee0de2b6024203acb95bbd600844da0'
             'bab60b515a74b71650ee71d5a0075c77046a7bad48b061673c3798dbdd35446d'
@@ -65,8 +65,14 @@
             'da87eb71c7af042bc8379f9f7cd63e57d99429774bb43524dde103718b99c533')
 validpgpkeys=('1528635D8053A57F77D1E08630A59377A7763BE6') # Sam Lantinga <slouken at libsdl.org>
 
+pkgver() {
+  cd SDL-1.2
+  git describe --tags | sed 's/^release-//;s/-/+/g'
+}
+
 prepare() {
-  cd SDL-$pkgver
+  cd SDL-1.2
+
   patch -Np1 -i ../SDL-1.2.10-GrabNotViewable.patch
   patch -Np1 -i ../SDL-1.2.15-SDL_EnableUNICODE_drops_keyboard_events.patch
   patch -Np1 -i ../SDL-1.2.15-const_XData32.patch
@@ -95,10 +101,12 @@
   patch -Np1 -i ../SDL-1.2.15-CVE-2019-13616-validate_image_size_when_loading_BMP_files.patch
   patch -Np1 -i ../SDL-1.2.15-CVE-2019-7577-Fix-a-buffer-overread-in-MS_ADPCM_nibb.patch
   patch -Np1 -i ../SDL-1.2.15-Reject-2-3-5-6-7-bpp-BMP-images.patch
+
+  ./autogen.sh
 }
 
 build() {
-  cd SDL-$pkgver
+  cd SDL-1.2
   ./configure --prefix=/usr --disable-nasm --enable-alsa \
               --with-x --disable-rpath --disable-static
   make
@@ -105,6 +113,6 @@
 }
 
 package() {
-  cd SDL-$pkgver
+  cd SDL-1.2
   make DESTDIR="$pkgdir" install
 }