From 33970796d81fad328368d7b015077dd81e7e255b Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 30 May 2013 13:52:42 +0300 Subject: Include ffmpeg gstreamer plugin to image FFmpeg provides more video decoding capabilities. Needed some hacks to keep mesa from getting pulled in. Change-Id: I1129d08cc61ad39154cb2f76d656d9dfc0a3075f Reviewed-by: Samuli Piippo --- conf/distro/b2qt.conf | 2 ++ recipes/images/b2qt-embedded-image.bb | 1 + recipes/libgles/libgles-omap3_4.05.00.03.bbappend | 2 ++ 3 files changed, 5 insertions(+) diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index 07bf5da..61c4442 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf @@ -14,6 +14,8 @@ SANITY_TESTED_DISTROS += " \ include conf/distro/include/image_type.conf +PREFERRED_PROVIDER_virtual/libgl_omap3 = "libgles-omap3" + SYSVINIT_ENABLED_GETTYS = "" DISTRO_FEATURES ?= "alsa argp bluetooth ext2 largefile usbgadget usbhost wifi xattr nfs nfc ${DISTRO_FEATURES_LIBC}" diff --git a/recipes/images/b2qt-embedded-image.bb b/recipes/images/b2qt-embedded-image.bb index c41749e..494b433 100644 --- a/recipes/images/b2qt-embedded-image.bb +++ b/recipes/images/b2qt-embedded-image.bb @@ -41,6 +41,7 @@ GSTREAMER_EXTRA_INSTALL = "\ gst-plugins-ugly-rmdemux \ gst-plugins-ugly-asf \ gst-plugins-ugly-a52dec \ + gst-ffmpeg \ " TOOLS_EXTRA_INSTALL = "\ diff --git a/recipes/libgles/libgles-omap3_4.05.00.03.bbappend b/recipes/libgles/libgles-omap3_4.05.00.03.bbappend index 9985abb..0855a77 100644 --- a/recipes/libgles/libgles-omap3_4.05.00.03.bbappend +++ b/recipes/libgles/libgles-omap3_4.05.00.03.bbappend @@ -5,6 +5,8 @@ TOOLCHAIN_PATH = "${STAGING_DIR_TARGET}" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += " file://0001-Add-GLchar-typedef.patch" +PROVIDES += "virtual/libgl" + LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1" pkg_postinst_${PN}_append() { -- cgit v1.2.3-54-g00ecf