Skip to content

Commit dd66c57

Browse files
authored
[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
1 parent 079a19c commit dd66c57

File tree

5 files changed

+44
-4
lines changed

5 files changed

+44
-4
lines changed

Diff for: ports/gstreamer/plugins-base-x11.patch

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/meson.build b/meson.build
2+
index 9b00253a0f..e3c3a0d920 100644
3+
--- a/meson.build
4+
+++ b/meson.build
5+
@@ -316,7 +316,7 @@ else
6+
gtk_quartz_dep = dependency('', required : false)
7+
endif
8+
9+
-core_conf.set('HAVE_X11', x11_dep.found())
10+
+core_conf.set('HAVE_X11', false)
11+
core_conf.set('HAVE_GIO_UNIX_2_0', giounix_dep.found())
12+
13+
if gio_dep.type_name() == 'pkgconfig'

Diff for: ports/gstreamer/portfile.cmake

+16-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ vcpkg_from_github(
1515
PATCHES gstreamer-disable-no-unused.patch fix-clang-cl-gstreamer.patch
1616
)
1717
if(VCPKG_TARGET_IS_WINDOWS)
18-
list(APPEND PLUGIN_BASE_PATCHES plugins-base-use-zlib.patch plugin-base-disable-no-unused.patch)
18+
list(APPEND PLUGIN_BASE_PATCHES plugins-base-use-zlib.patch plugin-base-disable-no-unused.patch plugins-base-x11.patch)
1919
list(APPEND PLUGIN_GOOD_PATCHES plugins-good-use-zlib.patch)
2020
list(APPEND PLUGIN_UGLY_PATCHES plugins-ugly-disable-doc.patch)
2121
endif()
@@ -137,6 +137,12 @@ else()
137137
set(PLUGIN_GOOD_FLAC disabled)
138138
endif()
139139

140+
if ("x11" IN_LIST FEATURES)
141+
set(PLUGIN_BASE_X11 enabled)
142+
else()
143+
set(PLUGIN_BASE_X11 disabled)
144+
endif()
145+
140146
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
141147
set(LIBRARY_LINKAGE "shared")
142148
else()
@@ -148,6 +154,13 @@ vcpkg_find_acquire_program(GIT)
148154
get_filename_component(GIT_DIR "${GIT}" DIRECTORY)
149155
vcpkg_add_to_path("${GIT_DIR}")
150156

157+
if(VCPKG_TARGET_IS_WINDOWS)
158+
set(PLUGIN_BASE_WIN
159+
-Dgst-plugins-base:xvideo=disabled
160+
-Dgst-plugins-base:xshm=disabled
161+
-Dgst-plugins-base:gl_winsys=win32)
162+
endif()
163+
151164
#
152165
# check scripts/cmake/vcpkg_configure_meson.cmake
153166
# --wrap-mode=nodownload
@@ -189,6 +202,8 @@ vcpkg_configure_meson(
189202
-Dgst-plugins-base:orc=disabled
190203
-Dgst-plugins-base:pango=disabled
191204
-Dgst-plugins-base:gl-graphene=${GL_GRAPHENE}
205+
-Dgst-plugins-base:x11=${PLUGIN_BASE_X11}
206+
${PLUGIN_BASE_WIN}
192207
# gst-plugins-good
193208
-Dgst-plugins-good:default_library=${LIBRARY_LINKAGE}
194209
-Dgst-plugins-good:qt5=disabled

Diff for: ports/gstreamer/vcpkg.json

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "gstreamer",
33
"version": "1.19.2",
4-
"port-version": 6,
4+
"port-version": 7,
55
"description": "GStreamer open-source multimedia framework core library",
66
"homepage": "https://gstreamer.freedesktop.org/",
7-
"license": "LGPL-2.0",
7+
"license": "LGPL-2.0-only",
88
"supports": "!linux & !uwp",
99
"dependencies": [
1010
{
@@ -131,6 +131,13 @@
131131
"libraw"
132132
]
133133
},
134+
"x11": {
135+
"description": "Use x11 window system",
136+
"supports": "!windows",
137+
"dependencies": [
138+
"libx11"
139+
]
140+
},
134141
"x264": {
135142
"description": "Colon separated list of additional x264 library paths, e.g. for 10-bit version",
136143
"supports": "!arm",

Diff for: versions/baseline.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2746,7 +2746,7 @@
27462746
},
27472747
"gstreamer": {
27482748
"baseline": "1.19.2",
2749-
"port-version": 6
2749+
"port-version": 7
27502750
},
27512751
"gtest": {
27522752
"baseline": "1.12.1",

Diff for: versions/g-/gstreamer.json

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "88e3063c417fe72ab1532ad99494b71c8037d8b5",
5+
"version": "1.19.2",
6+
"port-version": 7
7+
},
38
{
49
"git-tree": "245207bd8010181848ffaad5822f2492f2cb2b38",
510
"version": "1.19.2",

0 commit comments

Comments
 (0)