summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJesse Zhang <sen.zhang@windriver.com>2013-06-24 09:44:55 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-25 17:44:56 +0100
commitf9eb8038df94bae6fc45059ea2422a12b373ed25 (patch)
tree0e5a5dc77b4e48a18efd6c9469f95d5b2a30c780 /meta
parent44c5b770ab11d0020cd6fff8936215d627d483e9 (diff)
downloadpoky-f9eb8038df94bae6fc45059ea2422a12b373ed25.tar.gz
gst-ffmpeg: fix libav config error for ppc
Pass --cpu to libav config when we're building ppc, or else there are errors like: You need a compiler that supports {} in AltiVec vector declarations. Also patch libav configure to have knowledge of more ppc CPUs. (From OE-Core rev: a825781fc822f4630bc29906ca1ca79b8fad4836) Signed-off-by: Jesse Zhang <sen.zhang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/libav_e5500.patch19
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb7
2 files changed, 25 insertions, 1 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/libav_e5500.patch b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/libav_e5500.patch
new file mode 100644
index 0000000000..d9ea2c29e0
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/libav_e5500.patch
@@ -0,0 +1,19 @@
1libav: Add configs for ppc e5500
2
3Upstream-Status: Pending
4
5Signed-off-by: Jesse Zhang <sen.zhang@windriver.com>
6
7--- gst-ffmpeg-0.10.13/gst-libs/ext/libav/configure 2013-06-20 05:18:36.073104964 -0400
8+++ gst-ffmpeg-0.10.13/gst-libs/ext/libav/configure 2013-06-20 05:18:38.269104150 -0400
9@@ -2222,6 +2222,10 @@
10 cpuflags="-mcpu=8540 -mhard-float"
11 disable altivec
12 ;;
13+ e5500)
14+ cpuflags="-mcpu=e5500 -mhard-float"
15+ disable altivec
16+ ;;
17 esac
18
19 elif enabled x86; then
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb
index 2107704618..8605ca46b9 100644
--- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb
@@ -21,6 +21,7 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2 \
21 file://configure-fix.patch \ 21 file://configure-fix.patch \
22 file://h264_qpel_mmx.patch \ 22 file://h264_qpel_mmx.patch \
23 file://libav_e500mc.patch \ 23 file://libav_e500mc.patch \
24 file://libav_e5500.patch \
24" 25"
25 26
26SRC_URI[md5sum] = "7f5beacaf1312db2db30a026b36888c4" 27SRC_URI[md5sum] = "7f5beacaf1312db2db30a026b36888c4"
@@ -31,7 +32,11 @@ PR = "r4"
31GSTREAMER_DEBUG ?= "--disable-debug" 32GSTREAMER_DEBUG ?= "--disable-debug"
32 33
33FFMPEG_EXTRA_CONFIGURE = "--with-ffmpeg-extra-configure" 34FFMPEG_EXTRA_CONFIGURE = "--with-ffmpeg-extra-configure"
34FFMPEG_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux \ 35# pass --cpu for powerpc. get cpu name by stripping "ppc" or "ppc64"
36# from DEFAULTTUNE
37FFMPEG_CPU_powerpc = "--cpu=${@d.getVar('DEFAULTTUNE')[3:]}"
38FFMPEG_CPU_powerpc64 = "--cpu=${@d.getVar('DEFAULTTUNE')[5:]}"
39FFMPEG_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux ${FFMPEG_CPU} \
35 --cc='${CC}' --as='${CC}' --ld='${CC}' --nm='${NM}' --ar='${AR}' \ 40 --cc='${CC}' --as='${CC}' --ld='${CC}' --nm='${NM}' --ar='${AR}' \
36 --ranlib='${RANLIB}' \ 41 --ranlib='${RANLIB}' \
37 ${GSTREAMER_DEBUG}" 42 ${GSTREAMER_DEBUG}"