summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-08-05 18:08:23 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-13 23:05:58 +0100
commit988f625f168ef5ce2356668584766896777e1377 (patch)
tree870c470e7480b13d84335f92c773205d72b956a6 /meta
parent4acdab05e980302fe239a229fcf738501147cf9a (diff)
downloadpoky-988f625f168ef5ce2356668584766896777e1377.tar.gz
gst-ffmpeg: merge in bbappend from meta-oe
* Enable external libav for better optimisations/additional bugfixes (internal ffmpeg copy is quite old), default enabled but can be disabled using PACKAGECONFIG * Add a PACKAGECONFIG for orc, disabled by default in line with other gstreamer recipes * Bump PR to r7 so the bbappend can be dropped without PR going backwards (From OE-Core rev: aab668fbba25d3e590e4182224b7b064d7705c5b) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.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.bb6
1 files changed, 5 insertions, 1 deletions
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 8605ca46b9..d3f2b3eee1 100644
--- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb
@@ -27,7 +27,7 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2 \
27SRC_URI[md5sum] = "7f5beacaf1312db2db30a026b36888c4" 27SRC_URI[md5sum] = "7f5beacaf1312db2db30a026b36888c4"
28SRC_URI[sha256sum] = "76fca05b08e00134e3cb92fa347507f42cbd48ddb08ed3343a912def187fbb62" 28SRC_URI[sha256sum] = "76fca05b08e00134e3cb92fa347507f42cbd48ddb08ed3343a912def187fbb62"
29 29
30PR = "r4" 30PR = "r7"
31 31
32GSTREAMER_DEBUG ?= "--disable-debug" 32GSTREAMER_DEBUG ?= "--disable-debug"
33 33
@@ -45,6 +45,10 @@ FFMPEG_EXTRA_CONFIGURE_COMMON = \
45 45
46EXTRA_OECONF = "${FFMPEG_EXTRA_CONFIGURE_COMMON}" 46EXTRA_OECONF = "${FFMPEG_EXTRA_CONFIGURE_COMMON}"
47 47
48PACKAGECONFIG ??= "external-libav"
49PACKAGECONFIG[external-libav] = "--with-system-ffmpeg,,libav"
50PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc"
51
48# yasm not found, use --disable-yasm for a crippled build for libav 52# yasm not found, use --disable-yasm for a crippled build for libav
49EXTRA_OECONF_append_x86-64 = " --disable-yasm " 53EXTRA_OECONF_append_x86-64 = " --disable-yasm "
50EXTRA_OECONF_append_x86 = " --disable-yasm " 54EXTRA_OECONF_append_x86 = " --disable-yasm "