[vcpkg baseline][gstreamer] Fix interference with libx11 on Windows (#26574)

* [gstreamer] Fix interference with libx11 on Windows

* Add feature x11

* version

* set x11 flag

* version
This commit is contained in:
Thomas1664 2022-08-31 22:47:00 +02:00 committed by GitHub
parent 079a19c9bb
commit dd66c57b83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 44 additions and 4 deletions

View File

@ -0,0 +1,13 @@
diff --git a/meson.build b/meson.build
index 9b00253a0f..e3c3a0d920 100644
--- a/meson.build
+++ b/meson.build
@@ -316,7 +316,7 @@ else
gtk_quartz_dep = dependency('', required : false)
endif
-core_conf.set('HAVE_X11', x11_dep.found())
+core_conf.set('HAVE_X11', false)
core_conf.set('HAVE_GIO_UNIX_2_0', giounix_dep.found())
if gio_dep.type_name() == 'pkgconfig'

View File

@ -15,7 +15,7 @@ vcpkg_from_github(
PATCHES gstreamer-disable-no-unused.patch fix-clang-cl-gstreamer.patch PATCHES gstreamer-disable-no-unused.patch fix-clang-cl-gstreamer.patch
) )
if(VCPKG_TARGET_IS_WINDOWS) if(VCPKG_TARGET_IS_WINDOWS)
list(APPEND PLUGIN_BASE_PATCHES plugins-base-use-zlib.patch plugin-base-disable-no-unused.patch) list(APPEND PLUGIN_BASE_PATCHES plugins-base-use-zlib.patch plugin-base-disable-no-unused.patch plugins-base-x11.patch)
list(APPEND PLUGIN_GOOD_PATCHES plugins-good-use-zlib.patch) list(APPEND PLUGIN_GOOD_PATCHES plugins-good-use-zlib.patch)
list(APPEND PLUGIN_UGLY_PATCHES plugins-ugly-disable-doc.patch) list(APPEND PLUGIN_UGLY_PATCHES plugins-ugly-disable-doc.patch)
endif() endif()
@ -137,6 +137,12 @@ else()
set(PLUGIN_GOOD_FLAC disabled) set(PLUGIN_GOOD_FLAC disabled)
endif() endif()
if ("x11" IN_LIST FEATURES)
set(PLUGIN_BASE_X11 enabled)
else()
set(PLUGIN_BASE_X11 disabled)
endif()
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
set(LIBRARY_LINKAGE "shared") set(LIBRARY_LINKAGE "shared")
else() else()
@ -148,6 +154,13 @@ vcpkg_find_acquire_program(GIT)
get_filename_component(GIT_DIR "${GIT}" DIRECTORY) get_filename_component(GIT_DIR "${GIT}" DIRECTORY)
vcpkg_add_to_path("${GIT_DIR}") vcpkg_add_to_path("${GIT_DIR}")
if(VCPKG_TARGET_IS_WINDOWS)
set(PLUGIN_BASE_WIN
-Dgst-plugins-base:xvideo=disabled
-Dgst-plugins-base:xshm=disabled
-Dgst-plugins-base:gl_winsys=win32)
endif()
# #
# check scripts/cmake/vcpkg_configure_meson.cmake # check scripts/cmake/vcpkg_configure_meson.cmake
# --wrap-mode=nodownload # --wrap-mode=nodownload
@ -189,6 +202,8 @@ vcpkg_configure_meson(
-Dgst-plugins-base:orc=disabled -Dgst-plugins-base:orc=disabled
-Dgst-plugins-base:pango=disabled -Dgst-plugins-base:pango=disabled
-Dgst-plugins-base:gl-graphene=${GL_GRAPHENE} -Dgst-plugins-base:gl-graphene=${GL_GRAPHENE}
-Dgst-plugins-base:x11=${PLUGIN_BASE_X11}
${PLUGIN_BASE_WIN}
# gst-plugins-good # gst-plugins-good
-Dgst-plugins-good:default_library=${LIBRARY_LINKAGE} -Dgst-plugins-good:default_library=${LIBRARY_LINKAGE}
-Dgst-plugins-good:qt5=disabled -Dgst-plugins-good:qt5=disabled

View File

@ -1,10 +1,10 @@
{ {
"name": "gstreamer", "name": "gstreamer",
"version": "1.19.2", "version": "1.19.2",
"port-version": 6, "port-version": 7,
"description": "GStreamer open-source multimedia framework core library", "description": "GStreamer open-source multimedia framework core library",
"homepage": "https://gstreamer.freedesktop.org/", "homepage": "https://gstreamer.freedesktop.org/",
"license": "LGPL-2.0", "license": "LGPL-2.0-only",
"supports": "!linux & !uwp", "supports": "!linux & !uwp",
"dependencies": [ "dependencies": [
{ {
@ -131,6 +131,13 @@
"libraw" "libraw"
] ]
}, },
"x11": {
"description": "Use x11 window system",
"supports": "!windows",
"dependencies": [
"libx11"
]
},
"x264": { "x264": {
"description": "Colon separated list of additional x264 library paths, e.g. for 10-bit version", "description": "Colon separated list of additional x264 library paths, e.g. for 10-bit version",
"supports": "!arm", "supports": "!arm",

View File

@ -2746,7 +2746,7 @@
}, },
"gstreamer": { "gstreamer": {
"baseline": "1.19.2", "baseline": "1.19.2",
"port-version": 6 "port-version": 7
}, },
"gtest": { "gtest": {
"baseline": "1.12.1", "baseline": "1.12.1",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "88e3063c417fe72ab1532ad99494b71c8037d8b5",
"version": "1.19.2",
"port-version": 7
},
{ {
"git-tree": "245207bd8010181848ffaad5822f2492f2cb2b38", "git-tree": "245207bd8010181848ffaad5822f2492f2cb2b38",
"version": "1.19.2", "version": "1.19.2",