From fe24f25ca038733471a5fcf8a0e6cac78b687735 Mon Sep 17 00:00:00 2001 From: Fidel Yin Date: Sun, 23 Mar 2025 02:32:15 -0400 Subject: [PATCH 1/4] [dxcam-cpp] Add new port --- ports/dxcam-cpp/portfile.cmake | 22 ++++++++++++++++++++++ ports/dxcam-cpp/usage | 5 +++++ ports/dxcam-cpp/vcpkg.json | 21 +++++++++++++++++++++ versions/baseline.json | 4 ++++ versions/d-/dxcam-cpp.json | 9 +++++++++ 5 files changed, 61 insertions(+) create mode 100644 ports/dxcam-cpp/portfile.cmake create mode 100644 ports/dxcam-cpp/usage create mode 100644 ports/dxcam-cpp/vcpkg.json create mode 100644 versions/d-/dxcam-cpp.json diff --git a/ports/dxcam-cpp/portfile.cmake b/ports/dxcam-cpp/portfile.cmake new file mode 100644 index 00000000000000..99dff47d582239 --- /dev/null +++ b/ports/dxcam-cpp/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Fidelxyz/DXCam-CPP + HEAD_REF main + REF "v${VERSION}" + SHA512 cd8463a687030da020ffaa8c8438c90185f4bf41f14b50e72ba3aea695828dd12c52e249d290ad0f0fdc1e1109a8a800d9ddf954e38037ff9da90d9ab5fa01cc +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + PACKAGE_NAME "dxcam-cpp" + CONFIG_PATH lib/cmake/dxcam +) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) \ No newline at end of file diff --git a/ports/dxcam-cpp/usage b/ports/dxcam-cpp/usage new file mode 100644 index 00000000000000..5a5a6234b5f7c5 --- /dev/null +++ b/ports/dxcam-cpp/usage @@ -0,0 +1,5 @@ +dxcam-cpp provides CMake targets: + +find_package(DXCam CONFIG REQUIRED) +target_include_directories(main PRIVATE ${DXCam_INCLUDE_DIRS}) +target_link_libraries(main PRIVATE ${DXCam_LIBS}) \ No newline at end of file diff --git a/ports/dxcam-cpp/vcpkg.json b/ports/dxcam-cpp/vcpkg.json new file mode 100644 index 00000000000000..ce3771f925ed54 --- /dev/null +++ b/ports/dxcam-cpp/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "dxcam-cpp", + "version": "0.2.1", + "maintainers": "Fidel Yin ", + "description": "A high performance screen capturing library for Windows rewriting DXcam in C++.", + "homepage": "https://github.com/Fidelxyz/DXCam-CPP", + "documentation": "https://dxcam-cpp.readthedocs.io/en/latest/", + "license": "MIT", + "supports": "windows", + "dependencies": [ + "opencv4", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index d66bbff51fcb1b..9909766ae552f8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2468,6 +2468,10 @@ "baseline": "1.0.1", "port-version": 3 }, + "dxcam-cpp": { + "baseline": "0.2.1", + "port-version": 0 + }, "dxsdk-d3dx": { "baseline": "9.29.952.8", "port-version": 7 diff --git a/versions/d-/dxcam-cpp.json b/versions/d-/dxcam-cpp.json new file mode 100644 index 00000000000000..89ec2c757173f9 --- /dev/null +++ b/versions/d-/dxcam-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "23528b5e6a8f5fef90de2960122e83c396924e2f", + "version": "0.2.1", + "port-version": 0 + } + ] +} From f4964e2990079a2f0547a0e7e132d84c6c68e9ee Mon Sep 17 00:00:00 2001 From: Fidel Yin Date: Sun, 23 Mar 2025 03:09:39 -0400 Subject: [PATCH 2/4] [dxcam-cpp] update supports field --- ports/dxcam-cpp/vcpkg.json | 2 +- versions/d-/dxcam-cpp.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/dxcam-cpp/vcpkg.json b/ports/dxcam-cpp/vcpkg.json index ce3771f925ed54..7b9884ba31aeca 100644 --- a/ports/dxcam-cpp/vcpkg.json +++ b/ports/dxcam-cpp/vcpkg.json @@ -6,7 +6,7 @@ "homepage": "https://github.com/Fidelxyz/DXCam-CPP", "documentation": "https://dxcam-cpp.readthedocs.io/en/latest/", "license": "MIT", - "supports": "windows", + "supports": "windows & !uwp", "dependencies": [ "opencv4", { diff --git a/versions/d-/dxcam-cpp.json b/versions/d-/dxcam-cpp.json index 89ec2c757173f9..2c77d623210520 100644 --- a/versions/d-/dxcam-cpp.json +++ b/versions/d-/dxcam-cpp.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "23528b5e6a8f5fef90de2960122e83c396924e2f", + "git-tree": "784b0f75952e17217c72bfa956544d8606bcf44f", "version": "0.2.1", "port-version": 0 } From 3b1e3b0a2d7b1f4fa1dff6472c4f9631eb024307 Mon Sep 17 00:00:00 2001 From: Fidel Yin Date: Sun, 23 Mar 2025 18:08:23 -0400 Subject: [PATCH 3/4] cleanup --- ports/dxcam-cpp/portfile.cmake | 13 ++++--------- ports/dxcam-cpp/usage | 5 ++--- ports/dxcam-cpp/vcpkg.json | 5 ++++- versions/d-/dxcam-cpp.json | 2 +- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/ports/dxcam-cpp/portfile.cmake b/ports/dxcam-cpp/portfile.cmake index 99dff47d582239..6bf696b604bbe6 100644 --- a/ports/dxcam-cpp/portfile.cmake +++ b/ports/dxcam-cpp/portfile.cmake @@ -6,17 +6,12 @@ vcpkg_from_github( SHA512 cd8463a687030da020ffaa8c8438c90185f4bf41f14b50e72ba3aea695828dd12c52e249d290ad0f0fdc1e1109a8a800d9ddf954e38037ff9da90d9ab5fa01cc ) -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" -) +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") vcpkg_cmake_install() -vcpkg_cmake_config_fixup( - PACKAGE_NAME "dxcam-cpp" - CONFIG_PATH lib/cmake/dxcam -) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/dxcam) vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") -configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) \ No newline at end of file +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") \ No newline at end of file diff --git a/ports/dxcam-cpp/usage b/ports/dxcam-cpp/usage index 5a5a6234b5f7c5..5f0faae073bb2c 100644 --- a/ports/dxcam-cpp/usage +++ b/ports/dxcam-cpp/usage @@ -1,5 +1,4 @@ dxcam-cpp provides CMake targets: -find_package(DXCam CONFIG REQUIRED) -target_include_directories(main PRIVATE ${DXCam_INCLUDE_DIRS}) -target_link_libraries(main PRIVATE ${DXCam_LIBS}) \ No newline at end of file + find_package(DXCam CONFIG REQUIRED) + target_link_libraries(main PRIVATE DXCam::DXCam) \ No newline at end of file diff --git a/ports/dxcam-cpp/vcpkg.json b/ports/dxcam-cpp/vcpkg.json index 7b9884ba31aeca..796de9d9848236 100644 --- a/ports/dxcam-cpp/vcpkg.json +++ b/ports/dxcam-cpp/vcpkg.json @@ -8,7 +8,10 @@ "license": "MIT", "supports": "windows & !uwp", "dependencies": [ - "opencv4", + { + "name": "opencv4", + "default-features": false + }, { "name": "vcpkg-cmake", "host": true diff --git a/versions/d-/dxcam-cpp.json b/versions/d-/dxcam-cpp.json index 2c77d623210520..77fe20b9bb6abd 100644 --- a/versions/d-/dxcam-cpp.json +++ b/versions/d-/dxcam-cpp.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "784b0f75952e17217c72bfa956544d8606bcf44f", + "git-tree": "7a15b3f7352fe9a51aabf9e4403d4e8b0822ff2d", "version": "0.2.1", "port-version": 0 } From 7e06393cdda20a0cfaf6d25149ec31d4681cb58f Mon Sep 17 00:00:00 2001 From: Fidel Yin Date: Mon, 24 Mar 2025 21:04:39 -0400 Subject: [PATCH 4/4] reformat --- ports/dxcam-cpp/portfile.cmake | 12 ++++++------ ports/dxcam-cpp/usage | 2 +- versions/d-/dxcam-cpp.json | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ports/dxcam-cpp/portfile.cmake b/ports/dxcam-cpp/portfile.cmake index 6bf696b604bbe6..05a55f3b05ec0d 100644 --- a/ports/dxcam-cpp/portfile.cmake +++ b/ports/dxcam-cpp/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Fidelxyz/DXCam-CPP - HEAD_REF main - REF "v${VERSION}" - SHA512 cd8463a687030da020ffaa8c8438c90185f4bf41f14b50e72ba3aea695828dd12c52e249d290ad0f0fdc1e1109a8a800d9ddf954e38037ff9da90d9ab5fa01cc + OUT_SOURCE_PATH SOURCE_PATH + REPO Fidelxyz/DXCam-CPP + HEAD_REF main + REF "v${VERSION}" + SHA512 cd8463a687030da020ffaa8c8438c90185f4bf41f14b50e72ba3aea695828dd12c52e249d290ad0f0fdc1e1109a8a800d9ddf954e38037ff9da90d9ab5fa01cc ) vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") @@ -14,4 +14,4 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") \ No newline at end of file +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/dxcam-cpp/usage b/ports/dxcam-cpp/usage index 5f0faae073bb2c..653a93d7f956e6 100644 --- a/ports/dxcam-cpp/usage +++ b/ports/dxcam-cpp/usage @@ -1,4 +1,4 @@ dxcam-cpp provides CMake targets: find_package(DXCam CONFIG REQUIRED) - target_link_libraries(main PRIVATE DXCam::DXCam) \ No newline at end of file + target_link_libraries(main PRIVATE DXCam::DXCam) diff --git a/versions/d-/dxcam-cpp.json b/versions/d-/dxcam-cpp.json index 77fe20b9bb6abd..48f1f06dbb1baa 100644 --- a/versions/d-/dxcam-cpp.json +++ b/versions/d-/dxcam-cpp.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "7a15b3f7352fe9a51aabf9e4403d4e8b0822ff2d", + "git-tree": "425578cede23b8c1f4773599edace2e56adb0ade", "version": "0.2.1", "port-version": 0 }