From 34aa948f6c4161d5acb7061a7418e0462ce85068 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 10 Apr 2023 06:56:02 +0200 Subject: [PATCH] [halide] fix core build (#30449) --- ports/halide/portfile.cmake | 1 + ports/halide/vcpkg.json | 75 ++++++++++++++++++------------------- versions/baseline.json | 2 +- versions/h-/halide.json | 5 +++ 4 files changed, 43 insertions(+), 40 deletions(-) diff --git a/ports/halide/portfile.cmake b/ports/halide/portfile.cmake index a5c818e27e..49ec9e99a0 100644 --- a/ports/halide/portfile.cmake +++ b/ports/halide/portfile.cmake @@ -17,6 +17,7 @@ vcpkg_check_features( target-amdgpu TARGET_AMDGPU target-arm TARGET_ARM target-d3d12compute TARGET_D3D12COMPUTE + target-opengl-compute TARGET_OPENGLCOMPUTE target-hexagon TARGET_HEXAGON target-metal TARGET_METAL target-mips TARGET_MIPS diff --git a/ports/halide/vcpkg.json b/ports/halide/vcpkg.json index 3d4334d251..57a4ff2dea 100644 --- a/ports/halide/vcpkg.json +++ b/ports/halide/vcpkg.json @@ -1,11 +1,43 @@ { "name": "halide", "version": "15.0.0", + "port-version": 1, "description": "Halide is a programming language designed to make it easier to write high-performance image and array processing code on modern machines.", "homepage": "https://github.com/halide/Halide", "license": "MIT", "supports": "!uwp", "dependencies": [ + { + "name": "halide", + "default-features": false, + "features": [ + "target-arm" + ], + "platform": "arm32" + }, + { + "name": "halide", + "default-features": false, + "features": [ + "target-aarch64" + ], + "platform": "arm64" + }, + { + "name": "halide", + "default-features": false, + "features": [ + "target-x86" + ], + "platform": "x86 | x64" + }, + { + "name": "halide", + "features": [ + "target-all" + ], + "platform": "!x86 & !x64 & !arm" + }, { "name": "llvm", "default-features": false, @@ -24,46 +56,7 @@ "host": true } ], - "default-features": [ - "jit" - ], "features": { - "jit": { - "description": "Include targets required for jit compilation", - "dependencies": [ - { - "name": "halide", - "default-features": false, - "features": [ - "target-aarch64" - ], - "platform": "arm64" - }, - { - "name": "halide", - "default-features": false, - "features": [ - "target-x86" - ], - "platform": "x86 | x64" - }, - { - "name": "halide", - "default-features": false, - "features": [ - "target-arm" - ], - "platform": "arm & !arm64" - }, - { - "name": "halide", - "features": [ - "target-all" - ], - "platform": "!x86 & !x64 & !arm & !arm64" - } - ] - }, "target-aarch64": { "description": "Include AArch64 target", "dependencies": [ @@ -92,6 +85,7 @@ "target-mips", "target-nvptx", "target-opencl", + "target-opengl-compute", "target-powerpc", "target-riscv", "target-x86" @@ -168,6 +162,9 @@ "target-opencl": { "description": "Include OpenCL-C target" }, + "target-opengl-compute": { + "description": "Include OpenGL Compute target" + }, "target-powerpc": { "description": "Include PowerPC target", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index df74fe7402..f29a558c8c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3014,7 +3014,7 @@ }, "halide": { "baseline": "15.0.0", - "port-version": 0 + "port-version": 1 }, "happly": { "baseline": "2021-03-19", diff --git a/versions/h-/halide.json b/versions/h-/halide.json index 7c7a42104c..2b7f677488 100644 --- a/versions/h-/halide.json +++ b/versions/h-/halide.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "747567f07492ad16950a115456d31ba746a3bd10", + "version": "15.0.0", + "port-version": 1 + }, { "git-tree": "1d7e84604e36eb833964af361772ebcf5e3953c5", "version": "15.0.0",