From ffd5ca7eddf74a7237f44fc1683fcbc5c2df8cc3 Mon Sep 17 00:00:00 2001
From: Bartosz Taudul <wolf.pld@gmail.com>
Date: Sun, 17 Jan 2021 05:03:04 +0100
Subject: [PATCH] [glslang] Provide glslang-default-resource-limits library.
 (#15624)

* [glslang] Provide glslang-default-resource-limits library.

* [glslang] Use Port-Version field.

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Update port_versions

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
---
 port_versions/baseline.json            |  4 ++--
 port_versions/g-/glslang.json          |  5 +++++
 ports/glslang/CMakeLists-targets.patch | 13 +++++++++++++
 ports/glslang/CONTROL                  |  5 +++--
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/port_versions/baseline.json b/port_versions/baseline.json
index df567cfb6f2..c00de41a85c 100644
--- a/port_versions/baseline.json
+++ b/port_versions/baseline.json
@@ -2185,8 +2185,8 @@
       "port-version": 0
     },
     "glslang": {
-      "baseline": "2019-03-05-1",
-      "port-version": 0
+      "baseline": "2019-03-05",
+      "port-version": 2
     },
     "glui": {
       "baseline": "2019-11-30",
diff --git a/port_versions/g-/glslang.json b/port_versions/g-/glslang.json
index 13cdce3ef53..b9dfb0d7b5f 100644
--- a/port_versions/g-/glslang.json
+++ b/port_versions/g-/glslang.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "29f2d736c8273c412c4fcf0fd50da379d1ec9a0b",
+      "version-string": "2019-03-05",
+      "port-version": 2
+    },
     {
       "git-tree": "02b23c6369ff2b1aed2e57bceeb184b544d388e2",
       "version-string": "2019-03-05-1",
diff --git a/ports/glslang/CMakeLists-targets.patch b/ports/glslang/CMakeLists-targets.patch
index 36e923d9262..53cf5bf8f08 100644
--- a/ports/glslang/CMakeLists-targets.patch
+++ b/ports/glslang/CMakeLists-targets.patch
@@ -106,3 +106,16 @@ index f918d7a..329800f 100644
                  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
                  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
      else()
+diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt
+index 5cea53d9..43e45534 100644
+--- a/StandAlone/CMakeLists.txt
++++ b/StandAlone/CMakeLists.txt
+@@ -46,7 +46,7 @@ if(ENABLE_GLSLANG_INSTALL)
+     install(TARGETS spirv-remap
+             RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+             
+-    if(BUILD_SHARED_LIBS)
++    if(BUILD_SHARED_LIBS OR TRUE)
+         install(TARGETS glslang-default-resource-limits
+                 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+     endif()
diff --git a/ports/glslang/CONTROL b/ports/glslang/CONTROL
index 06f8f810fc4..f0b38f4d232 100644
--- a/ports/glslang/CONTROL
+++ b/ports/glslang/CONTROL
@@ -1,4 +1,5 @@
 Source: glslang
-Version: 2019-03-05-1
+Version: 2019-03-05
+Port-Version: 2
 Homepage: https://github.com/KhronosGroup/glslang
-Description: Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator
\ No newline at end of file
+Description: Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator