Bug 1509327 - Update libdav1d build file after import. r=TD-Linux
☠☠ backed out by 1b5ec7fefbbf ☠ ☠
authorAlex Chronopoulos <achronop@gmail.com>
Thu, 29 Nov 2018 22:26:11 +0000
changeset 508118 ea27440a2126bc93ca919be0dcd56880b8803bd7
parent 508117 9881fd46fde2d15b213c7c4b36fdc6d39df9ec34
child 508119 aeb00b8974a472794d513c5884c38a96397334da
push id1905
push userffxbld-merge
push dateMon, 21 Jan 2019 12:33:13 +0000
treeherdermozilla-release@c2fca1944d8c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersTD-Linux
bugs1509327
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1509327 - Update libdav1d build file after import. r=TD-Linux Differential Revision: https://phabricator.services.mozilla.com/D13427
media/libdav1d/moz.build
--- a/media/libdav1d/moz.build
+++ b/media/libdav1d/moz.build
@@ -5,16 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 Library('dav1d')
 
 LOCAL_INCLUDES += [
     '/third_party/dav1d',
     '/third_party/dav1d/include',
     '/third_party/dav1d/include/dav1d',
+    '/third_party/dav1d/src',
 ]
 
 if CONFIG['CPU_ARCH'] == 'x86':
     if CONFIG['OS_TARGET'] == 'Android':
         LOCAL_INCLUDES += ['/media/libdav1d/config/x86_32/android/']
         EXPORTS.dav1d += ['config/x86_32/android/config.h']
     else:
         LOCAL_INCLUDES += ['/media/libdav1d/config/x86_32/']
@@ -68,16 +69,17 @@ SOURCES += [
 # includes src
 EXPORTS.dav1d.src += [
     '../../third_party/dav1d/src/cdf.h',
     '../../third_party/dav1d/src/cpu.h',
     '../../third_party/dav1d/src/ctx.h',
     '../../third_party/dav1d/src/data.h',
     '../../third_party/dav1d/src/decode.h',
     '../../third_party/dav1d/src/dequant_tables.h',
+    '../../third_party/dav1d/src/film_grain.h',
     '../../third_party/dav1d/src/getbits.h',
     '../../third_party/dav1d/src/intra_edge.h',
     '../../third_party/dav1d/src/lf_mask.h',
     '../../third_party/dav1d/src/msac.h',
     '../../third_party/dav1d/src/obu.h',
     '../../third_party/dav1d/src/picture.h',
     '../../third_party/dav1d/src/qm.h',
     '../../third_party/dav1d/src/ref.h',
@@ -89,16 +91,17 @@ EXPORTS.dav1d.src += [
     '../../third_party/dav1d/src/wedge.h',
 ]
 
 # common BITDEPTH 8, 10
 relative_path = '../../third_party/dav1d/src/'
 bitdepth_basenames = [
     'cdef_apply_tmpl.c',
     'cdef_tmpl.c',
+    'film_grain_tmpl.c',
     'ipred_prepare_tmpl.c',
     'ipred_tmpl.c',
     'itx_tmpl.c',
     'lf_apply_tmpl.c',
     'loopfilter_tmpl.c',
     'looprestoration_tmpl.c',
     'lr_apply_tmpl.c',
     'mc_tmpl.c',
@@ -153,16 +156,17 @@ EXPORTS.dav1d += [
     '../../third_party/dav1d/include/common/validate.h',
 ]
 
 # include/dav1d
 EXPORTS.dav1d += [
    '../../third_party/dav1d/include/dav1d/common.h',
    '../../third_party/dav1d/include/dav1d/data.h',
    '../../third_party/dav1d/include/dav1d/dav1d.h',
+   '../../third_party/dav1d/include/dav1d/headers.h',
    '../../third_party/dav1d/include/dav1d/picture.h',
 ]
 
 if CONFIG['OS_TARGET'] == 'WINNT':
     RCFILE = 'dav1d.rc'
     SOURCES += [
         '../../third_party/dav1d/src/win32/thread.c'
     ]
@@ -172,10 +176,9 @@ if CONFIG['CC_TYPE'] == 'msvc':
     EXPORTS.dav1d += ['../../third_party/dav1d/include/compat/msvc/stdatomic.h']
 
 if CONFIG['CC_TYPE'] == 'gcc':
     LOCAL_INCLUDES += ['../../third_party/dav1d/include/compat/gcc/']
     EXPORTS.dav1d += ['../../third_party/dav1d/include/compat/gcc/stdatomic.h']
 
 FINAL_LIBRARY = 'gkmedias'
 
-# We allow warnings for third-party code that can be updated from upstream.
-AllowCompilerWarnings()
+DisableCompilerWarnings();