diff options
author | bors-servo <infra@servo.org> | 2023-07-05 17:12:48 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-05 17:12:48 +0200 |
commit | f11c6045e33a921f03223c313781586189309bd2 (patch) | |
tree | 3ba49043d572dee4cafcd3064865026ff496fb96 /python/servo/gstreamer.py | |
parent | eebb0a57468f20ec9e57e842ba1fc4a0d6c6598e (diff) | |
parent | c58d74fe62ce1b82f2d5a193f4f02bb20a7c402e (diff) | |
download | servo-f11c6045e33a921f03223c313781586189309bd2.tar.gz servo-f11c6045e33a921f03223c313781586189309bd2.zip |
Auto merge of #29970 - mrobinson:remove-uwp, r=jdm
Remove UWP / Hololens support
<!-- Please describe your changes on the following line: -->
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes do not require tests because they remove a feature.
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
Diffstat (limited to 'python/servo/gstreamer.py')
-rw-r--r-- | python/servo/gstreamer.py | 31 |
1 files changed, 3 insertions, 28 deletions
diff --git a/python/servo/gstreamer.py b/python/servo/gstreamer.py index 42da291e9f0..637ad3700ca 100644 --- a/python/servo/gstreamer.py +++ b/python/servo/gstreamer.py @@ -78,18 +78,12 @@ GSTREAMER_PLUGINS = [ ] -def windows_dlls(uwp): +def windows_dlls(): libs = list(GSTREAMER_DYLIBS) - NON_UWP_DYLIBS = [ - "gstnet", - "gstsctp", - ] - if uwp: - libs = filter(lambda x: x not in NON_UWP_DYLIBS, libs) return [f"{lib}-1.0-0.dll" for lib in libs] -def windows_plugins(uwp): +def windows_plugins(): # FIXME: We should support newer gstreamer versions here that replace # gstvideoconvert and gstvideoscale with gstvideoconvertscale. libs = [ @@ -98,25 +92,6 @@ def windows_plugins(uwp): "gstvideoscale", "gstwasapi" ] - NON_UWP_PLUGINS = [ - "gstnice", - # gst-plugins-base - "gstogg", - "gstopengl", - "gstopus", - "gstrtp", - "gsttheora", - "gstvorbis", - # gst-plugins-good - "gstmatroska", - "gstrtpmanager", - "gstvpx", - # gst-plugins-bad - "gstdtls", - "gstwebrtc", - ] - if uwp: - libs = filter(lambda x: x not in NON_UWP_PLUGINS, libs) return [f"{lib}.dll" for lib in libs] @@ -156,7 +131,7 @@ def write_plugin_list(target): if "apple-" in target: plugins = [os.path.basename(x) for x in macos_plugins()] elif '-windows-' in target: - plugins = windows_plugins('-uwp-' in target) + plugins = windows_plugins() print('''/* This is a generated file. Do not modify. */ pub(crate) static GSTREAMER_PLUGINS: &[&'static str] = &[ |