summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYao Zhao <yao.zhao@windriver.com>2012-08-08 14:49:40 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-15 14:26:39 +0100
commit07faf2078d505f7734388c114953ca71e0242899 (patch)
tree149f9b9c947e9690e9c8f4acf0d2a23a227f2996
parent1834db1ddd02887238144728fc90c50b4805071c (diff)
downloadpoky-07faf2078d505f7734388c114953ca71e0242899.tar.gz
gstreamer: gst-ffmpeg: fix build issues for libav
1.The included libav configure is not generated by autotools modify recipe to use correct toolchain wrapper with configure 2.add bzip2 dependency explicitly. or configure will detect whether libbz2 is installed, if bzip2 is triggered earlier then it will be detected, if not then won't 3.backport libav_e500mc.patch from upstream to patch configure to disable-altivec if it is e500mc. 4.move the GSTREAMER_DEBUG to libav's configure, it is not the option for the main configure. (From OE-Core rev: a6384b2bd1d608506557ce151135edffa4cb5e0b) Signed-off-by: Yao Zhao <yao.zhao@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/libav_e500mc.patch21
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb16
2 files changed, 34 insertions, 3 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/libav_e500mc.patch b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/libav_e500mc.patch
new file mode 100644
index 0000000000..eba4988031
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/libav_e500mc.patch
@@ -0,0 +1,21 @@
1diff --git a/gst-libs/ext/libav/configure b/gst-libs/ext/libav/configure
2index 8473069..4f74952 100755
3--- a/gst-libs/ext/libav/configure
4+++ b/gst-libs/ext/libav/configure
5Fix gst-ffmpeg build issues for libav on e500mc (fsl-p4080)
6
7Upstream-Status: Backport
8
9Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
10
11@@ -2210,6 +2210,10 @@ elif enabled ppc; then
12 cpuflags="-mcpu=cell"
13 enable ldbrx
14 ;;
15+ e500mc)
16+ cpuflags="-mcpu=e500mc"
17+ disable altivec
18+ ;;
19 e500v2)
20 cpuflags="-mcpu=8548 -mhard-float -mfloat-gprs=double"
21 disable altivec
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 a166290cfc..efab2cf4af 100644
--- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
11 file://gst-libs/ext/libav/COPYING.LGPLv2.1;md5=e344c8fa836c3a41c4cbd79d7bd3a379 \ 11 file://gst-libs/ext/libav/COPYING.LGPLv2.1;md5=e344c8fa836c3a41c4cbd79d7bd3a379 \
12 file://gst-libs/ext/libav/COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" 12 file://gst-libs/ext/libav/COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
13HOMEPAGE = "http://www.gstreamer.net/" 13HOMEPAGE = "http://www.gstreamer.net/"
14DEPENDS = "gstreamer gst-plugins-base zlib" 14DEPENDS = "gstreamer gst-plugins-base zlib bzip2"
15 15
16inherit autotools pkgconfig 16inherit autotools pkgconfig
17 17
@@ -19,15 +19,25 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2 \
19 file://lower-rank.diff \ 19 file://lower-rank.diff \
20 file://configure-fix.patch \ 20 file://configure-fix.patch \
21 file://h264_qpel_mmx.patch \ 21 file://h264_qpel_mmx.patch \
22 file://libav_e500mc.patch \
22" 23"
23 24
24SRC_URI[md5sum] = "7f5beacaf1312db2db30a026b36888c4" 25SRC_URI[md5sum] = "7f5beacaf1312db2db30a026b36888c4"
25SRC_URI[sha256sum] = "76fca05b08e00134e3cb92fa347507f42cbd48ddb08ed3343a912def187fbb62" 26SRC_URI[sha256sum] = "76fca05b08e00134e3cb92fa347507f42cbd48ddb08ed3343a912def187fbb62"
26 27
27PR = "r3" 28PR = "r4"
28 29
29GSTREAMER_DEBUG ?= "--disable-debug" 30GSTREAMER_DEBUG ?= "--disable-debug"
30EXTRA_OECONF = "--with-ffmpeg-extra-configure=\"--target-os=linux\" ${GSTREAMER_DEBUG}" 31
32FFMPEG_EXTRA_CONFIGURE = "--with-ffmpeg-extra-configure"
33FFMPEG_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux \
34 --cc='${CC}' --as='${CC}' --ld='${CC}' --nm='${NM}' --ar='${AR}' \
35 --ranlib='${RANLIB}' \
36 ${GSTREAMER_DEBUG}"
37FFMPEG_EXTRA_CONFIGURE_COMMON = \
38'${FFMPEG_EXTRA_CONFIGURE}="${FFMPEG_EXTRA_CONFIGURE_COMMON_ARG}"'
39
40EXTRA_OECONF = "${FFMPEG_EXTRA_CONFIGURE_COMMON}"
31 41
32# yasm not found, use --disable-yasm for a crippled build for libav 42# yasm not found, use --disable-yasm for a crippled build for libav
33EXTRA_OECONF_append_x86-64 = " --disable-yasm " 43EXTRA_OECONF_append_x86-64 = " --disable-yasm "