summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-12-20 00:47:01 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-22 08:50:17 +0000
commit01fe67b1b367bb1d2936a0810f1249a76adf305f (patch)
tree562f143ea1af35b5e3ba57cefc3200f396dff8f4 /meta
parent77f008c4bc44cb851fca9b7d30cecbfb7be03cb8 (diff)
downloadpoky-01fe67b1b367bb1d2936a0810f1249a76adf305f.tar.gz
gstreamer1.0-libav: Fix build on mips64
(From OE-Core rev: 8a024cb82b1718be51bd3a625364539ba50ae4ae) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/mips64_cpu_detection.patch32
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.10.1.bb1
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/mips64_cpu_detection.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/mips64_cpu_detection.patch
new file mode 100644
index 0000000000..7a0b448888
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/mips64_cpu_detection.patch
@@ -0,0 +1,32 @@
1It will add -mips64r6 and -mips64r2 to cmdline which will
2cause conflicts
3
4in OE we user mips32r2 and mips64r2 for mips arch versions
5so there is no benefit of detecting it automatically by
6poking at tools especially in cross env
7
8Fixes errors like
9
10linking -mnan=2008 module with previous -mnan=legacy modules
11failed to merge target specific data of file
12
13-Khem
14Upstream-Status: Inappropriate [OE-Specific]
15
16Index: gst-libav-1.10.1/gst-libs/ext/libav/configure
17===================================================================
18--- gst-libav-1.10.1.orig/gst-libs/ext/libav/configure
19+++ gst-libav-1.10.1/gst-libs/ext/libav/configure
20@@ -5269,12 +5269,9 @@ elif enabled mips; then
21
22 # Enable minimum ISA based on selected options
23 if enabled mips64; then
24- enabled mips64r6 && check_inline_asm_flags mips64r6 '"dlsa $0, $0, $0, 1"' '-mips64r6'
25 enabled mips64r2 && check_inline_asm_flags mips64r2 '"dext $0, $0, 0, 1"' '-mips64r2'
26 disabled mips64r6 && disabled mips64r2 && check_inline_asm_flags mips64r1 '"daddi $0, $0, 0"' '-mips64'
27 else
28- enabled mips32r6 && check_inline_asm_flags mips32r6 '"aui $0, $0, 0"' '-mips32r6'
29- enabled mips32r5 && check_inline_asm_flags mips32r5 '"eretnc"' '-mips32r5'
30 enabled mips32r2 && check_inline_asm_flags mips32r2 '"ext $0, $0, 0, 1"' '-mips32r2'
31 disabled mips32r6 && disabled mips32r5 && disabled mips32r2 && check_inline_asm_flags mips32r1 '"addi $0, $0, 0"' '-mips32'
32 fi
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.10.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.10.1.bb
index 98f5a50a9a..d44a5b24cb 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.10.1.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.10.1.bb
@@ -12,6 +12,7 @@ SRC_URI = " \
12 http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz \ 12 http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz \
13 file://0001-Disable-yasm-for-libav-when-disable-yasm.patch \ 13 file://0001-Disable-yasm-for-libav-when-disable-yasm.patch \
14 file://workaround-to-build-gst-libav-for-i586-with-gcc.patch \ 14 file://workaround-to-build-gst-libav-for-i586-with-gcc.patch \
15 file://mips64_cpu_detection.patch \
15" 16"
16SRC_URI[md5sum] = "9dc8fb8dd01818c27230a1ed6ba9f4de" 17SRC_URI[md5sum] = "9dc8fb8dd01818c27230a1ed6ba9f4de"
17SRC_URI[sha256sum] = "27b28b8de0e6dff1e3952428e8ed8ba4a12f452f789ac0ae9bbe50f00a5c72c7" 18SRC_URI[sha256sum] = "27b28b8de0e6dff1e3952428e8ed8ba4a12f452f789ac0ae9bbe50f00a5c72c7"