From 8770ca1b30e9093e860c46c16df883a881ccfa13 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 15 Nov 2021 23:33:49 +0100 Subject: [PATCH] [gmmlib] Update to 21.3.2 (#21395) * Update gmmlib to 21.3.2 * Update CI baseline Co-authored-by: chausner --- ports/gmmlib/portfile.cmake | 22 ++++++++++------------ ports/gmmlib/vcpkg.json | 14 ++++++++++---- versions/baseline.json | 4 ++-- versions/g-/gmmlib.json | 5 +++++ 4 files changed, 27 insertions(+), 18 deletions(-) diff --git a/ports/gmmlib/portfile.cmake b/ports/gmmlib/portfile.cmake index b09ba8c84c4307..eef38b62225e2a 100644 --- a/ports/gmmlib/portfile.cmake +++ b/ports/gmmlib/portfile.cmake @@ -7,24 +7,22 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO intel/gmmlib - REF f6c91364b0911a7513e9543fd874360ec8901742 # intel-gmmlib-20.3.1 - SHA512 c46d5cba30db1d06134d2606ad9806a84b0e1248313a61c5d073fc5fe7570b864a4d5e9cf73dc6832102ace476839dbff1e3782f08a4cdcb62c04c40708a5710 + REF intel-gmmlib-21.3.2 + SHA512 155f7077f3135ff812b9fe759e56fecd595f1c5dde9a377df31a9acedcfeea9d93751badba68077c00929a21cb87e1bd69b8fe3961ac61765fabbc5d6d89e6be HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DARCH=64 ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/igdgmm/GmmLib/Scripts") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/igdgmm/GmmLib/Resource") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/igdgmm/GmmLib/GlobalInfo") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/gmmlib/copyright COPYONLY) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/igdgmm/GmmLib/Scripts) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/igdgmm/GmmLib/Resource) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/igdgmm/GmmLib/GlobalInfo) +configure_file("${SOURCE_PATH}/LICENSE.md" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/gmmlib/vcpkg.json b/ports/gmmlib/vcpkg.json index 613b45e830a184..96a697a3db4877 100644 --- a/ports/gmmlib/vcpkg.json +++ b/ports/gmmlib/vcpkg.json @@ -1,7 +1,13 @@ { "name": "gmmlib", - "version-string": "20.3.1", - "port-version": 1, - "description": "intel's graphics memory management library", - "supports": "linux" + "version": "21.3.2", + "description": "Intel(R) Graphics Memory Management Library", + "homepage": "https://github.com/intel/gmmlib", + "supports": "linux", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 15bc9fc901c25c..8306b954acbc5b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2497,8 +2497,8 @@ "port-version": 2 }, "gmmlib": { - "baseline": "20.3.1", - "port-version": 1 + "baseline": "21.3.2", + "port-version": 0 }, "gmp": { "baseline": "6.2.1", diff --git a/versions/g-/gmmlib.json b/versions/g-/gmmlib.json index 64ad7d7f5430c1..dac45e5eec1af1 100644 --- a/versions/g-/gmmlib.json +++ b/versions/g-/gmmlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5b69783d8bdff160371ecc494af42d6ec8d8ffa0", + "version": "21.3.2", + "port-version": 0 + }, { "git-tree": "1d1a120fb9b513b005575b6324b9eaa13d900192", "version-string": "20.3.1",