From 988f625f168ef5ce2356668584766896777e1377 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 5 Aug 2013 18:08:23 +0100 Subject: [PATCH] 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 \ SRC_URI[md5sum] = "7f5beacaf1312db2db30a026b36888c4" SRC_URI[sha256sum] = "76fca05b08e00134e3cb92fa347507f42cbd48ddb08ed3343a912def187fbb62" -PR = "r4" +PR = "r7" GSTREAMER_DEBUG ?= "--disable-debug" @@ -45,6 +45,10 @@ FFMPEG_EXTRA_CONFIGURE_COMMON = \ EXTRA_OECONF = "${FFMPEG_EXTRA_CONFIGURE_COMMON}" +PACKAGECONFIG ??= "external-libav" +PACKAGECONFIG[external-libav] = "--with-system-ffmpeg,,libav" +PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc" + # yasm not found, use --disable-yasm for a crippled build for libav EXTRA_OECONF_append_x86-64 = " --disable-yasm " EXTRA_OECONF_append_x86 = " --disable-yasm "