From 2faf9cab726d1c11ec3bc70159fe7a5f45705b36 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 18 Jan 2020 11:34:21 +0100 Subject: gstreamer1.0-omx: let virtual/libomxil dependency to pull userland * and adjust VIRTUAL-RUNTIME_libomxil to pull runtime provider for libomxil Signed-off-by: Martin Jansa --- conf/machine/include/rpi-default-providers.inc | 3 +++ recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend | 13 ++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/conf/machine/include/rpi-default-providers.inc b/conf/machine/include/rpi-default-providers.inc index 5231a84..d5785fa 100644 --- a/conf/machine/include/rpi-default-providers.inc +++ b/conf/machine/include/rpi-default-providers.inc @@ -8,3 +8,6 @@ PREFERRED_PROVIDER_virtual/libgl ?= "${@bb.utils.contains("MACHINE_FEATURES", "v PREFERRED_PROVIDER_virtual/mesa ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "mesa-gl", d)}" PREFERRED_PROVIDER_virtual/libgbm ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "mesa-gl", d)}" PREFERRED_PROVIDER_jpeg ?= "jpeg" + +PREFERRED_PROVIDER_virtual/libomxil ?= "userland" +VIRTUAL-RUNTIME_libomxil = "userland" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend index f892c66..a7aa8d9 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend +++ b/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend @@ -1,9 +1,8 @@ -DEPENDS_append_rpi = " userland" GSTREAMER_1_0_OMX_TARGET_rpi = "rpi" GSTREAMER_1_0_OMX_CORE_NAME_rpi = "${libdir}/libopenmaxil.so" -# How to make this RPI specific? -EXTRA_OECONF_append_rpi = " CFLAGS="$CFLAGS -I${STAGING_DIR_TARGET}/usr/include/IL -I${STAGING_DIR_TARGET}/usr/include/interface/vcos/pthreads -I${STAGING_DIR_TARGET}/usr/include/interface/vmcs_host/linux"" -#examples only build with GL but not GLES, so disable it for RPI -EXTRA_OECONF_append_rpi = " --disable-examples" - -RDEPENDS_${PN}_append_rpi = " userland" +EXTRA_OEMESON_append_rpi = " -Dheader_path=${STAGING_DIR_TARGET}/usr/include" +CFLAGS_append_rpi = " \ + -I${STAGING_DIR_TARGET}/usr/include/IL \ + -I${STAGING_DIR_TARGET}/usr/include/interface/vcos/pthreads \ + -I${STAGING_DIR_TARGET}/usr/include/interface/vmcs_host/linux \ +" -- cgit v1.2.3-54-g00ecf