Add more gstreamer plugins to nightly builds.

This commit is contained in:
Josh Matthews 2020-07-25 11:04:54 -04:00
parent fa9b077e84
commit 4e3621e91e
3 changed files with 31 additions and 7 deletions

View file

@ -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): def windows_build_task(name, package=True, arch="x86_64", rdp=False):
hashes = { hashes = {
"devel": { "devel": {
"x86_64": "c136cbfb0330041d52fe6ec4e3e468563176333c857f6ed71191ebc37fc9d605", "x86_64": "bd444f3ff9d828f93ba5db0ef511d648d238fff50c4435ccefc7b3e9b2bea3b9",
}, },
"non-devel": { "non-devel": {
"x86_64": "0744a8ef2a4ba393dacb7927d741df871400a85bab5aecf7905f63bf52c405e4", "x86_64": "f33fff17a558a433b9c4cf7bd9a338a3d0867fa2d5ee1ee33d249b6a55e8a297",
}, },
} }
prefix = { prefix = {
"x86_64": "msvc", "x86_64": "msvc",
} }
version = "1.16.0" version = "1.16.2"
task = ( task = (
windows_task(name) windows_task(name)
.with_max_run_time_minutes(90) .with_max_run_time_minutes(90)

View file

@ -909,6 +909,7 @@ def package_gstreamer_dlls(env, servo_exe_dir, target, uwp):
# with UWP's restrictions. # with UWP's restrictions.
gst_dlls += [ gst_dlls += [
"graphene-1.0-0.dll", "graphene-1.0-0.dll",
"libcrypto-1_1-x64.dll",
"libgmp-10.dll", "libgmp-10.dll",
"libgnutls-30.dll", "libgnutls-30.dll",
"libhogweed-4.dll", "libhogweed-4.dll",
@ -917,10 +918,12 @@ def package_gstreamer_dlls(env, servo_exe_dir, target, uwp):
"libogg-0.dll", "libogg-0.dll",
"libopus-0.dll", "libopus-0.dll",
"libpng16-16.dll", "libpng16-16.dll",
"libssl-1_1-x64.dll",
"libtasn1-6.dll", "libtasn1-6.dll",
"libtheora-0.dll", "libtheora-0.dll",
"libtheoradec-1.dll", "libtheoradec-1.dll",
"libtheoraenc-1.dll", "libtheoraenc-1.dll",
"libusrsctp-1.dll",
"libvorbis-0.dll", "libvorbis-0.dll",
"libvorbisenc-2.dll", "libvorbisenc-2.dll",
"libwinpthread-1.dll", "libwinpthread-1.dll",

View file

@ -18,6 +18,7 @@ GSTREAMER_DYLIBS = [
("gstcontroller", "gstreamer"), ("gstcontroller", "gstreamer"),
("gstfft", "gst-plugins-base"), ("gstfft", "gst-plugins-base"),
("gstgl", "gst-plugins-base"), ("gstgl", "gst-plugins-base"),
("gstnet", "gstreamer"),
("gstpbutils", "gst-plugins-base"), ("gstpbutils", "gst-plugins-base"),
("gstplayer", "gst-plugins-bad"), ("gstplayer", "gst-plugins-bad"),
("gstreamer", "gstreamer"), ("gstreamer", "gstreamer"),
@ -32,11 +33,13 @@ GSTREAMER_DYLIBS = [
] ]
NON_UWP_DYLIBS = [ NON_UWP_DYLIBS = [
"gstnet",
"gstsctp", "gstsctp",
] ]
GSTREAMER_PLUGINS = [ GSTREAMER_PLUGINS = [
("gstapp", "gst-plugins-base"), ("gstapp", "gst-plugins-base"),
("gstaudiobuffersplit", "gst-plugins-bad"),
("gstaudioconvert", "gst-plugins-base"), ("gstaudioconvert", "gst-plugins-base"),
("gstaudiofx", "gst-plugins-good"), ("gstaudiofx", "gst-plugins-good"),
("gstaudioparsers", "gst-plugins-good"), ("gstaudioparsers", "gst-plugins-good"),
@ -44,6 +47,10 @@ GSTREAMER_PLUGINS = [
("gstautodetect", "gst-plugins-good"), ("gstautodetect", "gst-plugins-good"),
("gstcoreelements", "gstreamer"), ("gstcoreelements", "gstreamer"),
("gstdeinterlace", "gst-plugins-good"), ("gstdeinterlace", "gst-plugins-good"),
("gstdtls", "gst-plugins-bad"),
("gstgio", "gst-plugins-base"),
("gstid3tag", "gst-plugins-bad"),
("gstid3demux", "gst-plugins-good"),
("gstinterleave", "gst-plugins-good"), ("gstinterleave", "gst-plugins-good"),
("gstisomp4", "gst-plugins-good"), ("gstisomp4", "gst-plugins-good"),
("gstlibav", "gst-libav"), ("gstlibav", "gst-libav"),
@ -54,6 +61,7 @@ GSTREAMER_PLUGINS = [
("gstplayback", "gst-plugins-base"), ("gstplayback", "gst-plugins-base"),
("gstproxy", "gst-plugins-bad"), ("gstproxy", "gst-plugins-bad"),
("gstrtp", "gst-plugins-good"), ("gstrtp", "gst-plugins-good"),
("gstrtpmanager", "gst-plugins-good"),
("gsttheora", "gst-plugins-base"), ("gsttheora", "gst-plugins-base"),
("gsttypefindfunctions", "gst-plugins-base"), ("gsttypefindfunctions", "gst-plugins-base"),
("gstvideoconvert", "gst-plugins-base"), ("gstvideoconvert", "gst-plugins-base"),
@ -67,21 +75,25 @@ GSTREAMER_PLUGINS = [
] ]
WINDOWS_PLUGINS = [ WINDOWS_PLUGINS = [
("gstnice", "gst-plugins-base"), "gstnice",
("gstwasapi", "gst-plugins-base"), "gstwasapi",
] ]
MACOS_PLUGINS = [ MACOS_PLUGINS = [
("gstapplemedia", "gst-plugins-bad"), ("gstapplemedia", "gst-plugins-bad"),
("gstosxaudio", "gst-plugins-good"),
("gstosxvideo", "gst-plugins-good"),
] ]
NON_UWP_PLUGINS = [ NON_UWP_PLUGINS = [
"gstdtls",
"gstmatroska", "gstmatroska",
"gstnice", "gstnice",
"gstogg", "gstogg",
"gstopengl", "gstopengl",
"gstopus", "gstopus",
"gstrtp", "gstrtp",
"gstrtpmanager",
"gsttheora", "gsttheora",
"gstvorbis", "gstvorbis",
"gstvpx", "gstvpx",
@ -97,12 +109,16 @@ def windows_dlls(uwp):
def windows_plugins(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: if uwp:
dlls = filter(lambda x: x not in NON_UWP_PLUGINS, dlls) dlls = filter(lambda x: x not in NON_UWP_PLUGINS, dlls)
return [x + ".dll" for x in dlls] return [x + ".dll" for x in dlls]
def macos_libnice():
return os.path.join('/', 'usr', 'local', 'opt', 'libnice', 'lib')
def macos_dylibs(): def macos_dylibs():
return [ return [
os.path.join( os.path.join(
@ -111,6 +127,9 @@ def macos_dylibs():
"lib", "lib",
"lib" + name + "-1.0.0.dylib" "lib" + name + "-1.0.0.dylib"
) for name, path in GSTREAMER_DYLIBS ) for name, path in GSTREAMER_DYLIBS
] + [
os.path.join(macos_libnice(), "libnice.dylib"),
os.path.join(macos_libnice(), "libnice.10.dylib"),
] ]
@ -122,7 +141,9 @@ def macos_plugins():
"lib", "lib",
"gstreamer-1.0", "gstreamer-1.0",
"lib" + name + ".so" "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"),
] ]