diff options
| author | Thomas Groman <tgroman@nuegia.net> | 2020-06-14 18:02:51 -0700 |
|---|---|---|
| committer | Thomas Groman <tgroman@nuegia.net> | 2020-06-14 18:02:51 -0700 |
| commit | 0af0100030be9f2569d3dbf5ab746c2b97c009d0 (patch) | |
| tree | 822e8fbbd063a22a47f42b0c7b4cd4c5a5a24b43 /config | |
| parent | 521f6fb61e7bd01f11802c85b6780a46277db51e (diff) | |
| download | UXP-0af0100030be9f2569d3dbf5ab746c2b97c009d0.tar UXP-0af0100030be9f2569d3dbf5ab746c2b97c009d0.tar.gz UXP-0af0100030be9f2569d3dbf5ab746c2b97c009d0.tar.lz UXP-0af0100030be9f2569d3dbf5ab746c2b97c009d0.tar.xz UXP-0af0100030be9f2569d3dbf5ab746c2b97c009d0.zip | |
Revert "Issue #1342 - Remove support for system libvpx"
This reverts commit 229f8412959a9480a9fa1784d6619aa5e97320c3.
Diffstat (limited to 'config')
| -rw-r--r-- | config/Makefile.in | 1 | ||||
| -rw-r--r-- | config/external/moz.build | 3 | ||||
| -rw-r--r-- | config/system-headers | 9 |
3 files changed, 12 insertions, 1 deletions
diff --git a/config/Makefile.in b/config/Makefile.in index c9cc3592c..93ad5a80c 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -45,6 +45,7 @@ export:: $(export-preqs) -DMOZ_SYSTEM_BZ2=$(MOZ_SYSTEM_BZ2) \ -DMOZ_SYSTEM_ZLIB=$(MOZ_SYSTEM_ZLIB) \ -DMOZ_SYSTEM_JPEG=$(MOZ_SYSTEM_JPEG) \ + -DMOZ_SYSTEM_LIBVPX=$(MOZ_SYSTEM_LIBVPX) \ $(srcdir)/system-headers $(srcdir)/stl-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers $(INSTALL) system_wrappers $(DIST) diff --git a/config/external/moz.build b/config/external/moz.build index f4013c18a..6b3617bf0 100644 --- a/config/external/moz.build +++ b/config/external/moz.build @@ -28,7 +28,8 @@ if CONFIG['MOZ_TREMOR']: if CONFIG['MOZ_WEBM_ENCODER']: external_dirs += ['media/libmkv'] -external_dirs += ['media/libvpx'] +if not CONFIG['MOZ_SYSTEM_LIBVPX']: + external_dirs += ['media/libvpx'] if CONFIG['MOZ_AV1']: external_dirs += ['media/libaom'] diff --git a/config/system-headers b/config/system-headers index 3685d6d1c..9dd33bc76 100644 --- a/config/system-headers +++ b/config/system-headers @@ -1288,6 +1288,15 @@ QtSparql/qsparqlresult.h #if MOZ_TREE_PIXMAN!=1 pixman.h #endif +#if MOZ_SYSTEM_LIBVPX==1 +vpx/svc_context.h +vpx/vpx_codec.h +vpx/vpx_decoder.h +vpx/vpx_encoder.h +vpx/vp8cx.h +vpx/vp8dx.h +vpx_mem/vpx_mem.h +#endif gst/gst.h gst/app/gstappsink.h gst/app/gstappsrc.h |