Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 5 commits into from
Aug 31, 2022
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ports/gstreamer/plugins-base-x11.patch
Original file line number Diff line number Diff line change
@@ -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())
Thomas1664 marked this conversation as resolved.
Show resolved Hide resolved
+core_conf.set('HAVE_X11', false)
core_conf.set('HAVE_GIO_UNIX_2_0', giounix_dep.found())

if gio_dep.type_name() == 'pkgconfig'
11 changes: 10 additions & 1 deletion ports/gstreamer/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ vcpkg_from_github(
PATCHES gstreamer-disable-no-unused.patch fix-clang-cl-gstreamer.patch
)
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_UGLY_PATCHES plugins-ugly-disable-doc.patch)
endif()
Expand Down Expand Up @@ -148,6 +148,14 @@ vcpkg_find_acquire_program(GIT)
get_filename_component(GIT_DIR "${GIT}" DIRECTORY)
vcpkg_add_to_path("${GIT_DIR}")

if(VCPKG_TARGET_IS_WINDOWS)
set(PLUGIN_BASE_WIN
-Dgst-plugins-base:x11=disabled
-Dgst-plugins-base:xvideo=disabled
-Dgst-plugins-base:xshm=disabled
-Dgst-plugins-base:gl_winsys=win32)
endif()

#
# check scripts/cmake/vcpkg_configure_meson.cmake
# --wrap-mode=nodownload
Expand Down Expand Up @@ -189,6 +197,7 @@ vcpkg_configure_meson(
-Dgst-plugins-base:orc=disabled
-Dgst-plugins-base:pango=disabled
-Dgst-plugins-base:gl-graphene=${GL_GRAPHENE}
${PLUGIN_BASE_WIN}
# gst-plugins-good
-Dgst-plugins-good:default_library=${LIBRARY_LINKAGE}
-Dgst-plugins-good:qt5=disabled
Expand Down
11 changes: 9 additions & 2 deletions ports/gstreamer/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "gstreamer",
"version": "1.19.2",
"port-version": 6,
"port-version": 7,
"description": "GStreamer open-source multimedia framework core library",
"homepage": "https://gstreamer.freedesktop.org/",
"license": "LGPL-2.0",
"license": "LGPL-2.0-only",
"supports": "!linux & !uwp",
"dependencies": [
{
Expand Down Expand Up @@ -131,6 +131,13 @@
"libraw"
]
},
"x11": {
"description": "Use x11 window system",
"supports": "!windows",
"dependencies": [
"libx11"
]
},
"x264": {
"description": "Colon separated list of additional x264 library paths, e.g. for 10-bit version",
"supports": "!arm",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -2738,7 +2738,7 @@
},
"gstreamer": {
"baseline": "1.19.2",
"port-version": 6
"port-version": 7
},
"gtest": {
"baseline": "1.12.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/g-/gstreamer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "bfa1426bfee402484876d61b8ef328f9bb59b4be",
"version": "1.19.2",
"port-version": 7
},
{
"git-tree": "245207bd8010181848ffaad5822f2492f2cb2b38",
"version": "1.19.2",
Expand Down