Update package to match extra

Add static and dynamic libs
Change license to BSD and install it
Add python to makedepends
Add spirv-tools as dependency
Blacklist SDK-candidate and untagged tags

2 files changed, 33 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7624319ae3bc..d85d1ba4e6e8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,19 @@
 pkgbase = glslang-git
-	pkgdesc = Front end for GLSL/ESSL, HLSL, and a SPIR-V generator, git version
-	pkgver = 8.13.3743.r3.gf03cb290
+	pkgdesc = OpenGL and OpenGL ES shader front end and validator, git version
+	pkgver = 8.13.3743.r232.g6a6e311d
 	pkgrel = 1
-	url = http://www.khronos.org/opengles/sdk/tools/Reference-Compiler
+	url = https://github.com/KhronosGroup/glslang
 	arch = x86_64
 	arch = i686
-	license = GPL
+	license = BSD
 	makedepends = cmake
 	makedepends = git
+	makedepends = python
 	depends = gcc-libs
+	depends = spirv-tools
 	provides = glslang
 	conflicts = glslang
+	options = staticlibs
 	source = git://github.com/KhronosGroup/glslang.git
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 40a93dae06b5..43d5ad5b69c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,13 @@
 pkgname=glslang-git
-pkgver=8.13.3743.r3.gf03cb290
+pkgver=8.13.3743.r232.g6a6e311d
 pkgrel=1
-pkgdesc='Front end for GLSL/ESSL, HLSL, and a SPIR-V generator, git version'
+pkgdesc='OpenGL and OpenGL ES shader front end and validator, git version'
 arch=('x86_64' 'i686')
-url='http://www.khronos.org/opengles/sdk/tools/Reference-Compiler'
-license=('GPL')
-depends=('gcc-libs')
-makedepends=('cmake' 'git')
+url='https://github.com/KhronosGroup/glslang'
+license=('BSD')
+depends=('gcc-libs' 'spirv-tools')
+makedepends=('cmake' 'git' 'python')
+options=('staticlibs')
 provides=('glslang')
 conflicts=('glslang')
 source=("git://github.com/KhronosGroup/glslang.git")
@@ -14,18 +15,33 @@ sha256sums=('SKIP')
 
 pkgver() {
   cd "${srcdir}/${pkgname%-git}"
-  git describe --long --tags --exclude master-tot | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+  git describe --long --tags --exclude master-tot --exclude SDK-candidate\* --exclude untagged\* | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
   cd "${srcdir}/${pkgname%-git}"
-  cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo
-  cmake --build .
+
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+        -DBUILD_SHARED_LIBS=ON \
+        -B cmake-build-shared/ \
+        -S .
+  cmake --build cmake-build-shared/
+
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+        -DBUILD_SHARED_LIBS=OFF \
+        -B cmake-build-static/ \
+        -S .
+  cmake --build cmake-build-static/
 }
 
 package() {
   cd "${srcdir}/${pkgname%-git}"
-  cmake --install . -v --strip --prefix "$pkgdir/usr"
+  cmake --install cmake-build-shared/ -v --strip --prefix "$pkgdir/usr"
+  cmake --install cmake-build-static/ -v --strip --prefix "$pkgdir/usr"
+
+  install -Dm644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
 
 # vim:set ts=2 sw=2 et: