From 6c3172a8dcd9bd57e3b0c4acbeb13444e4b030d2 Mon Sep 17 00:00:00 2001 From: Allan Hanan Date: Wed, 29 Jul 2026 01:36:07 +0530 Subject: [PATCH] [duvc-ctl] Update to 2.1.0 (#53056) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: c7b186e3-fc86-45e8-a903-bb87dfd375f5 --- .../duvc-ctl/fix-pkgconfig-library-name.patch | 11 +++ ports/duvc-ctl/portfile.cmake | 92 ++++++++++--------- ports/duvc-ctl/usage | 8 +- ports/duvc-ctl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/duvc-ctl.json | 5 + 6 files changed, 69 insertions(+), 51 deletions(-) create mode 100644 ports/duvc-ctl/fix-pkgconfig-library-name.patch diff --git a/ports/duvc-ctl/fix-pkgconfig-library-name.patch b/ports/duvc-ctl/fix-pkgconfig-library-name.patch new file mode 100644 index 0000000000..2a8fb2ab02 --- /dev/null +++ b/ports/duvc-ctl/fix-pkgconfig-library-name.patch @@ -0,0 +1,11 @@ +diff --git a/cmake/duvc.pc.in b/cmake/duvc.pc.in +index 9470fd2..1a6dd42 100644 +--- a/cmake/duvc.pc.in ++++ b/cmake/duvc.pc.in +@@ -7,5 +7,5 @@ Description: @PROJECT_DESCRIPTION@ + Version: @PROJECT_VERSION@ + URL: @PROJECT_HOMEPAGE_URL@ + +-Libs: -L${libdir} -lduvc ++Libs: -L${libdir} -lduvc-core -lole32 -loleaut32 -lstrmiids -lpsapi -ladvapi32 + Cflags: -I${includedir} diff --git a/ports/duvc-ctl/portfile.cmake b/ports/duvc-ctl/portfile.cmake index 8ffe00d5ec..c3c3773951 100644 --- a/ports/duvc-ctl/portfile.cmake +++ b/ports/duvc-ctl/portfile.cmake @@ -1,45 +1,47 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO allanhanan/duvc-ctl - REF "v${VERSION}" - SHA512 5cc63ef7c3a46fb351015ae2b1b96837ea46dbb7656ab1cf633af6027d32ae447dfc60a8757677eae07dabfb3ec1aca90f7019a6d7b5344c66324d39e9f0c464 - HEAD_REF main -) - -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" DUVC_BUILD_STATIC) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" DUVC_BUILD_SHARED) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DDUVC_BUILD_SHARED=${DUVC_BUILD_SHARED} - -DDUVC_BUILD_STATIC=${DUVC_BUILD_STATIC} - -DDUVC_BUILD_C_API=OFF - -DDUVC_BUILD_CLI=OFF - -DDUVC_BUILD_TESTS=OFF - -DDUVC_BUILD_EXAMPLES=OFF - -DDUVC_BUILD_PYTHON=OFF - -DDUVC_BUILD_DOCS=OFF - -DDUVC_INSTALL=ON - -DDUVC_INSTALL_CMAKE_CONFIG=ON -) - -vcpkg_cmake_install() - -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/duvc-ctl") -vcpkg_fixup_pkgconfig() - - -vcpkg_copy_pdbs() - -if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/include") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -endif() -if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/share") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -endif() - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") - -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO allanhanan/duvc-ctl + REF "v${VERSION}" + SHA512 50db1153e15fe15dcb0c26cd9dfdb945f74e60661ee4598ce1b3d048d2e4d5f51820e1fbd16cc384201085593f13e335ace191362daa52f125e89c530c28f653 + HEAD_REF main + PATCHES + fix-pkgconfig-library-name.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" DUVC_BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" DUVC_BUILD_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DDUVC_BUILD_SHARED=${DUVC_BUILD_SHARED} + -DDUVC_BUILD_STATIC=${DUVC_BUILD_STATIC} + -DDUVC_BUILD_C_API=OFF + -DDUVC_BUILD_CLI=OFF + -DDUVC_BUILD_TESTS=OFF + -DDUVC_BUILD_EXAMPLES=OFF + -DDUVC_BUILD_PYTHON=OFF + -DDUVC_BUILD_DOCS=OFF + -DDUVC_INSTALL=ON + -DDUVC_INSTALL_CMAKE_CONFIG=ON +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/duvc-ctl") +vcpkg_fixup_pkgconfig() + + +vcpkg_copy_pdbs() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/include") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/share") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +endif() + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/duvc-ctl/usage b/ports/duvc-ctl/usage index 1245fcd2b9..268ea6cc39 100644 --- a/ports/duvc-ctl/usage +++ b/ports/duvc-ctl/usage @@ -1,4 +1,4 @@ -duvc-ctl provides CMake targets: - - find_package(duvc CONFIG REQUIRED) - target_link_libraries(main PRIVATE $,duvc::core-static,duvc::core-shared>) +duvc-ctl provides CMake targets: + + find_package(duvc CONFIG REQUIRED) + target_link_libraries(main PRIVATE $,duvc::core-static,duvc::core-shared>) diff --git a/ports/duvc-ctl/vcpkg.json b/ports/duvc-ctl/vcpkg.json index bd056b139f..48ab2333bc 100644 --- a/ports/duvc-ctl/vcpkg.json +++ b/ports/duvc-ctl/vcpkg.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "duvc-ctl", - "version": "2.0.1", + "version": "2.1.0", "description": "Windows DirectShow UVC camera control library", "homepage": "https://github.com/allanhanan/duvc-ctl", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 73daf57843..73db96f81b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2681,7 +2681,7 @@ "port-version": 0 }, "duvc-ctl": { - "baseline": "2.0.1", + "baseline": "2.1.0", "port-version": 0 }, "dv-processing": { diff --git a/versions/d-/duvc-ctl.json b/versions/d-/duvc-ctl.json index 32fc97de9e..27cadc7219 100644 --- a/versions/d-/duvc-ctl.json +++ b/versions/d-/duvc-ctl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a639557ee5018c442d22aba4f551d5eb6abcedd9", + "version": "2.1.0", + "port-version": 0 + }, { "git-tree": "1c50cac55382709d8b9a5b22250fd6f37d9566e8", "version": "2.0.1",