From 72db953c8d39374fdc8b3f9237790aae30dce01d Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 15 Jun 2021 17:42:33 -0400 Subject: [PATCH 01/15] added libsmb2 port --- ports/libsmb2/portfile.cmake | 25 +++++++++++++++++++++++++ ports/libsmb2/vcpkg.json | 10 ++++++++++ 2 files changed, 35 insertions(+) create mode 100644 ports/libsmb2/portfile.cmake create mode 100644 ports/libsmb2/vcpkg.json diff --git a/ports/libsmb2/portfile.cmake b/ports/libsmb2/portfile.cmake new file mode 100644 index 00000000000000..bfd0029f5e5411 --- /dev/null +++ b/ports/libsmb2/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sahlberg/libsmb2 + REF d8c85a3119a0bd769590e448216130b368cd1099 + SHA512 d15a040ed6314ad6f7984cfa7b52d9ede9934b2a7ec9827e833f574c25c9f694b5372b3e0950e258a6244b7aaf32b9e59987a75a88681d8031d9837ba94629d5 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON +) +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +#the debug/share folder is generated empty by the provided cmake system +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/libsmb2/vcpkg.json b/ports/libsmb2/vcpkg.json new file mode 100644 index 00000000000000..3b3cc33b3d7cc5 --- /dev/null +++ b/ports/libsmb2/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "libsmb2", + "version-string": "2021-4-29", + "port-version": 0, + "description": "SMB2/3 Userspace Client", + "homepage": "https://github.com/sahlberg/libsmb2", + "dependencies": [ + "openssl", "vcpkg-cmake-config" + ] +} From be58a347428a52fa84f3c320227cf7e2dc0a1d8f Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 15 Jun 2021 17:45:17 -0400 Subject: [PATCH 02/15] added version file --- versions/l-/libsmb2.json | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 versions/l-/libsmb2.json diff --git a/versions/l-/libsmb2.json b/versions/l-/libsmb2.json new file mode 100644 index 00000000000000..bd072eb6dab961 --- /dev/null +++ b/versions/l-/libsmb2.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "6c4a62554446fd2e0bb41dfcd28d7da4b956c3fc", + "version-string": "2021-4-29", + "port-version": 0 + } + ] +} From c220992118cd582f054d1b8c557ae68628572a3a Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 15 Jun 2021 17:46:55 -0400 Subject: [PATCH 03/15] updated baseline --- versions/baseline.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/versions/baseline.json b/versions/baseline.json index 4ff7df52a65dd7..a75dda82fae538 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3535,6 +3535,10 @@ "libsigcpp-3": { "baseline": "3.0.3", "port-version": 1 + }, + "libsmb2": { + "baseline": "2021-4-29", + "port-version": 0 }, "libsndfile": { "baseline": "1.0.31", From cdb84704f9b028b20172fa9e18cc6f7735b126a1 Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 15 Jun 2021 18:02:19 -0400 Subject: [PATCH 04/15] Ran command ./vcpkg x-add-version --all and then ./vcpkg format-manifest ports/libsmb2/vcpkg.json --- ports/libsmb2/vcpkg.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/libsmb2/vcpkg.json b/ports/libsmb2/vcpkg.json index 3b3cc33b3d7cc5..171ab935641c80 100644 --- a/ports/libsmb2/vcpkg.json +++ b/ports/libsmb2/vcpkg.json @@ -1,10 +1,10 @@ { "name": "libsmb2", "version-string": "2021-4-29", - "port-version": 0, "description": "SMB2/3 Userspace Client", "homepage": "https://github.com/sahlberg/libsmb2", "dependencies": [ - "openssl", "vcpkg-cmake-config" + "openssl", + "vcpkg-cmake-config" ] } From 8061cb07002468a3f1eb6ea44f472a338ace4325 Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 15 Jun 2021 18:23:23 -0400 Subject: [PATCH 05/15] updated SHA based on result of "./vcpkg x-add-version libsmb2" and also added osx=fail to CI file in order to pass CI --- scripts/ci.baseline.txt | 1 + versions/l-/libsmb2.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 0e9115309a4272..9063f699360132 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -751,6 +751,7 @@ libressl:x64-windows-static = skip libressl:x64-windows-static-md=skip libressl:x86-windows = skip libsamplerate:x64-osx=fail +libsmb2:x64-osx=fail libsoundio:arm64-windows=fail libsoundio:arm-uwp=fail libsoundio:x64-uwp=fail diff --git a/versions/l-/libsmb2.json b/versions/l-/libsmb2.json index bd072eb6dab961..314e7397fb5547 100644 --- a/versions/l-/libsmb2.json +++ b/versions/l-/libsmb2.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "6c4a62554446fd2e0bb41dfcd28d7da4b956c3fc", + "git-tree": "0ba00729230d8f35629588109af3757277c06aab", "version-string": "2021-4-29", "port-version": 0 } From d149bdd6e5a7f8c447704645c512b63953efb6d9 Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 16 Jun 2021 13:33:00 -0400 Subject: [PATCH 06/15] suggested changes made --- ports/libsmb2/portfile.cmake | 2 ++ ports/libsmb2/vcpkg.json | 3 ++- versions/baseline.json | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ports/libsmb2/portfile.cmake b/ports/libsmb2/portfile.cmake index bfd0029f5e5411..9a16b987497508 100644 --- a/ports/libsmb2/portfile.cmake +++ b/ports/libsmb2/portfile.cmake @@ -1,3 +1,5 @@ +vcpkg_fail_port_install(ON_TARGET "osx") + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sahlberg/libsmb2 diff --git a/ports/libsmb2/vcpkg.json b/ports/libsmb2/vcpkg.json index 171ab935641c80..0d1a87e41de2dc 100644 --- a/ports/libsmb2/vcpkg.json +++ b/ports/libsmb2/vcpkg.json @@ -1,8 +1,9 @@ { "name": "libsmb2", - "version-string": "2021-4-29", + "version-date": "2021-04-29", "description": "SMB2/3 Userspace Client", "homepage": "https://github.com/sahlberg/libsmb2", + "supports": "!osx", "dependencies": [ "openssl", "vcpkg-cmake-config" diff --git a/versions/baseline.json b/versions/baseline.json index a75dda82fae538..0b9e2ca6a8ad69 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3537,7 +3537,7 @@ "port-version": 1 }, "libsmb2": { - "baseline": "2021-4-29", + "baseline": "2021-04-29", "port-version": 0 }, "libsndfile": { From 5fe079537350383757aa072c4bd366f740697101 Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 16 Jun 2021 13:34:18 -0400 Subject: [PATCH 07/15] sha --- versions/l-/libsmb2.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/l-/libsmb2.json b/versions/l-/libsmb2.json index 314e7397fb5547..9935b210e9bbc2 100644 --- a/versions/l-/libsmb2.json +++ b/versions/l-/libsmb2.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "0ba00729230d8f35629588109af3757277c06aab", - "version-string": "2021-4-29", + "git-tree": "b1db48e566f9268231e3371cb2e2cebf42a6c246", + "version-date": "2021-04-29", "port-version": 0 } ] From d3ff337fd26ff7767a658146a9d3294c959534fb Mon Sep 17 00:00:00 2001 From: timmeh87 <31858838+timmeh87@users.noreply.github.com> Date: Mon, 21 Jun 2021 23:08:43 -0400 Subject: [PATCH 08/15] Update scripts/ci.baseline.txt Co-authored-by: Robert Schumacher --- scripts/ci.baseline.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 9063f699360132..0e9115309a4272 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -751,7 +751,6 @@ libressl:x64-windows-static = skip libressl:x64-windows-static-md=skip libressl:x86-windows = skip libsamplerate:x64-osx=fail -libsmb2:x64-osx=fail libsoundio:arm64-windows=fail libsoundio:arm-uwp=fail libsoundio:x64-uwp=fail From 0f14f5aa19e23c38f2def3f6c574b1a704180bf0 Mon Sep 17 00:00:00 2001 From: timmeh87 <31858838+timmeh87@users.noreply.github.com> Date: Mon, 21 Jun 2021 23:08:59 -0400 Subject: [PATCH 09/15] Update ports/libsmb2/vcpkg.json Co-authored-by: Robert Schumacher --- ports/libsmb2/vcpkg.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ports/libsmb2/vcpkg.json b/ports/libsmb2/vcpkg.json index 0d1a87e41de2dc..4b5b2b9a984f1f 100644 --- a/ports/libsmb2/vcpkg.json +++ b/ports/libsmb2/vcpkg.json @@ -6,6 +6,9 @@ "supports": "!osx", "dependencies": [ "openssl", - "vcpkg-cmake-config" + { + "name": "vcpkg-cmake-config", + "host": true + } ] } From ac87e24a5532bdaf861ceff040a54c46ee539658 Mon Sep 17 00:00:00 2001 From: timmeh87 <31858838+timmeh87@users.noreply.github.com> Date: Mon, 21 Jun 2021 23:09:07 -0400 Subject: [PATCH 10/15] Update ports/libsmb2/portfile.cmake Co-authored-by: Robert Schumacher --- ports/libsmb2/portfile.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/ports/libsmb2/portfile.cmake b/ports/libsmb2/portfile.cmake index 9a16b987497508..98d374f04e7bbd 100644 --- a/ports/libsmb2/portfile.cmake +++ b/ports/libsmb2/portfile.cmake @@ -11,8 +11,6 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS - -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON ) vcpkg_install_cmake() vcpkg_copy_pdbs() From 05aa73480e0a7eefd90c135111676616cc4b7570 Mon Sep 17 00:00:00 2001 From: Tim Date: Mon, 21 Jun 2021 23:13:43 -0400 Subject: [PATCH 11/15] sha --- versions/l-/libsmb2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libsmb2.json b/versions/l-/libsmb2.json index 9935b210e9bbc2..a153367bb195a4 100644 --- a/versions/l-/libsmb2.json +++ b/versions/l-/libsmb2.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b1db48e566f9268231e3371cb2e2cebf42a6c246", + "git-tree": "1fe6852c198ac86860b7d05966253cf175d0b2ae", "version-date": "2021-04-29", "port-version": 0 } From 99ee7da81bfabf449ac786aee5a7be8eadcff658 Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 22 Jun 2021 20:03:18 -0400 Subject: [PATCH 12/15] added missing "vcpkg_check_linkage(ONLY_STATIC_LIBRARY)" --- ports/libsmb2/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/libsmb2/portfile.cmake b/ports/libsmb2/portfile.cmake index 98d374f04e7bbd..6be3df577a2dc6 100644 --- a/ports/libsmb2/portfile.cmake +++ b/ports/libsmb2/portfile.cmake @@ -1,4 +1,5 @@ vcpkg_fail_port_install(ON_TARGET "osx") +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH From f16442d3712bd7a6aaa6d6b7843da4a154194b64 Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 22 Jun 2021 20:04:10 -0400 Subject: [PATCH 13/15] sha --- versions/l-/libsmb2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libsmb2.json b/versions/l-/libsmb2.json index a153367bb195a4..b8ba378e525142 100644 --- a/versions/l-/libsmb2.json +++ b/versions/l-/libsmb2.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "1fe6852c198ac86860b7d05966253cf175d0b2ae", + "git-tree": "3cccad6f72fb42663de862d3a8b9b51fe572d86b", "version-date": "2021-04-29", "port-version": 0 } From 488ef9ed3a66100f88ae96b74d849d7751fa1480 Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 22 Jun 2021 23:19:04 -0400 Subject: [PATCH 14/15] vcpkg_fixup_pkgconfig() --- ports/libsmb2/portfile.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/libsmb2/portfile.cmake b/ports/libsmb2/portfile.cmake index 6be3df577a2dc6..4558f3e0143523 100644 --- a/ports/libsmb2/portfile.cmake +++ b/ports/libsmb2/portfile.cmake @@ -13,10 +13,11 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA ) + vcpkg_install_cmake() vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) - +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") From f90ece6774fa95222ebb3cb9e6d322c5ae40bb31 Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 22 Jun 2021 23:19:31 -0400 Subject: [PATCH 15/15] sha --- versions/l-/libsmb2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libsmb2.json b/versions/l-/libsmb2.json index b8ba378e525142..3e27f55b66a2ee 100644 --- a/versions/l-/libsmb2.json +++ b/versions/l-/libsmb2.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "3cccad6f72fb42663de862d3a8b9b51fe572d86b", + "git-tree": "033110ed64eb6d73a85ab8439c13b84b5ee02891", "version-date": "2021-04-29", "port-version": 0 }