From b1fe832714851bd10340effa1f72e3f823550816 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 18 Jan 2022 22:37:28 +0100 Subject: [PATCH] [libdshowcapture] only windows (#22562) --- ports/libdshowcapture/portfile.cmake | 19 +++++++++---------- ports/libdshowcapture/vcpkg.json | 13 ++++++++++--- scripts/ci.baseline.txt | 4 ---- versions/baseline.json | 2 +- versions/l-/libdshowcapture.json | 5 +++++ 5 files changed, 25 insertions(+), 18 deletions(-) diff --git a/ports/libdshowcapture/portfile.cmake b/ports/libdshowcapture/portfile.cmake index 136be4d21a..79633e0f7f 100644 --- a/ports/libdshowcapture/portfile.cmake +++ b/ports/libdshowcapture/portfile.cmake @@ -6,21 +6,20 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_build_cmake(TARGET libdshowcapture) +vcpkg_cmake_build(TARGET libdshowcapture) # Copy files -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libdshowcapture RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libdshowcapture" RENAME copyright) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libdshowcapture.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libdshowcapture.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libdshowcapture.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libdshowcapture.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") endif() -file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libdshowcapture.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) -file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libdshowcapture.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -file(INSTALL ${SOURCE_PATH}/dshowcapture.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libdshowcapture.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") +file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libdshowcapture.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") +file(INSTALL "${SOURCE_PATH}/dshowcapture.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include") vcpkg_copy_pdbs() diff --git a/ports/libdshowcapture/vcpkg.json b/ports/libdshowcapture/vcpkg.json index ca807e319a..643b10dc84 100644 --- a/ports/libdshowcapture/vcpkg.json +++ b/ports/libdshowcapture/vcpkg.json @@ -1,6 +1,13 @@ { "name": "libdshowcapture", - "version-string": "0.6.0", - "port-version": 2, - "description": "Free and Open Source C++11 Library for capturing DirectShow video/audio devices on windows." + "version": "0.6.0", + "port-version": 3, + "description": "Free and Open Source C++11 Library for capturing DirectShow video/audio devices on windows.", + "supports": "windows & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index d8f9c6eeca..b102f846bb 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -536,10 +536,6 @@ cpuid:x64-uwp=fail cpuid:arm64-windows=fail libdatrie:x64-linux=fail libdatrie:x64-osx=fail -libdshowcapture:arm-uwp=fail -libdshowcapture:x64-linux=fail -libdshowcapture:x64-osx=fail -libdshowcapture:x64-uwp=fail libepoxy:arm-uwp=fail libepoxy:x64-uwp=fail libepoxy:x64-windows-static=fail diff --git a/versions/baseline.json b/versions/baseline.json index b94a5991fb..27b4aafe36 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3426,7 +3426,7 @@ }, "libdshowcapture": { "baseline": "0.6.0", - "port-version": 2 + "port-version": 3 }, "libe57": { "baseline": "1.1.312", diff --git a/versions/l-/libdshowcapture.json b/versions/l-/libdshowcapture.json index e735341750..7cb7815ef0 100644 --- a/versions/l-/libdshowcapture.json +++ b/versions/l-/libdshowcapture.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fc1b7753ef4b7e6fc6d6390bc86fe5186ca45a92", + "version": "0.6.0", + "port-version": 3 + }, { "git-tree": "3573e5e73ce2e61477815f452a5d2cd4a96ec0c7", "version-string": "0.6.0",