Drop dep on gcc10, use SPDX-License-Identifier

2 files changed, 14 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index be33f37e3947..5fee7414cef9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,16 @@
 pkgbase = avp
 	pkgdesc = Alien Versus Predator Gold engine
 	pkgver = 20170505_a1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://www.icculus.org/avp
 	install = avp.install
 	arch = i686
 	arch = x86_64
-	license = custom
+	license = LicenseRef-custom
 	makedepends = cmake
 	makedepends = glu
 	makedepends = mesa
-	makedepends = gcc10
-	depends = sdl
+	depends = sdl12-compat
 	depends = libgl
 	depends = openal
 	optdepends = avp-data
@@ -23,4 +22,3 @@ pkgbase = avp
 	sha512sums = d9093d22cc63e9c6fe57598e159fc90edd8a4e7674892b89ded5efaed909b80e8164613537cc11fec4dc60b2f0d9463329a55dc1491ab9479352c3337a8af583
 
 pkgname = avp
-
diff --git a/PKGBUILD b/PKGBUILD
index 249123667889..7636c060a056 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,13 @@
 pkgname=avp
 pkgver=20170505_a1
 _dirname=20170505
-pkgrel=2
+pkgrel=3
 pkgdesc="Alien Versus Predator Gold engine"
 arch=(i686 x86_64)
 url="https://www.icculus.org/avp"
-license=('custom')
-depends=('sdl' 'libgl' 'openal')
-makedepends=('cmake' 'glu' 'mesa' 'gcc10')
+license=('LicenseRef-custom')
+depends=('sdl12-compat' 'libgl' 'openal')
+makedepends=('cmake' 'glu' 'mesa')
 optdepends=('avp-data')
 install='avp.install'
 source=("${url}/files/${pkgname}-${pkgver/_/-}.tar.gz"
@@ -28,10 +28,13 @@ prepare() {
 build() {
   cd ${pkgname}-${_dirname}/build
 
-  export CC="/usr/bin/gcc-10"
-  export CXX="/usr/bin/g++-10"
-
-  cmake -DCMAKE_BUILD_TYPE="Release" -DOpenGL_GL_PREFERENCE="GLVND" -DSDL_TYPE="SDL" ..
+  cmake \
+        -DCMAKE_BUILD_TYPE="Release" \
+        -DCMAKE_CXX_STANDARD=14 \
+        -DCMAKE_CXX_STANDARD_REQUIRED='ON' \
+        -DCMAKE_CXX_EXTENSIONS='OFF' \
+        -DOpenGL_GL_PREFERENCE="GLVND" \
+        -DSDL_TYPE="SDL" ..
   make
 }