[arch-commits] Commit in glslang/trunk (1963.patch PKGBUILD)

[Sven-Hendrik Haase]

    Date: Saturday, January 11, 2020 @ 15:48:43
  Author: svenstaro
Revision: 373255

upgpkg: glslang 8.13.3559-1

Modified:
  glslang/trunk/PKGBUILD
Deleted:
  glslang/trunk/1963.patch

------------+
 1963.patch |   30 ------------------------------
 PKGBUILD   |   15 ++++-----------
 2 files changed, 4 insertions(+), 41 deletions(-)

Deleted: 1963.patch
===================================================================
--- 1963.patch	2020-01-11 15:31:12 UTC (rev 373254)
+++ 1963.patch	2020-01-11 15:48:43 UTC (rev 373255)
@@ -1,30 +0,0 @@
-From 199d115e1542fe0a8427efda5fa36158474fb6cf Mon Sep 17 00:00:00 2001
-From: John Kessenich <cepheus at frii.com>
-Date: Tue, 5 Nov 2019 18:05:42 -0700
-Subject: [PATCH] Fix #1959 by reverting 7b0e236 to put files in two places.
-
----
- SPIRV/CMakeLists.txt | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
- mode change 100644 => 100755 SPIRV/CMakeLists.txt
-
-diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
-old mode 100644
-new mode 100755
-index e25ec0a13..9869bafdc
---- a/SPIRV/CMakeLists.txt
-+++ b/SPIRV/CMakeLists.txt
-@@ -90,9 +90,10 @@ if(ENABLE_GLSLANG_INSTALL)
-         install(TARGETS SPIRV EXPORT SPIRVTargets
-                 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-     endif()
--	
--	install(EXPORT SPVRemapperTargets DESTINATION lib/cmake)
--	install(EXPORT SPIRVTargets DESTINATION lib/cmake)
- 
-+    install(EXPORT SPVRemapperTargets DESTINATION lib/cmake)
-+    install(EXPORT SPIRVTargets DESTINATION lib/cmake)
-+
-+    install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/SPIRV/)
-     install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/)
- endif(ENABLE_GLSLANG_INSTALL)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-11 15:31:12 UTC (rev 373254)
+++ PKGBUILD	2020-01-11 15:48:43 UTC (rev 373255)
@@ -2,8 +2,8 @@
 
 # Careful when upgrading this package! It usually breaks ABI without bumping soname.
 pkgname=glslang
-pkgver=7.13.3496
-pkgrel=2
+pkgver=8.13.3559
+pkgrel=1
 pkgdesc='OpenGL and OpenGL ES shader front end and validator'
 arch=('x86_64')
 url='https://github.com/KhronosGroup/glslang'
@@ -11,16 +11,9 @@
 depends=('gcc-libs' 'spirv-tools' 'python')
 makedepends=('cmake' 'ninja')
 options=('staticlibs')
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/glslang/archive/${pkgver}.tar.gz
-        1963.patch)
-sha256sums=('170d1538a670af4cae300e875d7cda9744b1acee1ab7252ecf7c4004186bb922'
-            '12515d00e3b026307c18cb08e3e9d99c43119048ef02e73eae5ac1ea585b025d')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/glslang/archive/${pkgver}.tar.gz)
+sha256sums=('c58fdcf7e00943ba10f9ae565b2725ec9d5be7dab7c8e82cac72fcaa83c652ca')
 
-prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -Np1 -i "$srcdir"/1963.patch
-}
-
 build() {
   cd ${pkgname}-${pkgver}
   mkdir -p build-{shared,static}