Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 21:01:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1413734 - av1: fix build issues. r=kinetik

Browse Source 
This revision of libaom has some conflicts with our vendor script
and build system. A number of new .asm files have the same basename
as .c files, which our build system cannot handle.

To work around this, I ran `./mach vendor aom` with the check for
duplicate filenames disabled, then manually renamed the conflicting
files in the filesystem and sources.mozbuild.

Also add av1_convolve_scale_sse4.c to sources.mozbuild manually.
This is needed by the build but for some reason isn't picked up
by generate_sources_mozbuild.sh.

MozReview-Commit-ID: 2iBo4kSBz1G

--HG--
rename : third_party/aom/aom_dsp/arm/idct16x16_1_add_neon.asm => third_party/aom/aom_dsp/arm/idct16x16_1_add_neon_asm.asm
rename : third_party/aom/aom_dsp/arm/idct16x16_add_neon.asm => third_party/aom/aom_dsp/arm/idct16x16_add_neon_asm.asm
rename : third_party/aom/aom_dsp/arm/idct32x32_1_add_neon.asm => third_party/aom/aom_dsp/arm/idct32x32_1_add_neon_asm.asm
rename : third_party/aom/aom_dsp/arm/idct32x32_add_neon.asm => third_party/aom/aom_dsp/arm/idct32x32_add_neon_asm.asm
rename : third_party/aom/aom_dsp/arm/idct4x4_1_add_neon.asm => third_party/aom/aom_dsp/arm/idct4x4_1_add_neon_asm.asm
rename : third_party/aom/aom_dsp/arm/idct4x4_add_neon.asm => third_party/aom/aom_dsp/arm/idct4x4_add_neon_asm.asm
rename : third_party/aom/aom_dsp/arm/idct8x8_1_add_neon.asm => third_party/aom/aom_dsp/arm/idct8x8_1_add_neon_asm.asm
rename : third_party/aom/aom_dsp/arm/idct8x8_add_neon.asm => third_party/aom/aom_dsp/arm/idct8x8_add_neon_asm.asm
rename : third_party/aom/aom_dsp/arm/loopfilter_16_neon.asm => third_party/aom/aom_dsp/arm/loopfilter_16_neon_asm.asm
rename : third_party/aom/aom_dsp/arm/loopfilter_4_neon.asm => third_party/aom/aom_dsp/arm/loopfilter_4_neon_asm.asm
rename : third_party/aom/aom_dsp/arm/loopfilter_8_neon.asm => third_party/aom/aom_dsp/arm/loopfilter_8_neon_asm.asm
rename : third_party/aom/aom_dsp/x86/highbd_intrapred_sse2.asm => third_party/aom/aom_dsp/x86/highbd_intrapred_sse2_asm.asm
rename : third_party/aom/aom_dsp/x86/intrapred_sse2.asm => third_party/aom/aom_dsp/x86/intrapred_sse2_asm.asm
rename : third_party/aom/aom_dsp/x86/intrapred_ssse3.asm => third_party/aom/aom_dsp/x86/intrapred_ssse3_asm.asm
extra : rebase_source : 7bf598ac1a925e16e42301839376a963836ae182
This commit is contained in:
Ralph Giles 2017-11-01 15:49:14 -07:00
parent 92f3d837b2
commit 05817d3bd3
15 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
media/libaom/sources.mozbuild
View File

@ -77,8 +77,8 @@ files = {
'../../third_party/aom/aom_dsp/x86/halfpix_variance_sse2.c',
'../../third_party/aom/aom_dsp/x86/highbd_convolve_avx2.c',
'../../third_party/aom/aom_dsp/x86/highbd_intrapred_avx2.c',
'../../third_party/aom/aom_dsp/x86/highbd_intrapred_sse2.asm',
'../../third_party/aom/aom_dsp/x86/highbd_intrapred_sse2.c',
'../../third_party/aom/aom_dsp/x86/highbd_intrapred_sse2_asm.asm',
'../../third_party/aom/aom_dsp/x86/highbd_intrapred_ssse3.c',
'../../third_party/aom/aom_dsp/x86/highbd_loopfilter_avx2.c',
'../../third_party/aom/aom_dsp/x86/highbd_loopfilter_sse2.c',
@ -92,10 +92,10 @@ files = {
'../../third_party/aom/aom_dsp/x86/highbd_variance_sse2.c',
'../../third_party/aom/aom_dsp/x86/highbd_variance_sse4.c',
'../../third_party/aom/aom_dsp/x86/intrapred_avx2.c',
'../../third_party/aom/aom_dsp/x86/intrapred_sse2.asm',
'../../third_party/aom/aom_dsp/x86/intrapred_sse2.c',
'../../third_party/aom/aom_dsp/x86/intrapred_ssse3.asm',
'../../third_party/aom/aom_dsp/x86/intrapred_sse2_asm.asm',
'../../third_party/aom/aom_dsp/x86/intrapred_ssse3.c',
'../../third_party/aom/aom_dsp/x86/intrapred_ssse3_asm.asm',
'../../third_party/aom/aom_dsp/x86/inv_txfm_avx2.c',
'../../third_party/aom/aom_dsp/x86/inv_txfm_sse2.c',
'../../third_party/aom/aom_dsp/x86/inv_txfm_ssse3.c',
@ -174,6 +174,7 @@ files = {
'../../third_party/aom/av1/common/thread_common.c',
'../../third_party/aom/av1/common/tile_common.c',
'../../third_party/aom/av1/common/warped_motion.c',
'../../third_party/aom/av1/common/x86/av1_convolve_scale_sse4.c',
'../../third_party/aom/av1/common/x86/av1_convolve_ssse3.c',
'../../third_party/aom/av1/common/x86/av1_fwd_txfm1d_sse4.c',
'../../third_party/aom/av1/common/x86/av1_fwd_txfm2d_sse4.c',
@ -324,8 +325,8 @@ files = {
'../../third_party/aom/aom_dsp/x86/halfpix_variance_sse2.c',
'../../third_party/aom/aom_dsp/x86/highbd_convolve_avx2.c',
'../../third_party/aom/aom_dsp/x86/highbd_intrapred_avx2.c',
'../../third_party/aom/aom_dsp/x86/highbd_intrapred_sse2.asm',
'../../third_party/aom/aom_dsp/x86/highbd_intrapred_sse2.c',
'../../third_party/aom/aom_dsp/x86/highbd_intrapred_sse2_asm.asm',
'../../third_party/aom/aom_dsp/x86/highbd_intrapred_ssse3.c',
'../../third_party/aom/aom_dsp/x86/highbd_loopfilter_avx2.c',
'../../third_party/aom/aom_dsp/x86/highbd_loopfilter_sse2.c',
@ -339,10 +340,10 @@ files = {
'../../third_party/aom/aom_dsp/x86/highbd_variance_sse2.c',
'../../third_party/aom/aom_dsp/x86/highbd_variance_sse4.c',
'../../third_party/aom/aom_dsp/x86/intrapred_avx2.c',
'../../third_party/aom/aom_dsp/x86/intrapred_sse2.asm',
'../../third_party/aom/aom_dsp/x86/intrapred_sse2.c',
'../../third_party/aom/aom_dsp/x86/intrapred_ssse3.asm',
'../../third_party/aom/aom_dsp/x86/intrapred_sse2_asm.asm',
'../../third_party/aom/aom_dsp/x86/intrapred_ssse3.c',
'../../third_party/aom/aom_dsp/x86/intrapred_ssse3_asm.asm',
'../../third_party/aom/aom_dsp/x86/inv_txfm_avx2.c',
'../../third_party/aom/aom_dsp/x86/inv_txfm_sse2.c',
'../../third_party/aom/aom_dsp/x86/inv_txfm_ssse3.c',
@ -418,6 +419,7 @@ files = {
'../../third_party/aom/av1/common/thread_common.c',
'../../third_party/aom/av1/common/tile_common.c',
'../../third_party/aom/av1/common/warped_motion.c',
'../../third_party/aom/av1/common/x86/av1_convolve_scale_sse4.c',
'../../third_party/aom/av1/common/x86/av1_convolve_ssse3.c',
'../../third_party/aom/av1/common/x86/av1_fwd_txfm1d_sse4.c',
'../../third_party/aom/av1/common/x86/av1_fwd_txfm2d_sse4.c',
@ -528,15 +530,15 @@ files = {
'../../third_party/aom/aom_dsp/arm/avg_neon.c',
'../../third_party/aom/aom_dsp/arm/fwd_txfm_neon.c',
'../../third_party/aom/aom_dsp/arm/hadamard_neon.c',
'../../third_party/aom/aom_dsp/arm/idct16x16_1_add_neon.asm',
'../../third_party/aom/aom_dsp/arm/idct16x16_add_neon.asm',
'../../third_party/aom/aom_dsp/arm/idct16x16_1_add_neon_asm_asm.asm',
'../../third_party/aom/aom_dsp/arm/idct16x16_add_neon_asm.asm',
'../../third_party/aom/aom_dsp/arm/idct16x16_neon.c',
'../../third_party/aom/aom_dsp/arm/idct32x32_1_add_neon.asm',
'../../third_party/aom/aom_dsp/arm/idct32x32_add_neon.asm',
'../../third_party/aom/aom_dsp/arm/idct4x4_1_add_neon.asm',
'../../third_party/aom/aom_dsp/arm/idct4x4_add_neon.asm',
'../../third_party/aom/aom_dsp/arm/idct8x8_1_add_neon.asm',
'../../third_party/aom/aom_dsp/arm/idct8x8_add_neon.asm',
'../../third_party/aom/aom_dsp/arm/idct32x32_1_add_neon_asm.asm',
'../../third_party/aom/aom_dsp/arm/idct32x32_add_neon_asm.asm',
'../../third_party/aom/aom_dsp/arm/idct4x4_1_add_neon_asm.asm',
'../../third_party/aom/aom_dsp/arm/idct4x4_add_neon_asm.asm',
'../../third_party/aom/aom_dsp/arm/idct8x8_1_add_neon_asm.asm',
'../../third_party/aom/aom_dsp/arm/idct8x8_add_neon_asm.asm',
'../../third_party/aom/aom_dsp/arm/intrapred_neon.c',
'../../third_party/aom/aom_dsp/arm/intrapred_neon_asm.asm',
'../../third_party/aom/aom_dsp/arm/sad4d_neon.c',

0
third_party/aom/aom_dsp/arm/idct16x16_1_add_neon.asm → third_party/aom/aom_dsp/arm/idct16x16_1_add_neon_asm.asm vendored
View File

0
third_party/aom/aom_dsp/arm/idct16x16_add_neon.asm → third_party/aom/aom_dsp/arm/idct16x16_add_neon_asm.asm vendored
View File

0
third_party/aom/aom_dsp/arm/idct32x32_1_add_neon.asm → third_party/aom/aom_dsp/arm/idct32x32_1_add_neon_asm.asm vendored
View File

0
third_party/aom/aom_dsp/arm/idct32x32_add_neon.asm → third_party/aom/aom_dsp/arm/idct32x32_add_neon_asm.asm vendored
View File

0
third_party/aom/aom_dsp/arm/idct4x4_1_add_neon.asm → third_party/aom/aom_dsp/arm/idct4x4_1_add_neon_asm.asm vendored
View File

0
third_party/aom/aom_dsp/arm/idct4x4_add_neon.asm → third_party/aom/aom_dsp/arm/idct4x4_add_neon_asm.asm vendored
View File

0
third_party/aom/aom_dsp/arm/idct8x8_1_add_neon.asm → third_party/aom/aom_dsp/arm/idct8x8_1_add_neon_asm.asm vendored
View File

0
third_party/aom/aom_dsp/arm/idct8x8_add_neon.asm → third_party/aom/aom_dsp/arm/idct8x8_add_neon_asm.asm vendored
View File

0
third_party/aom/aom_dsp/arm/loopfilter_16_neon.asm → third_party/aom/aom_dsp/arm/loopfilter_16_neon_asm.asm vendored
View File

0
third_party/aom/aom_dsp/arm/loopfilter_4_neon.asm → third_party/aom/aom_dsp/arm/loopfilter_4_neon_asm.asm vendored
View File

0
third_party/aom/aom_dsp/arm/loopfilter_8_neon.asm → third_party/aom/aom_dsp/arm/loopfilter_8_neon_asm.asm vendored
View File

0
third_party/aom/aom_dsp/x86/highbd_intrapred_sse2.asm → third_party/aom/aom_dsp/x86/highbd_intrapred_sse2_asm.asm vendored
View File

0
third_party/aom/aom_dsp/x86/intrapred_sse2.asm → third_party/aom/aom_dsp/x86/intrapred_sse2_asm.asm vendored
View File

0
third_party/aom/aom_dsp/x86/intrapred_ssse3.asm → third_party/aom/aom_dsp/x86/intrapred_ssse3_asm.asm vendored
View File