From 4d8c570fa70fd6fcde381325fbd06bf49f56a80f Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 27 Jul 2023 18:39:36 +0200 Subject: [PATCH] [libusb] Fix pc file for windows --- ports/libusb/portfile.cmake | 4 +++- ports/libusb/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libusb.json | 5 +++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ports/libusb/portfile.cmake b/ports/libusb/portfile.cmake index b30ac4ca9a4d2a..c31c37514b04bb 100644 --- a/ports/libusb/portfile.cmake +++ b/ports/libusb/portfile.cmake @@ -12,7 +12,7 @@ vcpkg_from_github( ) function(replace_runtime_library PROJ_FILE) - if (VCPKG_CRT_LINKAGE STREQUAL static) + if(VCPKG_CRT_LINKAGE STREQUAL "static") file(READ "${PROJ_FILE}" PROJ_CONTENT) string(REPLACE "MultiThreadedDLL" "MultiThreaded" PROJ_CONTENT "${PROJ_CONTENT}") string(REPLACE "MultiThreadedDebugDLL" "MultiThreadedDebug" PROJ_CONTENT "${PROJ_CONTENT}") @@ -50,9 +50,11 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) set(libdir [[${prefix}/lib]]) set(includedir [[${prefix}/include]]) configure_file("${SOURCE_PATH}/libusb-1.0.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libusb-1.0.pc" @ONLY) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libusb-1.0.pc" " -lusb-1.0" " -llibusb-1.0") if(NOT VCPKG_BUILD_TYPE) set(includedir [[${prefix}/../include]]) configure_file("${SOURCE_PATH}/libusb-1.0.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libusb-1.0.pc" @ONLY) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libusb-1.0.pc" " -lusb-1.0" " -llibusb-1.0") endif() else() vcpkg_configure_make( diff --git a/ports/libusb/vcpkg.json b/ports/libusb/vcpkg.json index 3ae430c3aad6a9..05e41dad17ce33 100644 --- a/ports/libusb/vcpkg.json +++ b/ports/libusb/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libusb", "version": "1.0.26.11791", + "port-version": 1, "description": "a cross-platform library to access USB devices", "homepage": "https://github.com/libusb/libusb", "license": "LGPL-2.1-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index e7dcbbba957303..0a44b9a1d86419 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4726,7 +4726,7 @@ }, "libusb": { "baseline": "1.0.26.11791", - "port-version": 0 + "port-version": 1 }, "libusb-win32": { "baseline": "1.2.6.0", diff --git a/versions/l-/libusb.json b/versions/l-/libusb.json index 933342616ca3b4..881187a43ceb8a 100644 --- a/versions/l-/libusb.json +++ b/versions/l-/libusb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "653d47743e90abaa28a3d17b49fe479a0096f8ef", + "version": "1.0.26.11791", + "port-version": 1 + }, { "git-tree": "230bacd99c77786d65d0cfe9ba51ec472521c382", "version": "1.0.26.11791",