diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-16 23:15:33 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-16 23:15:33 +0200 |
| commit | 5caf99795aa81e1fc145b8e937b1ee8197ed2486 (patch) | |
| tree | 28341279dd59d2930ecee03da6f5bf3b61da9acd | |
| parent | 963fc807963bf0bf83d5fefa945acbafa2dfc9ff (diff) | |
| download | UXP-5caf99795aa81e1fc145b8e937b1ee8197ed2486.tar UXP-5caf99795aa81e1fc145b8e937b1ee8197ed2486.tar.gz UXP-5caf99795aa81e1fc145b8e937b1ee8197ed2486.tar.lz UXP-5caf99795aa81e1fc145b8e937b1ee8197ed2486.tar.xz UXP-5caf99795aa81e1fc145b8e937b1ee8197ed2486.zip | |
Issue #251 - Move MOZ_AV1 back to ac configure for everyone to use.
| -rw-r--r-- | build/moz.configure/old.configure | 1 | ||||
| -rw-r--r-- | old-configure.in | 15 | ||||
| -rw-r--r-- | toolkit/moz.configure | 14 |
3 files changed, 16 insertions, 14 deletions
diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure index d0f6909b9..aba1edf85 100644 --- a/build/moz.configure/old.configure +++ b/build/moz.configure/old.configure @@ -157,6 +157,7 @@ def old_configure_options(*options): '--enable-accessibility', '--enable-address-sanitizer', '--enable-alsa', + '--enable-av1', '--enable-b2g-bt', '--enable-b2g-camera', '--enable-b2g-ril', diff --git a/old-configure.in b/old-configure.in index f1ee5d368..45ac07aca 100644 --- a/old-configure.in +++ b/old-configure.in @@ -2113,6 +2113,7 @@ if test "$MOZ_IOS"; then MOZ_AUTH_EXTENSION= fi MOZ_RAW= +MOZ_AV1= MOZ_VORBIS= MOZ_TREMOR= MOZ_SAMPLE_TYPE_FLOAT32= @@ -2915,6 +2916,20 @@ fi AC_SUBST(MOZ_RAW) dnl ======================================================== +dnl = Enable Libaom AV1 Codec +dnl ======================================================== +MOZ_ARG_ENABLE_BOOL(av1, +[ --enable-av1 Enable libaom for av1 video support], + MOZ_AV1=1, + MOZ_AV1=) + +if test -n "$MOZ_AV1"; then + AC_DEFINE(MOZ_AV1) +fi + +AC_SUBST(MOZ_AV1) + +dnl ======================================================== dnl = Apple platform decoder support dnl ======================================================== if test "$COMPILE_ENVIRONMENT"; then diff --git a/toolkit/moz.configure b/toolkit/moz.configure index 128402257..fe14cb567 100644 --- a/toolkit/moz.configure +++ b/toolkit/moz.configure @@ -345,20 +345,6 @@ set_config('MOZ_FMP4', fmp4) set_define('MOZ_FMP4', fmp4) add_old_configure_assignment('MOZ_FMP4', fmp4) -# Libaom AV1 Video Codec Support -# ============================================================== -option('--enable-av1', - help='Enable libaom for av1 video support') - -@depends('--enable-av1') -def av1(value): - enabled = bool(value) - if enabled: - return True - -set_config('MOZ_AV1', av1) -set_define('MOZ_AV1', av1) - # Miscellaneous # ============================================================== option(name='--enable-chrome-format', |