diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2020-01-18 11:34:21 +0100 |
|---|---|---|
| committer | Andrei Gherzan <andrei@gherzan.ro> | 2020-01-24 12:09:42 +0000 |
| commit | 2faf9cab726d1c11ec3bc70159fe7a5f45705b36 (patch) | |
| tree | bd97ec954df74ddf66351f1e67334d238d75efa9 | |
| parent | 51bb38b728a1f7805620b518014eb21456e6751e (diff) | |
| download | meta-raspberrypi-2faf9cab726d1c11ec3bc70159fe7a5f45705b36.tar.gz | |
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 <Martin.Jansa@gmail.com>
| -rw-r--r-- | conf/machine/include/rpi-default-providers.inc | 3 | ||||
| -rw-r--r-- | 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 | |||
| 8 | PREFERRED_PROVIDER_virtual/mesa ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "mesa-gl", d)}" | 8 | PREFERRED_PROVIDER_virtual/mesa ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "mesa-gl", d)}" |
| 9 | PREFERRED_PROVIDER_virtual/libgbm ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "mesa-gl", d)}" | 9 | PREFERRED_PROVIDER_virtual/libgbm ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "mesa-gl", d)}" |
| 10 | PREFERRED_PROVIDER_jpeg ?= "jpeg" | 10 | PREFERRED_PROVIDER_jpeg ?= "jpeg" |
| 11 | |||
| 12 | PREFERRED_PROVIDER_virtual/libomxil ?= "userland" | ||
| 13 | 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 @@ | |||
| 1 | DEPENDS_append_rpi = " userland" | ||
| 2 | GSTREAMER_1_0_OMX_TARGET_rpi = "rpi" | 1 | GSTREAMER_1_0_OMX_TARGET_rpi = "rpi" |
| 3 | GSTREAMER_1_0_OMX_CORE_NAME_rpi = "${libdir}/libopenmaxil.so" | 2 | GSTREAMER_1_0_OMX_CORE_NAME_rpi = "${libdir}/libopenmaxil.so" |
| 4 | # How to make this RPI specific? | 3 | EXTRA_OEMESON_append_rpi = " -Dheader_path=${STAGING_DIR_TARGET}/usr/include" |
| 5 | 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"" | 4 | CFLAGS_append_rpi = " \ |
| 6 | #examples only build with GL but not GLES, so disable it for RPI | 5 | -I${STAGING_DIR_TARGET}/usr/include/IL \ |
| 7 | EXTRA_OECONF_append_rpi = " --disable-examples" | 6 | -I${STAGING_DIR_TARGET}/usr/include/interface/vcos/pthreads \ |
| 8 | 7 | -I${STAGING_DIR_TARGET}/usr/include/interface/vmcs_host/linux \ | |
| 9 | RDEPENDS_${PN}_append_rpi = " userland" | 8 | " |