diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-31 16:54:07 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-31 16:54:07 +0100 |
| commit | 229f8412959a9480a9fa1784d6619aa5e97320c3 (patch) | |
| tree | 39c52966f8c231e1401d7f32abc7f1ffdeecaa20 /config | |
| parent | d41ba28f5257f7c1425a0bde210e69fc5bb34a37 (diff) | |
| download | UXP-229f8412959a9480a9fa1784d6619aa5e97320c3.tar UXP-229f8412959a9480a9fa1784d6619aa5e97320c3.tar.gz UXP-229f8412959a9480a9fa1784d6619aa5e97320c3.tar.lz UXP-229f8412959a9480a9fa1784d6619aa5e97320c3.tar.xz UXP-229f8412959a9480a9fa1784d6619aa5e97320c3.zip | |
Issue #1342 - Remove support for system libvpx
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, 1 insertions, 12 deletions
diff --git a/config/Makefile.in b/config/Makefile.in index 93ad5a80c..c9cc3592c 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -45,7 +45,6 @@ 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 012533554..321ca3a5b 100644 --- a/config/external/moz.build +++ b/config/external/moz.build @@ -30,8 +30,7 @@ if CONFIG['MOZ_TREMOR']: if CONFIG['MOZ_WEBM_ENCODER']: external_dirs += ['media/libmkv'] -if not CONFIG['MOZ_SYSTEM_LIBVPX']: - external_dirs += ['media/libvpx'] +external_dirs += ['media/libvpx'] if CONFIG['MOZ_AV1']: external_dirs += ['media/libaom'] diff --git a/config/system-headers b/config/system-headers index 9dd33bc76..3685d6d1c 100644 --- a/config/system-headers +++ b/config/system-headers @@ -1288,15 +1288,6 @@ 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 |