From 9dd2b9d4f31fc1f3bfa3ee673a13b81e46291b24 Mon Sep 17 00:00:00 2001 From: Carl Date: Tue, 2 Mar 2021 18:57:26 +0100 Subject: [PATCH 1/4] Don't copy svm-toy if not on Windows svm-toy is only compiled on Windows, so should only be copied on Windows. --- ports/libsvm/portfile.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ports/libsvm/portfile.cmake b/ports/libsvm/portfile.cmake index fe15e57bf3c399..a89b838e1ed021 100644 --- a/ports/libsvm/portfile.cmake +++ b/ports/libsvm/portfile.cmake @@ -29,7 +29,11 @@ vcpkg_copy_pdbs() vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT}) if ("tools" IN_LIST FEATURES) - vcpkg_copy_tools(TOOL_NAMES svm-predict svm-scale svm-toy svm-train AUTO_CLEAN) + if (WIN32) + vcpkg_copy_tools(TOOL_NAMES svm-predict svm-scale svm-toy svm-train AUTO_CLEAN) + else () + vcpkg_copy_tools(TOOL_NAMES svm-predict svm-scale svm-train AUTO_CLEAN) + endif () endif () file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) From 53ba3f738acd4938428d3d48ff7aaa82c6d30617 Mon Sep 17 00:00:00 2001 From: Carl Date: Wed, 3 Mar 2021 09:59:54 +0100 Subject: [PATCH 2/4] Bump port version on libsvm. Switch to new manifest file format. --- ports/libsvm/CONTROL | 7 ------- ports/libsvm/vcpkg.json | 13 +++++++++++++ versions/baseline.json | 2 +- versions/l-/libsvm.json | 5 +++++ 4 files changed, 19 insertions(+), 8 deletions(-) delete mode 100644 ports/libsvm/CONTROL create mode 100644 ports/libsvm/vcpkg.json diff --git a/ports/libsvm/CONTROL b/ports/libsvm/CONTROL deleted file mode 100644 index 4a9af6018f4673..00000000000000 --- a/ports/libsvm/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: libsvm -Version: 323-1 -Description: A library for Support Vector Machines -Homepage: https://www.csie.ntu.edu.tw/~cjlin/libsvm/ - -Feature: tools -Description: Build libsvm tools diff --git a/ports/libsvm/vcpkg.json b/ports/libsvm/vcpkg.json new file mode 100644 index 00000000000000..1685323e8ac359 --- /dev/null +++ b/ports/libsvm/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "libsvm", + "version-string": "323-1", + "homepage": "https://www.csie.ntu.edu.tw/~cjlin/libsvm/", + "description": "A library for Support Vector Machines.", + "features": [ + { + "name": "tools", + "description": "build libsvm CLI tools." + } + ], + "port-version": 1 +} diff --git a/versions/baseline.json b/versions/baseline.json index a10c6d6a0ce36d..c09f17c2b7fd46 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3446,7 +3446,7 @@ }, "libsvm": { "baseline": "323-1", - "port-version": 0 + "port-version": 1 }, "libtheora": { "baseline": "1.2.0alpha1-20170719", diff --git a/versions/l-/libsvm.json b/versions/l-/libsvm.json index d3fe0a9f594045..91cdd75ea4a27b 100644 --- a/versions/l-/libsvm.json +++ b/versions/l-/libsvm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f1a2a08d154eb8240cb58c5a23c8a1452334563e", + "version-string": "323-1", + "port-version": 1 + }, { "git-tree": "81c8a12b8a8abcbfe0eefa7ea1643ea3118b49a2", "version-string": "323-1", From cc0fb61389e4530c6a55396ccd8bc2fdedd6c5ef Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Wed, 3 Mar 2021 22:18:51 -0800 Subject: [PATCH 3/4] [libsvm] Format manifest --- ports/libsvm/vcpkg.json | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/ports/libsvm/vcpkg.json b/ports/libsvm/vcpkg.json index 1685323e8ac359..fe2003e4d0d371 100644 --- a/ports/libsvm/vcpkg.json +++ b/ports/libsvm/vcpkg.json @@ -1,13 +1,12 @@ { - "name": "libsvm", - "version-string": "323-1", - "homepage": "https://www.csie.ntu.edu.tw/~cjlin/libsvm/", - "description": "A library for Support Vector Machines.", - "features": [ - { - "name": "tools", - "description": "build libsvm CLI tools." - } - ], - "port-version": 1 + "name": "libsvm", + "version-string": "323", + "port-version": 2, + "description": "A library for Support Vector Machines.", + "homepage": "https://www.csie.ntu.edu.tw/~cjlin/libsvm/", + "features": { + "tools": { + "description": "build libsvm CLI tools." + } + } } From 2358258191adf52c5b954725b0dad425dd29ce1f Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Wed, 3 Mar 2021 22:19:40 -0800 Subject: [PATCH 4/4] update version record --- versions/baseline.json | 4 ++-- versions/l-/libsvm.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index c09f17c2b7fd46..3491ddd7ac0d99 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3445,8 +3445,8 @@ "port-version": 0 }, "libsvm": { - "baseline": "323-1", - "port-version": 1 + "baseline": "323", + "port-version": 2 }, "libtheora": { "baseline": "1.2.0alpha1-20170719", diff --git a/versions/l-/libsvm.json b/versions/l-/libsvm.json index 91cdd75ea4a27b..8f919ee33bbd6f 100644 --- a/versions/l-/libsvm.json +++ b/versions/l-/libsvm.json @@ -1,9 +1,9 @@ { "versions": [ { - "git-tree": "f1a2a08d154eb8240cb58c5a23c8a1452334563e", - "version-string": "323-1", - "port-version": 1 + "git-tree": "14f75f50d38f27beddb27fb54bf0927942db9954", + "version-string": "323", + "port-version": 2 }, { "git-tree": "81c8a12b8a8abcbfe0eefa7ea1643ea3118b49a2",