From 43467e8d8216710bad2b787de0dd7ca87d8dd840 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Tue, 1 Oct 2019 17:35:05 -0700 Subject: [PATCH 1/2] Bump gstreamer-uwp msvc-package to 1.16.0.5 This new package contains a hacky gstreamer-webrtc-1.0.pc file so that we can still do self-contained builds without relying on external PKG_CONFIG_PATH. --- python/servo/packages.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/servo/packages.py b/python/servo/packages.py index b258ae76e2a..98d15623573 100644 --- a/python/servo/packages.py +++ b/python/servo/packages.py @@ -9,6 +9,6 @@ WINDOWS_MSVC = { "ninja": "1.7.1", "nuget": "08-08-2019", "openssl": "111.3.0+1.1.1c-vs2017", - "gstreamer-uwp": "1.16.0.4", + "gstreamer-uwp": "1.16.0.5", "openxr-loader-uwp": "1.0", } From c716d4662dc56021316215adc2f1cee9c4fc589a Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Tue, 1 Oct 2019 17:42:46 -0700 Subject: [PATCH 2/2] Isolate UWP builds from external gstreamers --- python/servo/build_commands.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 9be65832c8e..5914edb53cf 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -298,6 +298,10 @@ class MachCommands(CommandBase): env["GSTREAMER_1_0_ROOT_" + arch['gst']] = path.join( self.msvc_package_dir("gstreamer-uwp"), arch['gst_root'] ) + env["PKG_CONFIG_PATH"] = path.join( + self.msvc_package_dir("gstreamer-uwp"), arch['gst_root'], + "lib", "pkgconfig" + ) # Ensure that GStreamer libraries are accessible when linking. if 'windows' in target_triple: