Skip to content

Commit

Permalink
Auto merge of servo#27403 - servo:jdm-patch-46, r=Manishearth
Browse files Browse the repository at this point in the history
Add more gstreamer plugins to nightly builds.
  • Loading branch information
bors-servo committed Jul 28, 2020
2 parents 8f61ce6 + 4e3621e commit 7eabd5c
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 7 deletions.
6 changes: 3 additions & 3 deletions etc/taskcluster/decision_task.py
Expand Up @@ -754,16 +754,16 @@ def linux_build_task(name, *, build_env=build_env):
def windows_build_task(name, package=True, arch="x86_64", rdp=False):
hashes = {
"devel": {
"x86_64": "c136cbfb0330041d52fe6ec4e3e468563176333c857f6ed71191ebc37fc9d605",
"x86_64": "bd444f3ff9d828f93ba5db0ef511d648d238fff50c4435ccefc7b3e9b2bea3b9",
},
"non-devel": {
"x86_64": "0744a8ef2a4ba393dacb7927d741df871400a85bab5aecf7905f63bf52c405e4",
"x86_64": "f33fff17a558a433b9c4cf7bd9a338a3d0867fa2d5ee1ee33d249b6a55e8a297",
},
}
prefix = {
"x86_64": "msvc",
}
version = "1.16.0"
version = "1.16.2"
task = (
windows_task(name)
.with_max_run_time_minutes(90)
Expand Down
3 changes: 3 additions & 0 deletions python/servo/build_commands.py
Expand Up @@ -909,6 +909,7 @@ def package_gstreamer_dlls(env, servo_exe_dir, target, uwp):
# with UWP's restrictions.
gst_dlls += [
"graphene-1.0-0.dll",
"libcrypto-1_1-x64.dll",
"libgmp-10.dll",
"libgnutls-30.dll",
"libhogweed-4.dll",
Expand All @@ -917,10 +918,12 @@ def package_gstreamer_dlls(env, servo_exe_dir, target, uwp):
"libogg-0.dll",
"libopus-0.dll",
"libpng16-16.dll",
"libssl-1_1-x64.dll",
"libtasn1-6.dll",
"libtheora-0.dll",
"libtheoradec-1.dll",
"libtheoraenc-1.dll",
"libusrsctp-1.dll",
"libvorbis-0.dll",
"libvorbisenc-2.dll",
"libwinpthread-1.dll",
Expand Down
29 changes: 25 additions & 4 deletions python/servo/gstreamer.py
Expand Up @@ -18,6 +18,7 @@
("gstcontroller", "gstreamer"),
("gstfft", "gst-plugins-base"),
("gstgl", "gst-plugins-base"),
("gstnet", "gstreamer"),
("gstpbutils", "gst-plugins-base"),
("gstplayer", "gst-plugins-bad"),
("gstreamer", "gstreamer"),
Expand All @@ -32,18 +33,24 @@
]

NON_UWP_DYLIBS = [
"gstnet",
"gstsctp",
]

GSTREAMER_PLUGINS = [
("gstapp", "gst-plugins-base"),
("gstaudiobuffersplit", "gst-plugins-bad"),
("gstaudioconvert", "gst-plugins-base"),
("gstaudiofx", "gst-plugins-good"),
("gstaudioparsers", "gst-plugins-good"),
("gstaudioresample", "gst-plugins-base"),
("gstautodetect", "gst-plugins-good"),
("gstcoreelements", "gstreamer"),
("gstdeinterlace", "gst-plugins-good"),
("gstdtls", "gst-plugins-bad"),
("gstgio", "gst-plugins-base"),
("gstid3tag", "gst-plugins-bad"),
("gstid3demux", "gst-plugins-good"),
("gstinterleave", "gst-plugins-good"),
("gstisomp4", "gst-plugins-good"),
("gstlibav", "gst-libav"),
Expand All @@ -54,6 +61,7 @@
("gstplayback", "gst-plugins-base"),
("gstproxy", "gst-plugins-bad"),
("gstrtp", "gst-plugins-good"),
("gstrtpmanager", "gst-plugins-good"),
("gsttheora", "gst-plugins-base"),
("gsttypefindfunctions", "gst-plugins-base"),
("gstvideoconvert", "gst-plugins-base"),
Expand All @@ -67,21 +75,25 @@
]

WINDOWS_PLUGINS = [
("gstnice", "gst-plugins-base"),
("gstwasapi", "gst-plugins-base"),
"gstnice",
"gstwasapi",
]

MACOS_PLUGINS = [
("gstapplemedia", "gst-plugins-bad"),
("gstosxaudio", "gst-plugins-good"),
("gstosxvideo", "gst-plugins-good"),
]

NON_UWP_PLUGINS = [
"gstdtls",
"gstmatroska",
"gstnice",
"gstogg",
"gstopengl",
"gstopus",
"gstrtp",
"gstrtpmanager",
"gsttheora",
"gstvorbis",
"gstvpx",
Expand All @@ -97,12 +109,16 @@ def windows_dlls(uwp):


def windows_plugins(uwp):
dlls = [x for x, _ in GSTREAMER_PLUGINS] + [x for x, _ in WINDOWS_PLUGINS]
dlls = [x for x, _ in GSTREAMER_PLUGINS] + WINDOWS_PLUGINS
if uwp:
dlls = filter(lambda x: x not in NON_UWP_PLUGINS, dlls)
return [x + ".dll" for x in dlls]


def macos_libnice():
return os.path.join('/', 'usr', 'local', 'opt', 'libnice', 'lib')


def macos_dylibs():
return [
os.path.join(
Expand All @@ -111,6 +127,9 @@ def macos_dylibs():
"lib",
"lib" + name + "-1.0.0.dylib"
) for name, path in GSTREAMER_DYLIBS
] + [
os.path.join(macos_libnice(), "libnice.dylib"),
os.path.join(macos_libnice(), "libnice.10.dylib"),
]


Expand All @@ -122,7 +141,9 @@ def macos_plugins():
"lib",
"gstreamer-1.0",
"lib" + name + ".so"
) for name, path in GSTREAMER_PLUGINS
) for name, path in GSTREAMER_PLUGINS + MACOS_PLUGINS
] + [
os.path.join(macos_libnice(), "gstreamer-1.0", "libgstnice.so"),
]


Expand Down

0 comments on commit 7eabd5c

Please sign in to comment.