Merge pull request #132353 from chenrui333/bump-spirv-cross-1.3.250.0

spirv-cross spirv-headers 1.3.250.0
Homebrew · May 31, 2023 · 159de1a · 159de1a
2 parents 1da7af6 + 8025d62
commit 159de1a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 29 deletions.
diff --git a/Formula/spirv-cross.rb b/Formula/spirv-cross.rb
@@ -1,8 +1,8 @@
 class SpirvCross < Formula
   desc "Performing reflection and disassembling SPIR-V"
   homepage "https://github.com/KhronosGroup/SPIRV-Cross"
-  url "https://github.com/KhronosGroup/SPIRV-Cross/archive/refs/tags/sdk-1.3.246.1.tar.gz"
-  sha256 "44d1aef7e6e247b4b7ec6a1ef0bbb43cc9b681ee689393db90ac815d240808b1"
+  url "https://github.com/KhronosGroup/SPIRV-Cross/archive/refs/tags/sdk-1.3.250.0.tar.gz"
+  sha256 "dac4b3dabd3f166f0c2941cf72045331e2672591a06cdeaa72e550d403f3150c"
   license all_of: [
     "Apache-2.0",
     "MIT",
@@ -17,13 +17,13 @@ class SpirvCross < Formula
   end
 
   bottle do
-    sha256 cellar: :any_skip_relocation, arm64_ventura:  "464ca952343a375232b504bc564283e62fb7364708d13f3ca8719a2aa64a4726"
-    sha256 cellar: :any_skip_relocation, arm64_monterey: "2af4d05a115ef00947234c3f249c8b8d22588673b4105f708306dabaa418bb2e"
-    sha256 cellar: :any_skip_relocation, arm64_big_sur:  "48c3a70065ca401678e99c6afb3fcf0c265916b80a859139f5fb6689607deb43"
-    sha256 cellar: :any_skip_relocation, ventura:        "595f231fe6ef7810e90f3924b5de5702831fbc089d77dac3c9f025d7b6183d95"
-    sha256 cellar: :any_skip_relocation, monterey:       "99becd1d5d151f20eb91ff10664040a1a9c842e6ea68a3fa0a6faf55c7689a65"
-    sha256 cellar: :any_skip_relocation, big_sur:        "994f0c216adc85566af9739eb8ae410a19baeaa610200a79248c70c6dac3c4f7"
-    sha256 cellar: :any_skip_relocation, x86_64_linux:   "9811086eefe9341019a5e89145afab483c16a7739a3b8c6e2aa0f2f008c52b87"
+    sha256 cellar: :any_skip_relocation, arm64_ventura:  "efab4f856ff256cfed3b78a31cc6bca1fdc7e1e5a43e4ecf3917f45303ecdd0c"
+    sha256 cellar: :any_skip_relocation, arm64_monterey: "aecb2d362137229e8a17250d425a7b0a558ad6013b57837de87508213016b5e4"
+    sha256 cellar: :any_skip_relocation, arm64_big_sur:  "92a072e86125773d91a254ee328819732fe1eca83417f3e2efb1bdec9906b521"
+    sha256 cellar: :any_skip_relocation, ventura:        "df60834cbe46c2453a1fc45729133e33cb04a167d5661b4c9cbc02efd638855b"
+    sha256 cellar: :any_skip_relocation, monterey:       "109d35612c303c6ac2ea4f711ff7239ef120081cfa279e3747a0e334454581f7"
+    sha256 cellar: :any_skip_relocation, big_sur:        "38b15cb2fb760782b03e20bb4a1ad06e7ad10dde85aca62acb96fe6c471b3c14"
+    sha256 cellar: :any_skip_relocation, x86_64_linux:   "c98c3af7827e6143a5b4985a9589ceef269edd172a98946f294290b39bda61a3"
   end
 
   depends_on "cmake" => :build

diff --git a/Formula/spirv-headers.rb b/Formula/spirv-headers.rb
@@ -1,33 +1,18 @@
 class SpirvHeaders < Formula
   desc "Headers for SPIR-V"
   homepage "https://github.com/KhronosGroup/SPIRV-Headers"
+  url "https://github.com/KhronosGroup/SPIRV-Headers/archive/refs/tags/sdk-1.3.250.0.tar.gz"
+  sha256 "9d632a4dddd11f89a74a8c6f19cd29e8b0741d2fbb41ecc4dec26b922d28a2f3"
   license "MIT"
   head "https://github.com/KhronosGroup/SPIRV-Headers.git", branch: "main"
 
-  stable do
-    url "https://github.com/KhronosGroup/SPIRV-Headers/archive/refs/tags/sdk-1.3.246.1.tar.gz"
-    sha256 "71668e18ef7b318b06f8c466f46abad965b2646eaa322594cd015c2ac87133e6"
-
-    # remove upon next release; adds SPV_EXT_shader_tile_image
-    patch do
-      url "https://github.com/KhronosGroup/SPIRV-Headers/commit/d218c4ab72500ed8be5809ab2a03ff348a85e349.patch?full_index=1"
-      sha256 "a8fc93bcaae4eea3b03c18e9c031361b228ecff6aa8c0a55d5ccb0839d51259f"
-    end
-
-    # remove upon next release; adds SPV_KHR_ray_tracing_position_fetch
-    patch do
-      url "https://github.com/KhronosGroup/SPIRV-Headers/commit/131fddea36482695f04bfa47df5fdcb9fa15a246.patch?full_index=1"
-      sha256 "531bab56a97ce5cb2202d6cfa4fc4b9ab78bde899bd94cb4c6ae2ec2735c581f"
-    end
-  end
-
   livecheck do
     url :stable
     regex(/^sdk[._-]v?(\d+(?:\.\d+)+)$/i)
   end
 
   bottle do
-    sha256 cellar: :any_skip_relocation, all: "0a33a84db0a8b233c391490ab62f9d4fbc3908d66f7a7871681a549075e64243"
+    sha256 cellar: :any_skip_relocation, all: "140ec00fe246fc5e55c888a6e989fbddcd07b29dbd757e5c1e40d40bc38925af"
   end
 
   depends_on "cmake" => [:build, :test]
@@ -37,11 +22,20 @@ def install
     system "cmake", "--build", "build"
     system "cmake", "--install", "build"
 
-    pkgshare.install "example"
+    pkgshare.install "tests"
   end
 
   test do
-    system "cmake", "-S", pkgshare/"example", "-B", "build", *std_cmake_args
+    cp pkgshare/"tests/example.cpp", testpath
+
+    (testpath/"CMakeLists.txt").write <<~EOS
+      add_library(SPIRV-Headers-example
+                  ${CMAKE_CURRENT_SOURCE_DIR}/example.cpp)
+      target_include_directories(SPIRV-Headers-example
+                  PRIVATE ${SPIRV-Headers_SOURCE_DIR}/include)
+    EOS
+
+    system "cmake", "-S", ".", "-B", "build", *std_cmake_args
     system "cmake", "--build", "build"
   end
 end