summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-04-20 11:20:27 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-11 16:59:18 +0100
commit0bec7a977ab3f4eecbceee9c447f9560688d80c5 (patch)
treef91e60dcb817c1ceeefea5dcba67526c82f4e4fe /meta
parent63bafcca5d4c0b5d6481f5f64fe2c9d1f3d9e6fe (diff)
downloadpoky-0bec7a977ab3f4eecbceee9c447f9560688d80c5.tar.gz
gstreamer1.0-libav: Fix build with gcc7
(From OE-Core rev: 828a7dd0a7f2a02118a97ece49ae35d1b0bc4611) 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/0001-configure-check-for-armv7ve-variant.patch35
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.10.4.bb12
2 files changed, 41 insertions, 6 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-configure-check-for-armv7ve-variant.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-configure-check-for-armv7ve-variant.patch
new file mode 100644
index 0000000000..b80d073946
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-configure-check-for-armv7ve-variant.patch
@@ -0,0 +1,35 @@
1From aac5902d3c9cb35c771e760d0e487622aa2e116a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 20 Apr 2017 10:38:18 -0700
4Subject: [PATCH] configure: check for armv7ve variant
5
6OE passes -mcpu and -march via cmdline and if
7package tries to detect one of it own then it
8should be compatible otherwise, newer gcc7+ will
9error out
10
11Check for relevant preprocessor macro to determine
12armv7ve architecture
13
14Upstream-Status: Pending
15
16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17---
18 gst-libs/ext/libav/configure | 1 +
19 1 file changed, 1 insertion(+)
20
21diff --git a/gst-libs/ext/libav/configure b/gst-libs/ext/libav/configure
22index 4a5e477..727818e 100755
23--- a/gst-libs/ext/libav/configure
24+++ b/gst-libs/ext/libav/configure
25@@ -4295,6 +4295,7 @@ elif enabled arm; then
26 elif check_arm_arch 6Z; then echo armv6z
27 elif check_arm_arch 6ZK; then echo armv6zk
28 elif check_arm_arch 6T2; then echo armv6t2
29+ elif check_arm_arch EXT_IDIV; then echo armv7ve
30 elif check_arm_arch 7; then echo armv7
31 elif check_arm_arch 7A 7_A; then echo armv7-a
32 elif check_arm_arch 7S; then echo armv7-a
33--
342.12.2
35
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.10.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.10.4.bb
index 59d81db03a..e4bb477c7a 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.10.4.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.10.4.bb
@@ -8,12 +8,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
8 file://gst-libs/ext/libav/COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \ 8 file://gst-libs/ext/libav/COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \
9 file://gst-libs/ext/libav/COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" 9 file://gst-libs/ext/libav/COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
10 10
11SRC_URI = " \ 11SRC_URI = "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 \ 12 file://0001-Disable-yasm-for-libav-when-disable-yasm.patch \
13 file://0001-Disable-yasm-for-libav-when-disable-yasm.patch \ 13 file://workaround-to-build-gst-libav-for-i586-with-gcc.patch \
14 file://workaround-to-build-gst-libav-for-i586-with-gcc.patch \ 14 file://mips64_cpu_detection.patch \
15 file://mips64_cpu_detection.patch \ 15 file://0001-configure-check-for-armv7ve-variant.patch \
16" 16 "
17SRC_URI[md5sum] = "e2bdd9fde6ca3ff7efffb93df121f4fd" 17SRC_URI[md5sum] = "e2bdd9fde6ca3ff7efffb93df121f4fd"
18SRC_URI[sha256sum] = "6ca0feca75e3d48315e07f20ec37cf6260ed1e9dde58df355febd5016246268b" 18SRC_URI[sha256sum] = "6ca0feca75e3d48315e07f20ec37cf6260ed1e9dde58df355febd5016246268b"
19 19