From ec48e21941d82e7901db44e5a79eb3103e8e0cb6 Mon Sep 17 00:00:00 2001
From: SpaceIm <30052553+SpaceIm@users.noreply.github.com>
Date: Mon, 6 Jul 2020 09:36:49 +0200
Subject: [PATCH 1/4] add spirv-cross/20200629

---
 recipes/spirv-cross/all/conandata.yml | 3 +++
 recipes/spirv-cross/config.yml        | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/recipes/spirv-cross/all/conandata.yml b/recipes/spirv-cross/all/conandata.yml
index c90f898093b87..a2fb9675fc058 100644
--- a/recipes/spirv-cross/all/conandata.yml
+++ b/recipes/spirv-cross/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "20200629":
+    url: "https://github.com/KhronosGroup/SPIRV-Cross/archive/2020-06-29.tar.gz"
+    sha256: "29523168867fcfa55b03a65970a8572be67e37accb08ce1051b2d3ae19011452"
   "20200519":
     url: "https://github.com/KhronosGroup/SPIRV-Cross/archive/2020-05-19.tar.gz"
     sha256: "6cf18ee3fe1a8d64a20da3c5fac334da4c4762d29d7e55a2f0b555cbf5cff708"
diff --git a/recipes/spirv-cross/config.yml b/recipes/spirv-cross/config.yml
index b01ab58186a15..7da2c1f894c5a 100644
--- a/recipes/spirv-cross/config.yml
+++ b/recipes/spirv-cross/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "20200629":
+    folder: all
   "20200519":
     folder: all
   "20200403":

From ee0246c0508e11f2e32f9370dd0a79bdd2307ae4 Mon Sep 17 00:00:00 2001
From: SpaceIm <30052553+SpaceIm@users.noreply.github.com>
Date: Thu, 23 Jul 2020 15:50:15 +0200
Subject: [PATCH 2/4] spirv-cross: delete fPIC option if shared

---
 recipes/spirv-cross/all/conanfile.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/recipes/spirv-cross/all/conanfile.py b/recipes/spirv-cross/all/conanfile.py
index a9df10978a8df..96baa735957a6 100644
--- a/recipes/spirv-cross/all/conanfile.py
+++ b/recipes/spirv-cross/all/conanfile.py
@@ -55,13 +55,14 @@ def config_options(self):
             del self.options.fPIC
 
     def configure(self):
-        if not self.options.glsl and \
-           (self.options.hlsl or self.options.msl or self.options.cpp or self.options.reflect):
-            raise ConanInvalidConfiguration("hlsl, msl, cpp and reflect require glsl enabled")
         if self.options.shared:
+            del self.options.fPIC
             # these options don't contribute to shared binary
             del self.options.c_api
             del self.options.util
+        if not self.options.glsl and \
+           (self.options.hlsl or self.options.msl or self.options.cpp or self.options.reflect):
+            raise ConanInvalidConfiguration("hlsl, msl, cpp and reflect require glsl enabled")
 
     def source(self):
         tools.get(**self.conan_data["sources"][self.version])

From fe7fcf9bd9a7507ed049d4bbe36b6e8decff23b2 Mon Sep 17 00:00:00 2001
From: SpaceIm <30052553+SpaceIm@users.noreply.github.com>
Date: Thu, 23 Jul 2020 15:51:18 +0200
Subject: [PATCH 3/4] spirv-cross: use tools.stdcpp_library

---
 recipes/spirv-cross/all/conanfile.py | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/recipes/spirv-cross/all/conanfile.py b/recipes/spirv-cross/all/conanfile.py
index 96baa735957a6..9cb0022a6406a 100644
--- a/recipes/spirv-cross/all/conanfile.py
+++ b/recipes/spirv-cross/all/conanfile.py
@@ -142,8 +142,8 @@ def package_info(self):
         self.cpp_info.includedirs.append(os.path.join("include", "spirv_cross"))
         if self.settings.os == "Linux" and self.options.glsl:
             self.cpp_info.system_libs.append("m")
-        if not self.options.shared and self.options.c_api and self._stdcpp_library:
-            self.cpp_info.system_libs.append(self._stdcpp_library)
+        if not self.options.shared and self.options.c_api and tools.stdcpp_library(self):
+            self.cpp_info.system_libs.append(tools.stdcpp_library(self))
         if self.options.build_executable:
             self.env_info.PATH.append(os.path.join(self.package_folder, "bin"))
 
@@ -176,13 +176,3 @@ def _get_ordered_libs(self):
         if self.settings.os == "Windows" and self.settings.build_type == "Debug":
             libs = [lib + "d" for lib in libs]
         return libs
-
-    @property
-    def _stdcpp_library(self):
-        libcxx = self.settings.get_safe("compiler.libcxx")
-        if libcxx in ("libstdc++", "libstdc++11"):
-            return "stdc++"
-        elif libcxx in ("libc++",):
-            return "c++"
-        else:
-            return False

From e7650a06bd6ff3d0143602682270bc9745539b12 Mon Sep 17 00:00:00 2001
From: SpaceIm <30052553+SpaceIm@users.noreply.github.com>
Date: Thu, 23 Jul 2020 15:52:13 +0200
Subject: [PATCH 4/4] spirv-cross: display bin path added in PATH

---
 recipes/spirv-cross/all/conanfile.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/recipes/spirv-cross/all/conanfile.py b/recipes/spirv-cross/all/conanfile.py
index 9cb0022a6406a..f8b4896fcd5ce 100644
--- a/recipes/spirv-cross/all/conanfile.py
+++ b/recipes/spirv-cross/all/conanfile.py
@@ -145,7 +145,9 @@ def package_info(self):
         if not self.options.shared and self.options.c_api and tools.stdcpp_library(self):
             self.cpp_info.system_libs.append(tools.stdcpp_library(self))
         if self.options.build_executable:
-            self.env_info.PATH.append(os.path.join(self.package_folder, "bin"))
+            bin_path = os.path.join(self.package_folder, "bin")
+            self.output.info("Appending PATH environment variable: {}".format(bin_path))
+            self.env_info.PATH.append(bin_path)
 
     def _get_ordered_libs(self):
         libs = []