From f2d75c91c12214d064519d469d081ed04967b29c Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 11 Jun 2025 20:53:02 +0200 Subject: [PATCH] [libusb-win32] Update to 1.4.0.0, cleanup (#45912) --- ports/libusb-win32/CMakeLists.txt | 8 +++++--- ports/libusb-win32/portfile.cmake | 21 +++++++++------------ ports/libusb-win32/vcpkg.json | 11 +++-------- scripts/ci.baseline.txt | 2 -- scripts/ci.feature.baseline.txt | 4 ---- versions/baseline.json | 4 ++-- versions/l-/libusb-win32.json | 5 +++++ 7 files changed, 24 insertions(+), 31 deletions(-) diff --git a/ports/libusb-win32/CMakeLists.txt b/ports/libusb-win32/CMakeLists.txt index 57004fac62..90e28703d3 100644 --- a/ports/libusb-win32/CMakeLists.txt +++ b/ports/libusb-win32/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) project(libusb-win32) set(lib_headers src/lusb0_usb.h) @@ -9,12 +9,14 @@ set(lib_srcs src/descriptors.c src/registry.c src/usb.c src/windows.c + src/resource.rc libusb0.def) add_library(libusb0 ${lib_srcs}) target_include_directories(libusb0 PRIVATE "src/driver") -target_link_libraries(libusb0 Setupapi) -target_compile_definitions(libusb0 PRIVATE "-D_CRT_SECURE_NO_WARNINGS") +target_link_libraries(libusb0 setupapi) +target_compile_definitions(libusb0 PRIVATE LOG_APPNAME="libusb-dll") +set_target_properties(libusb0 PROPERTIES PREFIX "" IMPORT_PREFIX "") install( TARGETS libusb0 diff --git a/ports/libusb-win32/portfile.cmake b/ports/libusb-win32/portfile.cmake index ad40a511dc..ef490bce44 100644 --- a/ports/libusb-win32/portfile.cmake +++ b/ports/libusb-win32/portfile.cmake @@ -1,21 +1,18 @@ -vcpkg_minimum_required(VERSION 2022-10-12) +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) -vcpkg_from_sourceforge( +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO libusb-win32/libusb-win32-releases - REF ${VERSION} - FILENAME "libusb-win32-src-${VERSION}.zip" - SHA512 972438b7465a22882bc91a1238291240ee3cdb09f374454a027d003b150656d4c262553104f74418bb49b4a7ca2f1a4f72d20e689fa3a7728881bafc876267f4 + REPO mcuee/libusb-win32 + REF "release_${VERSION}" + SHA512 a3dd4f65e21c26892a21342b990f40a9628759a58e76f8c65131633f279ff80a09b282eb247f282af2310f8a46d545e35b435992983ef8f3eada623ff0747e76 + HEAD_REF master ) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}/libusb") -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") - -vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") - +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}/libusb") vcpkg_cmake_install() - vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING_LGPL.txt") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/libusb/COPYING_LGPL.txt") diff --git a/ports/libusb-win32/vcpkg.json b/ports/libusb-win32/vcpkg.json index 5dc4288684..661c1bdd8b 100644 --- a/ports/libusb-win32/vcpkg.json +++ b/ports/libusb-win32/vcpkg.json @@ -1,19 +1,14 @@ { "name": "libusb-win32", - "version": "1.2.6.0", - "port-version": 10, + "version": "1.4.0.0", "description": "Allows user space applications to access many USB device on Windows.", - "homepage": "https://sourceforge.net/projects/libusb-win32", + "homepage": "https://github.com/mcuee/libusb-win32", "license": "LGPL-3.0-only", - "supports": "windows & !static & !xbox", + "supports": "windows & !uwp & !xbox & !(static & staticcrt)", "dependencies": [ { "name": "vcpkg-cmake", "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true } ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 6001f1cf97..af35a19a61 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -573,8 +573,6 @@ libtcod:x64-android=fail libtomcrypt:arm64-uwp=fail libtomcrypt:arm64-windows-static-md=fail libtomcrypt:arm64-windows=fail -libusb-win32:arm64-uwp=fail -libusb-win32:x64-uwp=fail # upstream issue https://github.com/microsoft/vcpkg/pull/13765#issuecomment-699710253 libvmdk:arm-neon-android=skip libvmdk:arm64-android=skip diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 5083cc717e..78348fadef 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -248,10 +248,6 @@ libtins:arm-uwp=fail libtins:x64-uwp=fail libtomcrypt:arm-uwp=fail libtomcrypt:arm64-windows=fail -libusb-win32:arm-uwp=fail -libusb-win32:x64-linux=fail -libusb-win32:x64-osx=fail -libusb-win32:x64-uwp=fail libusbmuxd:arm-uwp=fail libusbmuxd:x64-osx=fail libusbmuxd:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index f6736cc59e..0f3256bae7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5481,8 +5481,8 @@ "port-version": 1 }, "libusb-win32": { - "baseline": "1.2.6.0", - "port-version": 10 + "baseline": "1.4.0.0", + "port-version": 0 }, "libusbmuxd": { "baseline": "2023-06-21", diff --git a/versions/l-/libusb-win32.json b/versions/l-/libusb-win32.json index a1d4034cb0..dc30f57e13 100644 --- a/versions/l-/libusb-win32.json +++ b/versions/l-/libusb-win32.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "71dbfbb68810630b11b65fdb06deb8bcf42ffd7e", + "version": "1.4.0.0", + "port-version": 0 + }, { "git-tree": "af8b466e97e4d465147eb08289328d9cdf6f077d", "version": "1.2.6.0",