From 943d81c61d9e59d9922b5a4965ddbbb4ade1218f Mon Sep 17 00:00:00 2001 From: JoergAtGithub <64457745+JoergAtGithub@users.noreply.github.com> Date: Mon, 30 May 2022 07:48:01 +0200 Subject: [PATCH 01/10] Updated to latest release: https://github.com/libusb/hidapi/releases/tag/hidapi-0.12.0 --- ports/hidapi/portfile.cmake | 4 ++-- ports/hidapi/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/h-/hidapi.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/hidapi/portfile.cmake b/ports/hidapi/portfile.cmake index 57dfd339bf3e8f..aee97e5c1f534b 100644 --- a/ports/hidapi/portfile.cmake +++ b/ports/hidapi/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libusb/hidapi - REF hidapi-0.11.2 - SHA512 c4d04bf570aa98dd88d7ce08ef1abb0675d500c9aa2c22f0437fa30b700a94446779f77e1170267926d5f6f0d9cdb2bb81ad1fe20d158c18587fddbca59e9517 + REF hidapi-0.12.0 + SHA512 8006591b6ce4924aebf2fdf8c46065ceaccad830 HEAD_REF master ) diff --git a/ports/hidapi/vcpkg.json b/ports/hidapi/vcpkg.json index 673384492db5fa..4d60e3dc4a1489 100644 --- a/ports/hidapi/vcpkg.json +++ b/ports/hidapi/vcpkg.json @@ -1,7 +1,6 @@ { "name": "hidapi", - "version-semver": "0.11.2", - "port-version": 1, + "version-semver": "0.12.0", "description": "A Simple library for communicating with USB and Bluetooth HID devices on Linux, Mac and Windows.", "homepage": "https://github.com/libusb/hidapi", "license": "BSD-3-Clause-Clear", diff --git a/versions/baseline.json b/versions/baseline.json index 82baf583d7fb74..172e56b0de51f2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2773,8 +2773,8 @@ "port-version": 0 }, "hidapi": { - "baseline": "0.11.2", - "port-version": 1 + "baseline": "0.12.0", + "port-version": 0 }, "highfive": { "baseline": "2.3", diff --git a/versions/h-/hidapi.json b/versions/h-/hidapi.json index 51df67bed981c3..cd0095bdfce720 100644 --- a/versions/h-/hidapi.json +++ b/versions/h-/hidapi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "14038e8a0a4a688aaf75ce4fa6adaed1f22dd611", + "version-semver": "0.12.0", + "port-version": 0 + }, { "git-tree": "145fcc6e2c3aa564666793d494a6b90c1323e0ac", "version-semver": "0.11.2", From 9dbf23a0e745e82d6252c7b3a92f7eaff9e283c7 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Mon, 30 May 2022 19:53:17 +0200 Subject: [PATCH 02/10] Update SHA --- ports/hidapi/portfile.cmake | 2 +- versions/h-/hidapi.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/hidapi/portfile.cmake b/ports/hidapi/portfile.cmake index aee97e5c1f534b..cd060704171f4d 100644 --- a/ports/hidapi/portfile.cmake +++ b/ports/hidapi/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libusb/hidapi REF hidapi-0.12.0 - SHA512 8006591b6ce4924aebf2fdf8c46065ceaccad830 + SHA512 0c4bc45706d99498950491091ba8a5e8ccdd3964 HEAD_REF master ) diff --git a/versions/h-/hidapi.json b/versions/h-/hidapi.json index cd0095bdfce720..a23b88143e4df9 100644 --- a/versions/h-/hidapi.json +++ b/versions/h-/hidapi.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "14038e8a0a4a688aaf75ce4fa6adaed1f22dd611", + "git-tree": "0c4bc45706d99498950491091ba8a5e8ccdd3964", "version-semver": "0.12.0", "port-version": 0 }, From 41ca4259ae86f7582df4e1183bec0f3975bdeb5a Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Mon, 30 May 2022 20:00:13 +0200 Subject: [PATCH 03/10] SHA = 0 --- ports/hidapi/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/hidapi/portfile.cmake b/ports/hidapi/portfile.cmake index cd060704171f4d..4a670a4ccdcf1e 100644 --- a/ports/hidapi/portfile.cmake +++ b/ports/hidapi/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libusb/hidapi REF hidapi-0.12.0 - SHA512 0c4bc45706d99498950491091ba8a5e8ccdd3964 + SHA512 0 HEAD_REF master ) From 9be4cfce850149d8f91e3ee68c7e2a6888c50368 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Mon, 30 May 2022 20:13:04 +0200 Subject: [PATCH 04/10] Overwrite version --- versions/h-/hidapi.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/h-/hidapi.json b/versions/h-/hidapi.json index a23b88143e4df9..e0df271f46e288 100644 --- a/versions/h-/hidapi.json +++ b/versions/h-/hidapi.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "0c4bc45706d99498950491091ba8a5e8ccdd3964", + "git-tree": "8006591b6ce4924aebf2fdf8c46065ceaccad830", "version-semver": "0.12.0", "port-version": 0 }, From 0c33df3114df9354cfa16aa1acd1a244d4d68b3c Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Mon, 30 May 2022 20:22:58 +0200 Subject: [PATCH 05/10] SHA512 --- ports/hidapi/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/hidapi/portfile.cmake b/ports/hidapi/portfile.cmake index 4a670a4ccdcf1e..05c8d682b6bb9f 100644 --- a/ports/hidapi/portfile.cmake +++ b/ports/hidapi/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libusb/hidapi REF hidapi-0.12.0 - SHA512 0 + SHA512 866268927698db6fa553e000ead3c0c4b8df67ea768d36acac9c71f06f0bd8283778e90eee03f81aaa930f38dbb5719391906c7d2742b74479ffa436104f5fa4 HEAD_REF master ) From cd4ef3241788ca198621b061da17e55d3ffef905 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Mon, 30 May 2022 20:25:15 +0200 Subject: [PATCH 06/10] version --- versions/h-/hidapi.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/h-/hidapi.json b/versions/h-/hidapi.json index e0df271f46e288..d5639269c8d68a 100644 --- a/versions/h-/hidapi.json +++ b/versions/h-/hidapi.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "8006591b6ce4924aebf2fdf8c46065ceaccad830", + "git-tree": "3bb72bc98d3527c69ef2a7aea83bd1d98ae44bb9", "version-semver": "0.12.0", "port-version": 0 }, From 540fa1cea68da5d751e67c2bef06c7269c18fab1 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Mon, 30 May 2022 20:33:36 +0200 Subject: [PATCH 07/10] Removed failing line introduced in #22320 --- ports/hidapi/portfile.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/ports/hidapi/portfile.cmake b/ports/hidapi/portfile.cmake index 05c8d682b6bb9f..4631fa1fd282b0 100644 --- a/ports/hidapi/portfile.cmake +++ b/ports/hidapi/portfile.cmake @@ -16,8 +16,6 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/hidapi/hidapi.cmake" "\"/hidapi\"" "\"\${_IMPORT_PREFIX}/include\"") - file(INSTALL "${SOURCE_PATH}/LICENSE-bsd.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") From 9cbb14528293bb2eda619285819e2c195d8c9b42 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Mon, 30 May 2022 20:44:33 +0200 Subject: [PATCH 08/10] version --- versions/h-/hidapi.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/h-/hidapi.json b/versions/h-/hidapi.json index d5639269c8d68a..ca4e4b99c04aa9 100644 --- a/versions/h-/hidapi.json +++ b/versions/h-/hidapi.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "3bb72bc98d3527c69ef2a7aea83bd1d98ae44bb9", + "git-tree": "a95202186af8b0dd8cacf0fc234037cc04eba2d7", "version-semver": "0.12.0", "port-version": 0 }, From 237611eb100b5da2fbb0a8bbc17a373c85c202a5 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Wed, 1 Jun 2022 18:37:01 +0200 Subject: [PATCH 09/10] Added vcpkg_replace_string again, now for libhidapi.cmake instead of hidapi.cmake --- ports/hidapi/portfile.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/hidapi/portfile.cmake b/ports/hidapi/portfile.cmake index 4631fa1fd282b0..b83a4d4167843d 100644 --- a/ports/hidapi/portfile.cmake +++ b/ports/hidapi/portfile.cmake @@ -16,6 +16,8 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/hidapi/libhidapi.cmake" "\"/hidapi\"" "\"\${_IMPORT_PREFIX}/include\"") + file(INSTALL "${SOURCE_PATH}/LICENSE-bsd.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") From 84d6e7b0abffe1b58a1762cedf6ac4eb0ccf0fb3 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Wed, 1 Jun 2022 18:38:38 +0200 Subject: [PATCH 10/10] x-add-version --- versions/h-/hidapi.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/h-/hidapi.json b/versions/h-/hidapi.json index ca4e4b99c04aa9..e1c4608a3a9b4d 100644 --- a/versions/h-/hidapi.json +++ b/versions/h-/hidapi.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "a95202186af8b0dd8cacf0fc234037cc04eba2d7", + "git-tree": "803a911247de97c28264c5dee2102b368137562d", "version-semver": "0.12.0", "port-version": 0 },