From 97c074df30831b0055131c329a884ac744f14d06 Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Mon, 30 Sep 2024 15:44:29 +0000 Subject: [PATCH] [level-zero] Update to 1.17.45 (#41259) Co-authored-by: Monica --- .../level-zero/001-patch-install-rules.patch | 116 ------------------ ports/level-zero/portfile.cmake | 4 +- ports/level-zero/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/level-zero.json | 5 + 5 files changed, 8 insertions(+), 121 deletions(-) delete mode 100644 ports/level-zero/001-patch-install-rules.patch diff --git a/ports/level-zero/001-patch-install-rules.patch b/ports/level-zero/001-patch-install-rules.patch deleted file mode 100644 index 841fc0ebc7..0000000000 --- a/ports/level-zero/001-patch-install-rules.patch +++ /dev/null @@ -1,116 +0,0 @@ -diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt -index 5ef252c..c9d05dd 100644 ---- a/source/CMakeLists.txt -+++ b/source/CMakeLists.txt -@@ -49,21 +49,10 @@ endif() - target_link_libraries(${TARGET_LOADER_NAME} utils) - - install(TARGETS ze_loader -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -- LIBRARY -- DESTINATION ${CMAKE_INSTALL_LIBDIR} -- COMPONENT level-zero -- NAMELINK_SKIP --) -- --install(TARGETS ze_loader -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -- LIBRARY -- DESTINATION ${CMAKE_INSTALL_LIBDIR} -- COMPONENT level-zero-devel -- NAMELINK_ONLY -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT level-zero-devel -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT level-zero -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT level-zero -+ NAMELINK_COMPONENT level-zero-devel - ) - - if(UNIX) -diff --git a/source/drivers/null/CMakeLists.txt b/source/drivers/null/CMakeLists.txt -index b384434..0cb8801 100644 ---- a/source/drivers/null/CMakeLists.txt -+++ b/source/drivers/null/CMakeLists.txt -@@ -21,18 +21,10 @@ target_include_directories(${TARGET_NAME} - - if(INSTALL_NULL_DRIVER) - install(TARGETS ze_null -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -- LIBRARY -- DESTINATION ${CMAKE_INSTALL_LIBDIR} -- COMPONENT level-zero -- NAMELINK_SKIP -- ) -- install(TARGETS ze_null -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -- LIBRARY -- DESTINATION ${CMAKE_INSTALL_LIBDIR} -- COMPONENT level-zero-devel -- NAMELINK_ONLY -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT level-zero-devel -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT level-zero -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT level-zero -+ NAMELINK_COMPONENT level-zero-devel - ) - endif() - -diff --git a/source/layers/tracing/CMakeLists.txt b/source/layers/tracing/CMakeLists.txt -index 1dde028..63e0b20 100644 ---- a/source/layers/tracing/CMakeLists.txt -+++ b/source/layers/tracing/CMakeLists.txt -@@ -49,20 +49,8 @@ set_target_properties(${TARGET_NAME} PROPERTIES - ) - - install(TARGETS ze_tracing_layer -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -- RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} -- LIBRARY -- DESTINATION ${CMAKE_INSTALL_LIBDIR} -- COMPONENT level-zero -- NAMELINK_SKIP -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT level-zero-devel -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT level-zero -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT level-zero -+ NAMELINK_COMPONENT level-zero-devel - ) -- --install(TARGETS ze_tracing_layer -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -- RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} -- LIBRARY -- DESTINATION ${CMAKE_INSTALL_LIBDIR} -- COMPONENT level-zero-devel -- NAMELINK_ONLY --) -- -diff --git a/source/layers/validation/CMakeLists.txt b/source/layers/validation/CMakeLists.txt -index 3a4162c..ced5f21 100644 ---- a/source/layers/validation/CMakeLists.txt -+++ b/source/layers/validation/CMakeLists.txt -@@ -37,21 +37,10 @@ set_target_properties(${TARGET_NAME} PROPERTIES - ) - - install(TARGETS ze_validation_layer -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -- RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} -- LIBRARY -- DESTINATION ${CMAKE_INSTALL_LIBDIR} -- COMPONENT level-zero -- NAMELINK_SKIP --) -- --install(TARGETS ze_validation_layer -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -- RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} -- LIBRARY -- DESTINATION ${CMAKE_INSTALL_LIBDIR} -- COMPONENT level-zero-devel -- NAMELINK_ONLY -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT level-zero-devel -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT level-zero -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT level-zero -+ NAMELINK_COMPONENT level-zero-devel - ) - - add_subdirectory(handle_lifetime_tracking) diff --git a/ports/level-zero/portfile.cmake b/ports/level-zero/portfile.cmake index b032a0db9f..f05a0d5fd6 100644 --- a/ports/level-zero/portfile.cmake +++ b/ports/level-zero/portfile.cmake @@ -4,10 +4,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oneapi-src/level-zero REF "v${VERSION}" - SHA512 0498ec279ab73a61ccd4a2c27a8c3837090004e0730c01e92ef6e91f32000ca9e91167b87fbec66668674d86b5dede51470ce4c77dafb58f8b4d982db8b6e490 + SHA512 83d97ffe43c21286a845bb9d11504414972c944d9b06975ba9e7680802a92a260b6246f3605ed32e5e5dec358972fbb5cab49543559dc36cb164a9c3b6a69d73 HEAD_REF master - PATCHES - 001-patch-install-rules.patch ) vcpkg_cmake_configure( diff --git a/ports/level-zero/vcpkg.json b/ports/level-zero/vcpkg.json index 769e87b71b..28f8280d96 100644 --- a/ports/level-zero/vcpkg.json +++ b/ports/level-zero/vcpkg.json @@ -1,6 +1,6 @@ { "name": "level-zero", - "version": "1.17.28", + "version": "1.17.45", "description": "oneAPI Level Zero Specification Headers and Loader.", "homepage": "https://github.com/oneapi-src/level-zero", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index da8c2294c1..bc0f459fb0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4221,7 +4221,7 @@ "port-version": 0 }, "level-zero": { - "baseline": "1.17.28", + "baseline": "1.17.45", "port-version": 0 }, "leveldb": { diff --git a/versions/l-/level-zero.json b/versions/l-/level-zero.json index 18e6bfb16a..f1368e330f 100644 --- a/versions/l-/level-zero.json +++ b/versions/l-/level-zero.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "363f712b8a62c1c35924352077138bf3469fa796", + "version": "1.17.45", + "port-version": 0 + }, { "git-tree": "ce4627310deb48fe8c5e30d69862c69039c31a98", "version": "1.17.28",