summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2020-01-31 16:54:07 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-14 12:21:10 +0200
commit6b7fa183dd0996fec93171edafe3bb2cbf360c56 (patch)
treeb1d7902fa46621eb4a7d5f5c67843246786b6487 /config
parenta43d59bcbf8647bffb405cc3ce2951e4a4d12985 (diff)
downloadUXP-6b7fa183dd0996fec93171edafe3bb2cbf360c56.tar
UXP-6b7fa183dd0996fec93171edafe3bb2cbf360c56.tar.gz
UXP-6b7fa183dd0996fec93171edafe3bb2cbf360c56.tar.lz
UXP-6b7fa183dd0996fec93171edafe3bb2cbf360c56.tar.xz
UXP-6b7fa183dd0996fec93171edafe3bb2cbf360c56.zip
Issue #1342 - Remove support for system libvpx
Diffstat (limited to 'config')
-rw-r--r--config/Makefile.in1
-rw-r--r--config/external/moz.build3
-rw-r--r--config/system-headers9
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