From 35dbfe0996d480ed8c4bcdecec846c65b1730b9a Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Wed, 16 Jun 2021 03:55:18 +0300 Subject: [PATCH 1/3] SLikeNet now builds under MinGW Use vcpkg.json instead of CONTROL Fix Run x-add-version Fix deprecation warning Update ports/slikenet/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/slikenet/CONTROL | 6 ------ ports/slikenet/portfile.cmake | 13 ++++--------- ports/slikenet/vcpkg.json | 10 ++++++++++ versions/baseline.json | 2 +- versions/s-/slikenet.json | 5 +++++ 5 files changed, 20 insertions(+), 16 deletions(-) delete mode 100644 ports/slikenet/CONTROL create mode 100644 ports/slikenet/vcpkg.json diff --git a/ports/slikenet/CONTROL b/ports/slikenet/CONTROL deleted file mode 100644 index 5753ce9aa354a4..00000000000000 --- a/ports/slikenet/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: slikenet -Version: 2019-10-22-2 -Homepage: https://github.com/SLikeSoft/SLikeNet -Description: SLikeNetT is an Open Source/Free Software cross-platform network engine written in C++ and specifially designed for games (and applications which have comparable requirements on a network engine like games) building upon the discontinued RakNet network engine which had more than 13 years of active development. -Build-Depends: openssl -Supports: !uwp diff --git a/ports/slikenet/portfile.cmake b/ports/slikenet/portfile.cmake index c321f653c5917e..ba5ef493feef65 100644 --- a/ports/slikenet/portfile.cmake +++ b/ports/slikenet/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO SLikeSoft/SLikeNet - REF cca394f05e9e9e3e315a85539e648f267d3f2fcc - SHA512 410954bda5a7be309eb71c3078f8ea67ff21aae2ce923f01db77b09265969f1350afb45b90194118bfad274f0a36a2d3bbc38d86a15507fdfc4bc8edc4a0204c + REF 358462052fce7e585fc1cce0a17a7042ba724c08 + SHA512 2c932b0a7910ec36dd6a340dd841cefcf259fbdadadff220747d13752181ea14e3c5f05331beb36dea21c0de360edc270ff4c55375bbea23ee2149828f07e9ab HEAD_REF master PATCHES fix-install.patch @@ -12,13 +12,8 @@ vcpkg_from_github( #Uses an outdated OpenSSL version and is in an experimental namespace any way. As such we delete it here file(REMOVE_RECURSE "${SOURCE_PATH}/Source/src/crypto" "${SOURCE_PATH}/Source/include/slikenet/crypto") -if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(SLIKENET_ENABLE_STATIC TRUE) - set(SLIKENET_ENABLE_DLL FALSE) -else() - set(SLIKENET_ENABLE_STATIC FALSE) - set(SLIKENET_ENABLE_DLL TRUE) -endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SLIKENET_ENABLE_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SLIKENET_ENABLE_DLL) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/slikenet/vcpkg.json b/ports/slikenet/vcpkg.json new file mode 100644 index 00000000000000..cef8d945a7e40e --- /dev/null +++ b/ports/slikenet/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "slikenet", + "version-string": "2021-06-07", + "description": "SLikeNetT is an Open Source/Free Software cross-platform network engine written in C++ and specifially designed for games (and applications which have comparable requirements on a network engine like games) building upon the discontinued RakNet network engine which had more than 13 years of active development.", + "homepage": "https://github.com/SLikeSoft/SLikeNet", + "supports": "!uwp", + "dependencies": [ + "openssl" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index b346ec608d2fb9..4c36920141f357 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5785,7 +5785,7 @@ "port-version": 0 }, "slikenet": { - "baseline": "2019-10-22-2", + "baseline": "2021-06-07", "port-version": 0 }, "sltbench": { diff --git a/versions/s-/slikenet.json b/versions/s-/slikenet.json index 5bb738ff0f3c0e..67a14295e4e964 100644 --- a/versions/s-/slikenet.json +++ b/versions/s-/slikenet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "48e1226409861a6bbe3d8fc084ea8fea99759360", + "version-string": "2021-06-07", + "port-version": 0 + }, { "git-tree": "fd99081ecbebc7fe7639cc9a61899ff6fb977d04", "version-string": "2019-10-22-2", From 76021fd711e34b724d8e496e2d859bc72c65c1e9 Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Wed, 16 Jun 2021 05:49:21 +0300 Subject: [PATCH 2/3] Update ports/slikenet/vcpkg.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/slikenet/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/slikenet/vcpkg.json b/ports/slikenet/vcpkg.json index cef8d945a7e40e..158a28c4851c81 100644 --- a/ports/slikenet/vcpkg.json +++ b/ports/slikenet/vcpkg.json @@ -1,6 +1,6 @@ { "name": "slikenet", - "version-string": "2021-06-07", + "version-date": "2021-06-07", "description": "SLikeNetT is an Open Source/Free Software cross-platform network engine written in C++ and specifially designed for games (and applications which have comparable requirements on a network engine like games) building upon the discontinued RakNet network engine which had more than 13 years of active development.", "homepage": "https://github.com/SLikeSoft/SLikeNet", "supports": "!uwp", From 85e60482ed5eb7f5a9647391a339c6d881946d9d Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Wed, 16 Jun 2021 06:03:33 +0300 Subject: [PATCH 3/3] Run vcpkg x-add-version --- versions/s-/slikenet.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/s-/slikenet.json b/versions/s-/slikenet.json index 67a14295e4e964..ee83f0113e39ba 100644 --- a/versions/s-/slikenet.json +++ b/versions/s-/slikenet.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "48e1226409861a6bbe3d8fc084ea8fea99759360", - "version-string": "2021-06-07", + "git-tree": "ac7b0f3e2e112489c1d66b390c22e050bd410783", + "version-date": "2021-06-07", "port-version": 0 }, {