diff options
| author | James Cowgill <jcowgill@debian.org> | 2019-09-01 13:29:45 +0100 |
|---|---|---|
| committer | James Cowgill <jcowgill@debian.org> | 2019-09-01 13:29:45 +0100 |
| commit | 68d493499bcb105b1ffadf19582c4a6b0798e887 (patch) | |
| tree | 1047e54068447f4f40e0476a23b06fd9e7a2c372 | |
| parent | bfc103b5a2d45f923ed190e4b58ba0cf05ee9688 (diff) | |
Commit Debian 3.0 (quilt) metadatadebian/1.0.0.errata1-2archive/debian/1.0.0.errata1-2
[dgit (9.7) quilt-fixup]
| -rw-r--r-- | debian/patches/debian-changes | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes index 9174e57d0..fdb18777c 100644 --- a/debian/patches/debian-changes +++ b/debian/patches/debian-changes @@ -699,6 +699,24 @@ A single combined diff, containing all the changes, follows. +text aom_noise_model_update +text aom_wb_write_literal +text aom_wb_write_unsigned_literal +--- aom-1.0.0.errata1.orig/av1/av1.cmake ++++ aom-1.0.0.errata1/av1/av1.cmake +@@ -421,13 +421,13 @@ function(setup_av1_targets) + + if(HAVE_NEON) + if(AOM_AV1_COMMON_INTRIN_NEON) +- add_intrinsics_object_library("${AOM_INTRIN_NEON_FLAG}" "neon" ++ add_intrinsics_object_library("${AOM_NEON_INTRIN_FLAG}" "neon" + "aom_av1_common" + "AOM_AV1_COMMON_INTRIN_NEON" "aom") + endif() + + if(AOM_AV1_ENCODER_INTRIN_NEON) +- add_intrinsics_object_library("${AOM_INTRIN_NEON_FLAG}" "neon" ++ add_intrinsics_object_library("${AOM_NEON_INTRIN_FLAG}" "neon" + "aom_av1_encoder" + "AOM_AV1_ENCODER_INTRIN_NEON" "aom") + endif() --- aom-1.0.0.errata1.orig/av1/common/ppc/cfl_ppc.c +++ aom-1.0.0.errata1/av1/common/ppc/cfl_ppc.c @@ -24,19 +24,21 @@ @@ -925,3 +943,25 @@ A single combined diff, containing all the changes, follows. - file(APPEND "${aom_sym_file}" " };") + file(APPEND "${aom_sym_file}" " \nlocal:\n *;\n};") endif() +--- aom-1.0.0.errata1.orig/build/cmake/toolchains/armv7-linux-gcc.cmake ++++ aom-1.0.0.errata1/build/cmake/toolchains/armv7-linux-gcc.cmake +@@ -28,16 +28,13 @@ endif() + set(CMAKE_C_COMPILER ${CROSS}gcc) + set(CMAKE_CXX_COMPILER ${CROSS}g++) + set(AS_EXECUTABLE ${CROSS}as) +-set(CMAKE_C_COMPILER_ARG1 +- "-march=armv7-a -mfpu=neon ${AOM_EXTRA_TOOLCHAIN_FLAGS}") +-set(CMAKE_CXX_COMPILER_ARG1 +- "-march=armv7-a -mfpu=neon ${AOM_EXTRA_TOOLCHAIN_FLAGS}") ++set(CMAKE_C_COMPILER_ARG1 "-march=armv7-a ${AOM_EXTRA_TOOLCHAIN_FLAGS}") ++set(CMAKE_CXX_COMPILER_ARG1 "-march=armv7-a ${AOM_EXTRA_TOOLCHAIN_FLAGS}") + set(AOM_AS_FLAGS --defsym ARCHITECTURE=7 -march=armv7-a -mfpu=neon + ${AOM_EXTRA_TOOLCHAIN_FLAGS}) + set(CMAKE_SYSTEM_PROCESSOR "armv7") + +-# No intrinsics flag required for armv7-linux-gcc. +-set(AOM_NEON_INTRIN_FLAG "") ++set(AOM_NEON_INTRIN_FLAG "-mfpu=neon") + + # No runtime cpu detect for armv7-linux-gcc. + set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE NUMBER "") |