[libdshowcapture] Bump to 2025-02-08 (#45147)

This commit is contained in:
Weihang Ding 2025-06-26 02:30:59 +08:00 committed by GitHub
parent ceeca4ec48
commit 6bd45cc8d6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 51 additions and 6 deletions

View File

@ -0,0 +1,27 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c88ff6..ee1688b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,8 +6,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Mo
option(BUILD_SHARED_LIBS "Build shared library" ON)
-find_package(CXX11 REQUIRED)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX11_FLAGS}")
+set(CMAKE_CXX_STANDARD 17)
if(${CMAKE_C_COMPILER_ID} MATCHES "Clang" OR ${CMAKE_CXX_COMPILER_ID} MATCHES
"Clang")
diff --git a/source/dshow-formats.cpp b/source/dshow-formats.cpp
index 4baf381..3f41a99 100644
--- a/source/dshow-formats.cpp
+++ b/source/dshow-formats.cpp
@@ -283,7 +283,7 @@ bool GetMediaTypeVFormat(const AM_MEDIA_TYPE &mt, VideoFormat &format)
/* raw formats */
if (mt.subtype == MEDIASUBTYPE_RGB24)
- format = VideoFormat::XRGB;
+ format = VideoFormat::RGB24;
else if (mt.subtype == MEDIASUBTYPE_RGB32)
format = VideoFormat::XRGB;
else if (mt.subtype == MEDIASUBTYPE_ARGB32)

18
ports/libdshowcapture/portfile.cmake Normal file → Executable file
View File

@ -1,11 +1,25 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO obsproject/libdshowcapture
REF cba07c63810f51a58f6fb7f2e3b0fb162b5a6313
SHA512 962f5886f637f06580db9b90d238cdb76976846c5b1d49112910fda0da689788abec1d1703aa4e91ee4be57f328eb8183c04f94119662e1243269ae66f023c84
REF 8878638324393815512f802640b0d5ce940161f1
SHA512 bbb9fa169bffce4f6405b8332524267f10b3e6e2dcaddcddf7ef73ffb7a6409ef4c6a13f599cab814cbf42c22690f9e24e988666886535ef9fdfb851fdb50a5c
HEAD_REF master
PATCHES
fix_build.patch
)
vcpkg_from_github(
OUT_SOURCE_PATH DEP_SOURCE_PATH
REPO elgatosf/capture-device-support
REF fe9630974d47f51bf54826e72fb8b654e620aa93
SHA512 971185ffaf0c5777c060d3cf49ee8f907aebc8191e3ada9c9f3c4c0d553c257d13e2828c991985b9d47a446d003b26664ecec2c18c0e6c66dfdba904baee0ae6
HEAD_REF main
)
file(REMOVE_RECURSE "${SOURCE_PATH}/external/capture-device-support")
file(RENAME "${DEP_SOURCE_PATH}" "${SOURCE_PATH}/external/capture-device-support")
file(REMOVE_RECURSE "${DEP_SOURCE_PATH}")
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
)

3
ports/libdshowcapture/vcpkg.json Normal file → Executable file
View File

@ -1,7 +1,6 @@
{
"name": "libdshowcapture",
"version": "0.6.0",
"port-version": 4,
"version-date": "2025-02-08",
"description": "Free and Open Source C++11 Library for capturing DirectShow video/audio devices on windows.",
"supports": "windows & !uwp",
"dependencies": [

View File

@ -4633,8 +4633,8 @@
"port-version": 0
},
"libdshowcapture": {
"baseline": "0.6.0",
"port-version": 4
"baseline": "2025-02-08",
"port-version": 0
},
"libdvdcss": {
"baseline": "1.4.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a565a559ce19c369eac9cafce3d55789b4b35989",
"version-date": "2025-02-08",
"port-version": 0
},
{
"git-tree": "df899babb69eb01159e5777fc4d4ef07a1570724",
"version": "0.6.0",