From d9bf2845cfad2a1ef77e6074fc92a5dc3cf03faa Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Mon, 9 May 2016 16:35:58 +0200 Subject: ffmpeg: backport configuration fix for MIPS32 | error: '-mips32r2' conflicts with the other architecture options, which specify a mips32 processor Signed-off-by: Andreas Oberritter --- ...uild-fix-for-P5600-with-mips-code-restruc.patch | 316 +++++++++++++++++++++ meta/recipes-multimedia/ffmpeg/ffmpeg_3.0.bb | 3 +- 2 files changed, 318 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg-3.0/0001-configure-build-fix-for-P5600-with-mips-code-restruc.patch (limited to 'meta') diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg-3.0/0001-configure-build-fix-for-P5600-with-mips-code-restruc.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg-3.0/0001-configure-build-fix-for-P5600-with-mips-code-restruc.patch new file mode 100644 index 0000000000..075338bbce --- /dev/null +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg-3.0/0001-configure-build-fix-for-P5600-with-mips-code-restruc.patch @@ -0,0 +1,316 @@ +Upstream-Status: Backport [3.0.2] + +Signed-off-by: Andreas Oberritter + +From 83eaaae0057fc471a621a2c1bf1e95e4ab27484f Mon Sep 17 00:00:00 2001 +From: Shivraj Patil +Date: Tue, 26 Apr 2016 12:17:15 +0530 +Subject: [PATCH] configure: build fix for P5600 with mips code restructuring + +Note:- backporting commit 15ef98afd10b3696d29fb6d19606ba03a9dd47ad from head + +Signed-off-by: Shivraj Patil +Signed-off-by: Michael Niedermayer +--- + configure | 252 ++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 120 insertions(+), 132 deletions(-) + +diff --git a/configure b/configure +index 475c087..9103e85 100755 +--- a/configure ++++ b/configure +@@ -913,6 +913,25 @@ void foo(void){ __asm__ volatile($code); } + EOF + } + ++check_inline_asm_flags(){ ++ log check_inline_asm_flags "$@" ++ name="$1" ++ code="$2" ++ flags='' ++ shift 2 ++ while [ "$1" != "" ]; do ++ append flags $1 ++ shift ++ done; ++ disable $name ++ cat > $TMPC <