summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-12-26 12:09:53 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-27 22:50:01 +0000
commit545b58b9169aad38ad6c180b1fa690f878d6781a (patch)
tree5fab9ba37c11ba5dfb72fa69edcb6809e4970268
parentd6fd2a4a0fb437c4752091edefd080efe5399ea9 (diff)
downloadopenembedded-core-contrib-545b58b9169aad38ad6c180b1fa690f878d6781a.tar.gz
openembedded-core-contrib-545b58b9169aad38ad6c180b1fa690f878d6781a.tar.bz2
openembedded-core-contrib-545b58b9169aad38ad6c180b1fa690f878d6781a.zip
ffmpeg: Backport patch to fix build with gcc9
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/ffmpeg/ffmpeg/0001-postproc-postprocess_template-remove-FF_REG_sp-from-.patch31
-rw-r--r--meta/recipes-multimedia/ffmpeg/ffmpeg_4.0.2.bb1
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-postproc-postprocess_template-remove-FF_REG_sp-from-.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-postproc-postprocess_template-remove-FF_REG_sp-from-.patch
new file mode 100644
index 0000000000..83fb4b81af
--- /dev/null
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-postproc-postprocess_template-remove-FF_REG_sp-from-.patch
@@ -0,0 +1,31 @@
+From c1cbeb87db4bfc6e281e4254a6c7fdd3854fc9b9 Mon Sep 17 00:00:00 2001
+From: Michael Niedermayer <michael@niedermayer.cc>
+Date: Thu, 20 Dec 2018 22:40:06 +0100
+Subject: [PATCH] postproc/postprocess_template: remove FF_REG_sp from clobber
+ list
+
+Future gcc may no longer support this
+
+Upstream-Status: Backport [https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/c1cbeb87db4bfc6e281e4254a6c7fdd3854fc9b9]
+Tested-by: James Almer <jamrial@gmail.com>
+Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
+---
+ libpostproc/postprocess_template.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libpostproc/postprocess_template.c b/libpostproc/postprocess_template.c
+index 485eb5cfc0..b0adfd168c 100644
+--- a/libpostproc/postprocess_template.c
++++ b/libpostproc/postprocess_template.c
+@@ -1317,7 +1317,7 @@ DERING_CORE((%0, %1, 8) ,(%%FF_REGd, %1, 4),%%mm2,%%mm4,%%mm0,%%mm3,%%mm5,
+ "1: \n\t"
+ : : "r" (src), "r" ((x86_reg)stride), "m" (c->pQPb), "m"(c->pQPb2), "q"(tmp)
+ NAMED_CONSTRAINTS_ADD(deringThreshold,b00,b02,b08)
+- : "%"FF_REG_a, "%"FF_REG_d, "%"FF_REG_sp
++ : "%"FF_REG_a, "%"FF_REG_d
+ );
+ #else // HAVE_7REGS && (TEMPLATE_PP_MMXEXT || TEMPLATE_PP_3DNOW)
+ int y;
+--
+2.20.1
+
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.0.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.0.2.bb
index 7d1af04047..0c227b7fc9 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.0.2.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.0.2.bb
@@ -26,6 +26,7 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
file://mips64_cpu_detection.patch \
file://CVE-2018-15822.patch \
+ file://0001-postproc-postprocess_template-remove-FF_REG_sp-from-.patch \
"
SRC_URI[md5sum] = "ae0bfdf809306a212b4f0e6eb8d1c75e"
SRC_URI[sha256sum] = "a95c0cc9eb990e94031d2183f2e6e444cc61c99f6f182d1575c433d62afb2f97"