From 04d07e48cb4f2ffafe172cf15139d1e2860a0971 Mon Sep 17 00:00:00 2001 From: Thomas Arcila <134677+tarcila@users.noreply.github.com> Date: Thu, 9 Jan 2025 21:18:55 -0500 Subject: [PATCH 1/9] [anari] Update to 0.12.0 --- ports/anari/portfile.cmake | 27 +++++++++++++++++++-------- ports/anari/vcpkg.json | 2 +- versions/a-/anari.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/ports/anari/portfile.cmake b/ports/anari/portfile.cmake index baa13fd6c9d601..5ffb98e3782689 100644 --- a/ports/anari/portfile.cmake +++ b/ports/anari/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/ANARI-SDK REF "v${VERSION}" - SHA512 cf2c2e044b04d695e0a6c6c1abfb3495ea0996a018742ad3a6baccc6e0e3e9b83cb91b61eda8cf07e8f67f4beba24d07d927697a27606ae008a85fee9fa64fa8 - HEAD_REF main + SHA512 978522469621694022be1a5425306832344a4b64ff5cc8fbb9267a683889d4624edd8a59b6488ecc6dcc8a851c74b92b6918470ad69c4d9363596f621688973d + HEAD_REF next_release ) vcpkg_find_acquire_program(PYTHON3) @@ -13,11 +13,16 @@ vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + -DBUILD_EXAMPLES=OFF + -DBUILD_VIEWER=OFF -DBUILD_CTS=OFF -DBUILD_EXAMPLES=OFF + -DBUILD_HDANARI=OFF -DBUILD_HELIDE_DEVICE=OFF + -DBUILD_REMOTE_DEVICE=OFF -DBUILD_TESTING=OFF - -DBUILD_VIEWER=OFF + -DINSTALL_CODE_GEN_SCRIPTS=ON + -DINSTALL_VIEWER_LIBRARY=ON ) vcpkg_cmake_install() @@ -26,16 +31,22 @@ vcpkg_cmake_config_fixup( ) vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() +vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/share/anari/anariConfig.cmake" + " \${CMAKE_CURRENT_LIST_DIR}/../../../share/anari" + " \${CMAKE_CURRENT_LIST_DIR}/../../share/anari" +) -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/share/anari/code_gen/__pycache__" ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/bin" - "${CURRENT_PACKAGES_DIR}/debug/bin" + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" ) endif() diff --git a/ports/anari/vcpkg.json b/ports/anari/vcpkg.json index d4610b6e4b32df..479a2e0b4f4f11 100644 --- a/ports/anari/vcpkg.json +++ b/ports/anari/vcpkg.json @@ -1,6 +1,6 @@ { "name": "anari", - "version": "0.10.0", + "version": "0.12.0", "description": "Cross-Platform 3D Rendering Engine API.", "homepage": "https://www.khronos.org/anari", "license": "Apache-2.0", diff --git a/versions/a-/anari.json b/versions/a-/anari.json index b4c87822244e2b..637ed9dff7a326 100644 --- a/versions/a-/anari.json +++ b/versions/a-/anari.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "53a0d3cff4289a477a5a89a7f9c5e7ca6c68cf3f", + "version": "0.12.0", + "port-version": 0 + }, { "git-tree": "b547bbf12d56d4d9f189a14153d93e75c7aa3451", "version": "0.10.0", diff --git a/versions/baseline.json b/versions/baseline.json index b528e477b63a91..d9111b1b5f2147 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -121,7 +121,7 @@ "port-version": 0 }, "anari": { - "baseline": "0.10.0", + "baseline": "0.12.0", "port-version": 0 }, "anax": { From 96cc02a6c96897cb7e2bec4e2d57b4622b1d84b3 Mon Sep 17 00:00:00 2001 From: Thomas Arcila <134677+tarcila@users.noreply.github.com> Date: Fri, 10 Jan 2025 07:57:59 -0500 Subject: [PATCH 2/9] [anari] Sort and clean up build flags --- ports/anari/portfile.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/anari/portfile.cmake b/ports/anari/portfile.cmake index 5ffb98e3782689..d4f39846a73fc4 100644 --- a/ports/anari/portfile.cmake +++ b/ports/anari/portfile.cmake @@ -13,14 +13,13 @@ vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DBUILD_EXAMPLES=OFF - -DBUILD_VIEWER=OFF -DBUILD_CTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_HDANARI=OFF -DBUILD_HELIDE_DEVICE=OFF -DBUILD_REMOTE_DEVICE=OFF -DBUILD_TESTING=OFF + -DBUILD_VIEWER=OFF -DINSTALL_CODE_GEN_SCRIPTS=ON -DINSTALL_VIEWER_LIBRARY=ON ) From 373dcab07873adcc648c86c6cbcee16f5dd9a164 Mon Sep 17 00:00:00 2001 From: Thomas Arcila <134677+tarcila@users.noreply.github.com> Date: Fri, 10 Jan 2025 07:58:46 -0500 Subject: [PATCH 3/9] [anari] Remove now unused bin and debug/bin folder removal Nothing gets installed in there with the new set of flags. --- ports/anari/portfile.cmake | 7 ------- 1 file changed, 7 deletions(-) diff --git a/ports/anari/portfile.cmake b/ports/anari/portfile.cmake index d4f39846a73fc4..d55082f2af63a2 100644 --- a/ports/anari/portfile.cmake +++ b/ports/anari/portfile.cmake @@ -42,13 +42,6 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/anari/code_gen/__pycache__" ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/bin" - "${CURRENT_PACKAGES_DIR}/debug/bin" - ) -endif() - vcpkg_install_copyright( FILE_LIST "${SOURCE_PATH}/LICENSE" ) From 11b9c99d509451ea5d3100fb35415f67e8b93dde Mon Sep 17 00:00:00 2001 From: Thomas Arcila <134677+tarcila@users.noreply.github.com> Date: Fri, 10 Jan 2025 08:07:35 -0500 Subject: [PATCH 4/9] [anari] rerun vcpkg version update tool --- versions/a-/anari.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/a-/anari.json b/versions/a-/anari.json index 637ed9dff7a326..56ee760582c234 100644 --- a/versions/a-/anari.json +++ b/versions/a-/anari.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "53a0d3cff4289a477a5a89a7f9c5e7ca6c68cf3f", + "git-tree": "1f20722f91022831f8d01dd869a8573153c779ae", "version": "0.12.0", "port-version": 0 }, From a7c0980bc76dff4c318337f7c666025b26afeecb Mon Sep 17 00:00:00 2001 From: Thomas Arcila Date: Fri, 10 Jan 2025 10:03:28 -0500 Subject: [PATCH 5/9] Make sure only anari devices are dynamically built with static configurations --- ports/anari/anari-lib-maybe-static-lib.patch | 18 ++++++++++++++++++ ports/anari/portfile.cmake | 3 +++ 2 files changed, 21 insertions(+) create mode 100644 ports/anari/anari-lib-maybe-static-lib.patch diff --git a/ports/anari/anari-lib-maybe-static-lib.patch b/ports/anari/anari-lib-maybe-static-lib.patch new file mode 100644 index 00000000000000..a54337eeec9c7e --- /dev/null +++ b/ports/anari/anari-lib-maybe-static-lib.patch @@ -0,0 +1,18 @@ +diff --git a/src/anari/CMakeLists.txt b/src/anari/CMakeLists.txt +index 6a34153..ee572a1 100644 +--- a/src/anari/CMakeLists.txt ++++ b/src/anari/CMakeLists.txt +@@ -51,7 +51,12 @@ project_compile_definitions(PRIVATE -Danari_EXPORTS) + ## Create main shared + static library targets ## + + project(anari) +-add_anari_frontend_library_target(SHARED) ++if(BUILD_SHARED_LIBS) ++ add_anari_frontend_library_target(SHARED) ++else() ++ add_anari_frontend_library_target(STATIC) ++ project_compile_definitions(PUBLIC -DANARI_STATIC_DEFINE) ++endif() + + project(anari_static) + add_anari_frontend_library_target(STATIC) diff --git a/ports/anari/portfile.cmake b/ports/anari/portfile.cmake index d55082f2af63a2..d255f72a300a8e 100644 --- a/ports/anari/portfile.cmake +++ b/ports/anari/portfile.cmake @@ -1,9 +1,12 @@ +set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/ANARI-SDK REF "v${VERSION}" SHA512 978522469621694022be1a5425306832344a4b64ff5cc8fbb9267a683889d4624edd8a59b6488ecc6dcc8a851c74b92b6918470ad69c4d9363596f621688973d HEAD_REF next_release + PATCHES anari-lib-maybe-static-lib.patch ) vcpkg_find_acquire_program(PYTHON3) From 8a1929d5b9402b768311f4e586e396ea54162b59 Mon Sep 17 00:00:00 2001 From: Thomas Arcila Date: Fri, 10 Jan 2025 10:33:07 -0500 Subject: [PATCH 6/9] run vcpkg version update tool --- versions/a-/anari.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/a-/anari.json b/versions/a-/anari.json index 56ee760582c234..ef92a2a3a4573d 100644 --- a/versions/a-/anari.json +++ b/versions/a-/anari.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "1f20722f91022831f8d01dd869a8573153c779ae", + "git-tree": "10ea72740cb7c7d7efdec82fe4f846976d663933", "version": "0.12.0", "port-version": 0 }, From 17d7ee53c2717fc7b3ec41476a52ba69b330a435 Mon Sep 17 00:00:00 2001 From: Thomas Arcila <134677+tarcila@users.noreply.github.com> Date: Mon, 20 Jan 2025 10:40:24 -0500 Subject: [PATCH 7/9] Update to 0.12.1 --- ports/anari/portfile.cmake | 2 +- ports/anari/vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/anari/portfile.cmake b/ports/anari/portfile.cmake index d255f72a300a8e..1a7348dd158f8f 100644 --- a/ports/anari/portfile.cmake +++ b/ports/anari/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/ANARI-SDK REF "v${VERSION}" - SHA512 978522469621694022be1a5425306832344a4b64ff5cc8fbb9267a683889d4624edd8a59b6488ecc6dcc8a851c74b92b6918470ad69c4d9363596f621688973d + SHA512 0a184fea1ab3afab72606d434d69cd3e171ae04d042fc6a425ba777c094af5a8225bb187a47176ac4afd6b2c57d0363f6e97e1f71b30137be09f26cc50590fac HEAD_REF next_release PATCHES anari-lib-maybe-static-lib.patch ) diff --git a/ports/anari/vcpkg.json b/ports/anari/vcpkg.json index 479a2e0b4f4f11..51f7768ad2ef9b 100644 --- a/ports/anari/vcpkg.json +++ b/ports/anari/vcpkg.json @@ -1,6 +1,6 @@ { "name": "anari", - "version": "0.12.0", + "version": "0.12.1", "description": "Cross-Platform 3D Rendering Engine API.", "homepage": "https://www.khronos.org/anari", "license": "Apache-2.0", From c0ffbff161144ba1ec9685acdd987a4f5ef3c76e Mon Sep 17 00:00:00 2001 From: Thomas Arcila <134677+tarcila@users.noreply.github.com> Date: Mon, 20 Jan 2025 10:40:45 -0500 Subject: [PATCH 8/9] Run x-add-version following 0.12.1 update --- versions/a-/anari.json | 5 +++++ versions/baseline.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/a-/anari.json b/versions/a-/anari.json index ef92a2a3a4573d..21db3051b60f39 100644 --- a/versions/a-/anari.json +++ b/versions/a-/anari.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "79e7c099f3d6cd450902494060357691f6fc3896", + "version": "0.12.1", + "port-version": 0 + }, { "git-tree": "10ea72740cb7c7d7efdec82fe4f846976d663933", "version": "0.12.0", diff --git a/versions/baseline.json b/versions/baseline.json index d9111b1b5f2147..59e87fd58aa92d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -121,7 +121,7 @@ "port-version": 0 }, "anari": { - "baseline": "0.12.0", + "baseline": "0.12.1", "port-version": 0 }, "anax": { From 90b6142b3b279fa28ace6395c17e47791988fc32 Mon Sep 17 00:00:00 2001 From: Thomas Arcila <134677+tarcila@users.noreply.github.com> Date: Tue, 21 Jan 2025 07:21:56 -0500 Subject: [PATCH 9/9] Update versions/a-/anari.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- versions/a-/anari.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/versions/a-/anari.json b/versions/a-/anari.json index 21db3051b60f39..6c403d4f324c08 100644 --- a/versions/a-/anari.json +++ b/versions/a-/anari.json @@ -5,11 +5,6 @@ "version": "0.12.1", "port-version": 0 }, - { - "git-tree": "10ea72740cb7c7d7efdec82fe4f846976d663933", - "version": "0.12.0", - "port-version": 0 - }, { "git-tree": "b547bbf12d56d4d9f189a14153d93e75c7aa3451", "version": "0.10.0",