From cc35818bd4055de93eaf6f93fcaf1bcee9eff6a5 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Thu, 29 Dec 2022 23:54:23 -0800 Subject: [PATCH] [gamenetworkingsockets] Add find_dependency(protobuf CONFIG REQUIRED) (#28615) * [gamenetworkingsockets] Add find_dependency(protobuf CONFIG REQUIRED) * x-add-version * apply suggestions * x-add-version --- .../gamenetworkingsockets/fix-depend-protobuf.patch | 12 ++++++++++++ ports/gamenetworkingsockets/portfile.cmake | 4 +++- ports/gamenetworkingsockets/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/g-/gamenetworkingsockets.json | 5 +++++ 5 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 ports/gamenetworkingsockets/fix-depend-protobuf.patch diff --git a/ports/gamenetworkingsockets/fix-depend-protobuf.patch b/ports/gamenetworkingsockets/fix-depend-protobuf.patch new file mode 100644 index 00000000000..d596d39aff4 --- /dev/null +++ b/ports/gamenetworkingsockets/fix-depend-protobuf.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/GameNetworkingSocketsConfig.cmake.in b/cmake/GameNetworkingSocketsConfig.cmake.in +index 1a27988..5076a6e 100644 +--- a/cmake/GameNetworkingSocketsConfig.cmake.in ++++ b/cmake/GameNetworkingSocketsConfig.cmake.in +@@ -3,6 +3,7 @@ + include(CMakeFindDependencyMacro) + + find_dependency(Threads) ++find_dependency(Protobuf) + + if(@USE_CRYPTO@ STREQUAL "OpenSSL") + find_dependency(OpenSSL) diff --git a/ports/gamenetworkingsockets/portfile.cmake b/ports/gamenetworkingsockets/portfile.cmake index d7962c510d9..9c57f34604d 100644 --- a/ports/gamenetworkingsockets/portfile.cmake +++ b/ports/gamenetworkingsockets/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF 505c697d0abef5da2ff3be35aa4ea3687597c3e9 # v1.4.1 SHA512 3e4b4da138f2b356169e6504aa899c9eca4fba5b5fcaed2a0ae8a2f5828976dd00af9f3262c75bd6d820300da87ebe32da152fecddc278a651f3b33eb59142df HEAD_REF master + PATCHES + fix-depend-protobuf.patch ) set(CRYPTO_BACKEND OpenSSL) @@ -21,7 +23,6 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/GameNetworkingSockets") vcpkg_fixup_pkgconfig() @@ -30,3 +31,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/gamenetworkingsockets/vcpkg.json b/ports/gamenetworkingsockets/vcpkg.json index 69ec3030323..c291a058d62 100644 --- a/ports/gamenetworkingsockets/vcpkg.json +++ b/ports/gamenetworkingsockets/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gamenetworkingsockets", - "version-semver": "1.4.1", + "version": "1.4.1", + "port-version": 1, "description": "GameNetworkingSockets is a basic transport layer for games.", "homepage": "https://github.com/ValveSoftware/GameNetworkingSockets", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index d3319ed50b8..c06c8c2aa51 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2542,7 +2542,7 @@ }, "gamenetworkingsockets": { "baseline": "1.4.1", - "port-version": 0 + "port-version": 1 }, "gamma": { "baseline": "gamma-2018-01-27", diff --git a/versions/g-/gamenetworkingsockets.json b/versions/g-/gamenetworkingsockets.json index 94813fbbaec..3a34c2c153d 100644 --- a/versions/g-/gamenetworkingsockets.json +++ b/versions/g-/gamenetworkingsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "75eaecf85e526c7de535e77ac6da7025c8e4020f", + "version": "1.4.1", + "port-version": 1 + }, { "git-tree": "94a9a726c8c2caf64acec0988bd9ad58f57ab5df", "version-semver": "1.4.1",