summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Demers2020-01-08 13:40:55 -0500
committerAlexandre Demers2020-01-08 13:40:55 -0500
commitde4dd8b8f3b85dc7ecbed1c33392afe657a76215 (patch)
tree310c1d04864335d8f3fce7cb5f1579b7a7ca4923
parent52501a0586ceef9251822e8d3cecccc32869244d (diff)
downloadaur-de4dd8b8f3b85dc7ecbed1c33392afe657a76215.tar.gz
Updating to 8.13.3559
Remove fix-cmake-folder patch (already in upstream) Signed-off-by: Alexandre Demers <alexandre.f.demers@gmail.com>
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD14
-rw-r--r--fix-cmake-folder.patch122
3 files changed, 10 insertions, 136 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5a377401f71..018d48f2224 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = lib32-glslang
pkgdesc = OpenGL and OpenGL ES shader front end and validator (32bit)
- pkgver = 7.13.3496
- pkgrel = 3
+ pkgver = 8.13.3559
+ pkgrel = 1
url = https://github.com/KhronosGroup/glslang
arch = x86_64
license = BSD
@@ -12,10 +12,8 @@ pkgbase = lib32-glslang
depends = lib32-spirv-tools
depends = python
options = staticlibs
- source = glslang-7.13.3496.tar.gz::https://github.com/KhronosGroup/glslang/archive/7.13.3496.tar.gz
- source = fix-cmake-folder.patch
- sha256sums = 170d1538a670af4cae300e875d7cda9744b1acee1ab7252ecf7c4004186bb922
- sha256sums = 5b231d27cfde2178b937b115e9b92fe10c28e7624a638cca9f7b48b4bec3f71e
+ source = glslang-8.13.3559.tar.gz::https://github.com/KhronosGroup/glslang/archive/8.13.3559.tar.gz
+ sha256sums = c58fdcf7e00943ba10f9ae565b2725ec9d5be7dab7c8e82cac72fcaa83c652ca
pkgname = lib32-glslang
diff --git a/PKGBUILD b/PKGBUILD
index 35d9ff15366..0e74c3c8a8c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@ _setFullLibdir="${_setPrefix}/${_setLibdir}"
_pkgbasename=glslang
pkgname=lib32-$_pkgbasename
-pkgver=7.13.3496
-pkgrel=3
+pkgver=8.13.3559
+pkgrel=1
pkgdesc='OpenGL and OpenGL ES shader front end and validator (32bit)'
arch=('x86_64')
url='https://github.com/KhronosGroup/glslang'
@@ -26,17 +26,15 @@ makedepends=(
options=('staticlibs')
source=(
${_pkgbasename}-${pkgver}.tar.gz::https://github.com/KhronosGroup/glslang/archive/${pkgver}.tar.gz
- fix-cmake-folder.patch
)
sha256sums=(
- '170d1538a670af4cae300e875d7cda9744b1acee1ab7252ecf7c4004186bb922'
- '5b231d27cfde2178b937b115e9b92fe10c28e7624a638cca9f7b48b4bec3f71e'
+ 'c58fdcf7e00943ba10f9ae565b2725ec9d5be7dab7c8e82cac72fcaa83c652ca'
)
prepare() {
- echo "Patching"
- cd ${_pkgbasename}-${pkgver}
- patch --forward --strip=1 --verbose --input="${srcdir}/fix-cmake-folder.patch"
+ echo "Patching if needed"
+# cd ${_pkgbasename}-${pkgver}
+# patch --forward --strip=1 --verbose --input="${srcdir}/fix-cmake-folder.patch"
}
build() {
diff --git a/fix-cmake-folder.patch b/fix-cmake-folder.patch
deleted file mode 100644
index c03d7695f17..00000000000
--- a/fix-cmake-folder.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From bd69a4fb1206c3441ed56a9a058adfb6e46d55a6 Mon Sep 17 00:00:00 2001
-From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
-Date: Mon, 18 Nov 2019 11:11:55 -0800
-Subject: [PATCH] Respect CMAKE_INSTALL_LIBDIR in installed CMake files
-
-Fixes #1965
----
- OGLCompilersDLL/CMakeLists.txt | 2 +-
- SPIRV/CMakeLists.txt | 4 ++--
- StandAlone/CMakeLists.txt | 6 +++---
- glslang/CMakeLists.txt | 2 +-
- glslang/OSDependent/Unix/CMakeLists.txt | 2 +-
- glslang/OSDependent/Windows/CMakeLists.txt | 2 +-
- gtests/CMakeLists.txt | 2 +-
- hlsl/CMakeLists.txt | 2 +-
- 8 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt
-index af4ab587d..e0096743b 100644
---- a/OGLCompilersDLL/CMakeLists.txt
-+++ b/OGLCompilersDLL/CMakeLists.txt
-@@ -11,5 +11,5 @@ endif(WIN32)
- if(ENABLE_GLSLANG_INSTALL)
- install(TARGETS OGLCompiler EXPORT OGLCompilerTargets
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-- install(EXPORT OGLCompilerTargets DESTINATION lib/cmake)
-+ install(EXPORT OGLCompilerTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- endif(ENABLE_GLSLANG_INSTALL)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e25ec0a..364f04c 100644
---- a/SPIRV/CMakeLists.txt
-+++ b/SPIRV/CMakeLists-new.txt
-@@ -91,8 +91,8 @@ if(ENABLE_GLSLANG_INSTALL)
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
- endif()
-
-- install(EXPORT SPVRemapperTargets DESTINATION lib/cmake)
-- install(EXPORT SPIRVTargets DESTINATION lib/cmake)
-+ install(EXPORT SPVRemapperTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
-+ install(EXPORT SPIRVTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
-
- install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/)
- endif(ENABLE_GLSLANG_INSTALL)
-diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt
-index 0878965c1..d9d71d1ab 100644
---- a/StandAlone/CMakeLists.txt
-+++ b/StandAlone/CMakeLists.txt
-@@ -49,12 +49,12 @@ if(ENABLE_GLSLANG_INSTALL)
- install(TARGETS spirv-remap EXPORT spirv-remapTargets
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-
-- install(EXPORT glslangValidatorTargets DESTINATION lib/cmake)
-- install(EXPORT spirv-remapTargets DESTINATION lib/cmake)
-+ install(EXPORT glslangValidatorTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
-+ install(EXPORT spirv-remapTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
-
- if(BUILD_SHARED_LIBS)
- install(TARGETS glslang-default-resource-limits EXPORT glslang-default-resource-limitsTargets
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-- install(EXPORT glslang-default-resource-limitsTargets DESTINATION lib/cmake)
-+ install(EXPORT glslang-default-resource-limitsTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- endif()
- endif(ENABLE_GLSLANG_INSTALL)
-diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
-index 42df1d1e6..446cabb91 100644
---- a/glslang/CMakeLists.txt
-+++ b/glslang/CMakeLists.txt
-@@ -112,7 +112,7 @@ if(ENABLE_GLSLANG_INSTALL)
- install(TARGETS glslang EXPORT glslangTargets
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
- endif()
-- install(EXPORT glslangTargets DESTINATION lib/cmake)
-+ install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- endif(ENABLE_GLSLANG_INSTALL)
-
- if(ENABLE_GLSLANG_INSTALL)
-diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt
-index 91fb45a71..9994314fd 100644
---- a/glslang/OSDependent/Unix/CMakeLists.txt
-+++ b/glslang/OSDependent/Unix/CMakeLists.txt
-@@ -22,5 +22,5 @@ endif()
- if(ENABLE_GLSLANG_INSTALL)
- install(TARGETS OSDependent EXPORT OSDependentTargets
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-- install(EXPORT OSDependentTargets DESTINATION lib/cmake)
-+ install(EXPORT OSDependentTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- endif(ENABLE_GLSLANG_INSTALL)
-diff --git a/glslang/OSDependent/Windows/CMakeLists.txt b/glslang/OSDependent/Windows/CMakeLists.txt
-index f6bd4e9db..c050ef61d 100644
---- a/glslang/OSDependent/Windows/CMakeLists.txt
-+++ b/glslang/OSDependent/Windows/CMakeLists.txt
-@@ -17,5 +17,5 @@ endif(WIN32)
- if(ENABLE_GLSLANG_INSTALL)
- install(TARGETS OSDependent EXPORT OSDependentTargets
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-- install(EXPORT OSDependentTargets DESTINATION lib/cmake)
-+ install(EXPORT OSDependentTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- endif(ENABLE_GLSLANG_INSTALL)
-diff --git a/gtests/CMakeLists.txt b/gtests/CMakeLists.txt
-index 77d217f1a..aadf9a54f 100644
---- a/gtests/CMakeLists.txt
-+++ b/gtests/CMakeLists.txt
-@@ -33,7 +33,7 @@ if(BUILD_TESTING)
- if(ENABLE_GLSLANG_INSTALL)
- install(TARGETS glslangtests EXPORT glslangtestsTargets
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-- install(EXPORT glslangtestsTargets DESTINATION lib/cmake)
-+ install(EXPORT glslangtestsTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- endif(ENABLE_GLSLANG_INSTALL)
-
- set(GLSLANG_TEST_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../Test")
-diff --git a/hlsl/CMakeLists.txt b/hlsl/CMakeLists.txt
-index 44f9d6a26..ae0d4d4eb 100644
---- a/hlsl/CMakeLists.txt
-+++ b/hlsl/CMakeLists.txt
-@@ -41,5 +41,5 @@ if(ENABLE_GLSLANG_INSTALL)
- install(TARGETS HLSL EXPORT HLSLTargets
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
- endif()
-- install(EXPORT HLSLTargets DESTINATION lib/cmake)
-+ install(EXPORT HLSLTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- endif(ENABLE_GLSLANG_INSTALL)