Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

molten-vk: install ICD to non-overridable path #204611

Merged
merged 4 commits into from
Feb 10, 2025
Merged

molten-vk: install ICD to non-overridable path #204611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0c6a723
molten-vk: install ICD to non-overridable path
cho-m Jan 14, 2025
9153b8f
vulkan-tools: test for `molten-vk`
cho-m Feb 10, 2025
0944c94
molten-vk: update 1.2.11 bottle.
BrewTestBot Feb 10, 2025
9cabab3
vulkan-tools: update 1.4.307 bottle.
BrewTestBot Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions Formula/m/molten-vk.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,12 @@ class MoltenVk < Formula
end

bottle do
sha256 cellar: :any, arm64_sequoia: "1a3d81152656eca4c1d4980536ee8ad1ea4490df80c2646120e8c6e4dc87b6d0"
sha256 cellar: :any, arm64_sonoma: "c360bd8b969382af39bef1458f3b96dc68191b3f57d2e718e136d0bd106ac9a5"
sha256 cellar: :any, arm64_ventura: "4653204b0b3e2a6063a4159fd013b90caddfede7a3cb348e046b9e6026f69c08"
sha256 cellar: :any, sonoma: "5047bfb4b6b324935db3b71a67319e328c6d72d8408cf77e135e7e928352ef5e"
sha256 cellar: :any, ventura: "ed6834d3160715bef1ea0d2b6c55392cac67c1385a40c24ad712ced28e7dbeac"
rebuild 1
sha256 cellar: :any, arm64_sequoia: "306fb6df9ca047fbf61e46b82ae3a3cd9f4fe8c60a236c4940e460f9a42ae169"
sha256 cellar: :any, arm64_sonoma: "36a99f13dd4317c01f7e0024c4bc346c5d3a66084bc8ed1c5e5a20948cd89b2d"
sha256 cellar: :any, arm64_ventura: "b39bdae032fa33dfb52e870fbce6b5a75801f8b954a5edeab1f0fa42a3fb0fc2"
sha256 cellar: :any, sonoma: "dcf6fca1aee3f565b9806c0f9586312b0d2f7c0268ba10095dfe0ace8416cf64"
sha256 cellar: :any, ventura: "d229ac36b1021d4d32c347bbd6dcdbed33b2ed54f10b8ef14fb95586c086fbde"
end

head do
Expand Down Expand Up @@ -180,8 +181,8 @@ def install

inreplace "MoltenVK/icd/MoltenVK_icd.json",
"./libMoltenVK.dylib",
(lib/"libMoltenVK.dylib").relative_path_from(share/"vulkan/icd.d")
(share/"vulkan").install "MoltenVK/icd" => "icd.d"
(lib/"libMoltenVK.dylib").relative_path_from(prefix/"etc/vulkan/icd.d")
(prefix/"etc/vulkan").install "MoltenVK/icd" => "icd.d"
end

test do
Expand Down
31 changes: 19 additions & 12 deletions Formula/v/vulkan-tools.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ class VulkanTools < Formula
end

bottle do
sha256 cellar: :any, arm64_sequoia: "53a007a84b4760f4170873c4c6e99cd61b4eed0430510e07159d791daabe5061"
sha256 cellar: :any, arm64_sonoma: "0f46827cbba868aff6645b933fa16a56f36728843dc5f49efbe5c6ebdb5894d4"
sha256 cellar: :any, arm64_ventura: "21ad04ab2d87dc6d7dea8ff491a1270dba70dd5af77dc7b65c5196f5d4577a6c"
sha256 cellar: :any, sonoma: "32597916882f2d6a72713d063100583d059f45bc709f7419ffba61bca72c07ae"
sha256 cellar: :any, ventura: "dbe4cf3cefd966c99e4e3e10ca16239ab378d8c47e4d3c6bab0206d57d35f5a9"
sha256 x86_64_linux: "f8955674f6e14c3c401c4ec454001cd68adbc9d79f790055adc8864f8855c537"
rebuild 1
sha256 cellar: :any, arm64_sequoia: "502e60bb048d10eeba3665bdbf4668279cadfde780048397297be9a81d4557ad"
sha256 cellar: :any, arm64_sonoma: "53e0852f35fadafcda2af7f5b01c2011fff132493f634e3a724564a5e0fe8844"
sha256 cellar: :any, arm64_ventura: "9e841e656c68b080846623e2cf491ee950b5487ee6cb49359957b4bce3a41299"
sha256 cellar: :any, sonoma: "f709728ab078f21dc442530b54cd12b5973a8ff40fd495dceaa3b57b1b38ab0e"
sha256 cellar: :any, ventura: "6cb7b4bc120b9917a5fec6f94550b29e0e6a88443964e41e9e689bbc2fc1322e"
sha256 x86_64_linux: "89c318bc51a7fff24370640fba6d4d86de27a0ef17d5ba6998597f3577712be5"
end

depends_on "cmake" => :build
Expand Down Expand Up @@ -46,11 +47,10 @@ def install
# account for using already-built MoltenVK instead of the source repo
inreplace "cube/CMakeLists.txt",
"${MOLTENVK_DIR}/MoltenVK/icd/MoltenVK_icd.json",
"${MOLTENVK_DIR}/share/vulkan/icd.d/MoltenVK_icd.json"
inreplace buildpath.glob("*/macOS/*/CMakeLists.txt") do |s|
s.gsub! "${MOLTENVK_DIR}/Package/Release/MoltenVK/dynamic/dylib/macOS/libMoltenVK.dylib",
"${MOLTENVK_DIR}/etc/vulkan/icd.d/MoltenVK_icd.json"
inreplace buildpath.glob("*/macOS/*/CMakeLists.txt"),
"${MOLTENVK_DIR}/Package/Release/MoltenVK/dynamic/dylib/macOS/libMoltenVK.dylib",
"${MOLTENVK_DIR}/lib/libMoltenVK.dylib"
end
end

args = [
Expand Down Expand Up @@ -105,7 +105,14 @@ def caveats
end

test do
ENV["VK_ICD_FILENAMES"] = lib/"mock_icd/VkICD_mock_icd.json"
system bin/"vulkaninfo", "--summary"
with_env(VK_ICD_FILENAMES: lib/"mock_icd/VkICD_mock_icd.json") do
assert_match "Vulkan Mock Device", shell_output("#{bin}/vulkaninfo --summary")
end

return if !OS.mac? || (Hardware::CPU.intel? && ENV["HOMEBREW_GITHUB_ACTIONS"])

with_env(XDG_DATA_DIRS: testpath) do
assert_match "DRIVER_ID_MOLTENVK", shell_output("#{bin}/vulkaninfo --summary")
end
end
end
Loading