Commit Graph

23 Commits

Author SHA1 Message Date
Martin Jansa
2faf9cab72 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>
2020-01-24 12:09:42 +00:00
Martin Jansa
51bb38b728 gstreamer1.0-plugins-base: adapt to gstreamer1.0 now using meson
* depends on oe-core changes which adds dispmanx PACKAGECONFIG to gstreamer1.0-plugins-base

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2020-01-24 12:09:42 +00:00
Martin Jansa
6e84890e8c gstreamer1.0-plugins-base: respect opengl DISTRO_FEATURES when vc4graphics is in MACHINE_FEATURES
No virtual/egl provider is available in the default setup with
vc4graphics enabled and neither opengl nor vulkan in DISTRO_FEATURES:

$ bitbake -e virtual/egl | tee env.egl
ERROR: Nothing PROVIDES 'virtual/egl'
vc-graphics-hardfp PROVIDES virtual/egl but was skipped: PREFERRED_PROVIDER_virtual/libgles2 set to mesa, not vc-graphics-hardfp
vc-graphics PROVIDES virtual/egl but was skipped: PREFERRED_PROVIDER_virtual/libgles2 set to mesa, not vc-graphics

$ bitbake -e userland 2>&1 | tee env.userland
ERROR: Nothing RPROVIDES 'libegl-mesa' (but /jenkins/mjansa/build-ros/ros2-dashing-warrior/meta-raspberrypi/recipes-graphics/userland/userland_git.bb RDEPENDS on or otherwise requires it)
NOTE: Runtime target 'libegl-mesa' is unbuildable, removing...
Missing or unbuildable dependency chain was: ['libegl-mesa']
ERROR: Required build target 'userland' has no buildable providers.
Missing or unbuildable dependency chain was: ['userland', 'libegl-mesa']

$ bitbake -e mesa 2>&1 | tee env.mesa
ERROR: Nothing PROVIDES 'mesa'
mesa was skipped: one of 'vulkan opengl' needs to be in DISTRO_FEATURES

$ bitbake -e vc-graphics-hardfp 2>&1 | tee env.vc-graphics-hardfp
ERROR: Nothing PROVIDES 'vc-graphics-hardfp'
vc-graphics-hardfp was skipped: PREFERRED_PROVIDER_virtual/libgles2 set to mesa, not vc-graphics-hardfp

There is unbuildable dependency on virtual/egl from gstreamer1.0-plugins-base because:
1) gstreamer1.0-plugins-base depends on virtual/egl because of "egl" PACKAGECONFIG

2) "egl" PACKAGECONFIG is enabled by
   meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend
   PACKAGECONFIG_GL_rpi = "egl gles2"

   without respecting the "opengl" in DISTRO_FEATURES like the recipe in oe-core does
   openembedded-core/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.4.bb:
   PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2 egl', '', d)}"

3) virtual/egl is provided either by:
   - userland (only without vc4graphics in MACHINE_FEATURES):
     meta-raspberrypi/recipes-graphics/userland/userland_git.bb:PROVIDES += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "", "virtual/libgles2 virtual/egl", d)}"
   - mesa (selected with vc4graphics in MACHINE_FEATURES)
     meta-raspberrypi/conf/machine/include/rpi-default-providers.inc:PREFERRED_PROVIDER_virtual/egl ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "userland", d)}"
   - vc-graphics(-hardfp)
     meta-raspberrypirecipes-graphics/vc-graphics/vc-graphics.inc:PROVIDES = "virtual/libgles2 virtual/egl"

4) vc-graphics(-hardfp) recipe are skipped in default setup, because with vc4graphics being
   in MACHINE_FEATURES by default since:
   690bdca574
   the PREFERRED_PROVIDER_virtual/libgles2 is set to mesa in:
   conf/machine/include/rpi-default-providers.inc:PREFERRED_PROVIDER_virtual/libgles2 ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "userland", d)}"

   resulting in skipping the other virtual/libgles2 providers:
   vc-graphics-hardfp PROVIDES virtual/egl but was skipped: PREFERRED_PROVIDER_virtual/libgles2 set to mesa, not vc-graphics-hardfp
   vc-graphics PROVIDES virtual/egl but was skipped: PREFERRED_PROVIDER_virtual/libgles2 set to mesa, not vc-graphics

5) mesa is skipped when neither opengl nor vulkan are in DISTRO_FEATURES

6) userland doesn't provide virtual/egl because we have the default vc4graphics
   meta-raspberrypi/recipes-graphics/userland/userland_git.bb:PROVIDES += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "", "virtual/libgles2 virtual/egl", d)}"
   and it cannot be built anyway, because with the default vc4graphics it depends on libegl-mesa:
   meta-raspberrypi/recipes-graphics/userland/userland_git.bb:RDEPENDS_${PN} += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "libegl-mesa", "", d)}"
   and libegl-mesa is provided only by mesa recipe from oe-core which in turn
   requires either "opengl" or "vulkan" to be in DISTRO_FEATURES

This causes a lot of unresolved dependencies in default setup with vc4graphics but without opengl.
- with Yocto 2.6 Thud and older it worked, because vc4graphics wasn't enabled by default before:
  690bdca574

To build gstreamer1.0-plugins-base with egl PACKAGECONFIG enabled you have 2 options:
A) Just add "opengl" to DISTRO_FEATURES and use the default vc4graphics with mesa providing virtual/egl
B) Use DISABLE_VC4GRAPHICS added in
   96c8459c93
   to explicitly disable vc4graphics and use userland to provide virtual/egl

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2020-01-13 18:23:28 +00:00
Andrei Gherzan
36c3c2e7ca gstreamer1.0-omx: Forward port bbappend and patches to v1.16.x
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
2019-05-28 21:05:58 +01:00
Khem Raj
b38a77938a userland: Merge userland-nogl into userland itself
Control the installs via MACHINE_FEATURES and avoid almost duplicate
recipe

Adjust other recipes to depend on userland now

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-11-21 17:56:52 +02:00
Khem Raj
229363bbac gstreamer1.0-omx: Use rpi target and depend on userland-nogl
This ensures that it links to right userland libraries to get access to
accelarated video path

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-11-07 14:25:00 +00:00
Khem Raj
de597abc3b gstreamer1.0-plugins: App proper appends for base and bad plugins
This patch accounts for the fact that rpi dispmanx plugin migrated
from bad to base stating 1.14 release

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-05-22 21:38:09 +01:00
Khem Raj
bf2a07be69 gstreamer1.0-plugins-bad_%.bbappend: Drop --disable-dispmanx
1.14 does not support this option
Fixes
QA Issue: gstreamer1.0-plugins-bad: configure was passed unrecognised options: --disable-dispmanx [unknown-configure-option]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-05-14 10:35:04 +01:00
Khem Raj
5492c68403 gstreamer1.0-omx: Forward port bbappend to 1.14
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-05-12 11:16:15 +01:00
Hugo Hromic
415c1998a6 gstreamer1.0-omx: refresh and clean-up patches
fixes:

    WARNING: gstreamer1.0-omx-1.12.4-r0 do_patch:
    Some of the context lines in patches were ignored. This can lead to incorrectly applied patches.
    The context lines in the patches can be updated with devtool:

        devtool modify <recipe>
        devtool finish --force-patch-refresh <recipe> <layer_path>

    Then the updated patches and the source tree (in devtool's workspace)
    should be reviewed to make sure the patches apply in the correct place
    and don't introduce duplicate lines (which can, and does happen
    when some of the context is ignored). Further information:
    http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
    https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
    Details:
    Applying patch 0001-config-files-path.patch
    patching file config/bellagio/gstomx.conf
    Hunk #1 succeeded at 1 with fuzz 2.
    Hunk #2 succeeded at 9 with fuzz 2.
    patching file config/rpi/gstomx.conf
    Hunk #8 succeeded at 63 with fuzz 2.
    Hunk #10 succeeded at 82 with fuzz 2.
    Hunk #11 succeeded at 92 with fuzz 2.

    Now at patch 0001-config-files-path.patch

deleted obsolete `gstreamer1.0-omx` directory with duplicated patches that are also in `gstreamer1.0-omx-1.12`.
made file naming for `gstreamer1.0-omx_%.bbappend` consistent with the rest of the layer recipes.

Signed-off-by: Hugo Hromic <hhromic@gmail.com>
2018-03-23 11:44:45 +00:00
Maxin B. John
79ea44b997 gstreamer1.0-omx: remove unused patches
Remove the following unused patches:
 1. 0002-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch
 2. 0003-fix-decoder-flushing.patch

Signed-off-by: Maxin B. John <maxin.john@intel.com>
2018-03-08 21:57:25 +00:00
Khem Raj
1a06502656 gstreamer1.0-omx: Match with oe-core 1.12.x gstreamer
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2017-08-25 08:19:30 +01:00
Maxin B. John
ff914ff622 gstreamer1.0-omx: remove bbappend for version 1.2.0 and git
OE-Core rev: aa06a18d59eb391d1a7ace9daa0681bdf8daf17f
removed gstreamer1.0-omx_1.2.0 recipe.

OE-Core removed all gst git recipes as well

Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2017-03-11 04:39:13 -08:00
Khem Raj
7f99a4cb6d gstreamer1.0-omx: Add 1.10x support
Restructure the bbappends such that common portions
can be put in a common bbappend and version specific
bbappend then only do the patching

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2017-01-18 17:45:56 +01:00
Khem Raj
12aa27df80 gstreamer1.0-plugins-bad_%.bbappend: Set PACKAGECONFIG_GL for RPi
Enable dispmanx support if using bcm driver

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2016-11-08 10:08:58 +01:00
Khem Raj
2745399f75 gstreamer1.0-omx-1.2.0: Add patches and bbappend for 1.2.0 separately
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2016-07-13 12:40:41 +01:00
Khem Raj
f248d7cf8c gstreamer1.0-omx: Backports and fixes for smooth video playback
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2016-03-10 14:56:07 +01:00
Khem Raj
27445a1e4c gstreamer1.0-omx: Add raspberry pi optimization patches and config options
Patches from Hong Li <honglh@gmail.com>

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2016-03-10 14:54:43 +01:00
Jonathan Liu
20c8e6a5bc gstreamer1.0-plugins-bad: remove unrecognized configure option
The --with-egl-window-system=rpi configure option is not recognized
in the current version.

Signed-off-by: Jonathan Liu <net147@gmail.com>
2015-10-13 21:02:57 +02:00
Andrei Gherzan
e1d4448ce8 xserver-xf86-config: Use SOC specific assignements
In this way the modifications will be used on all RPI boards.

Change-Id: Ife10db876db85c1c4944028a0b49ccae4d8c0d41
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
2015-02-08 00:06:36 +02:00
Parthiban Nallathambi
6c6f44136f gstreamer1.0-plugins-bad: Making bbappend version independent
Making the bbappend file gstreamer1.0-plugins-bad into version independent

Change-Id: I1ed1fb91e23aa58e9b1a02429ca60a4484eaad93
Signed-off-by: Parthiban N <parthitce@gmail.com>
2014-11-20 12:32:36 +01:00
Andrei Gherzan
9939629b44 gstreamer1.0-plugins-bad: Sync version with yocto master
Change-Id: I7913b849ddfc615de4846dbd653e03d084bb8039
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
2014-08-14 15:36:14 +02:00
Alex J Lennon
c67cee2e95 gstreamer1.0-plugins-bad: Build eglglessink for Raspberry Pi
The eglglessink needs to be built to target the Raspberry Pi or it will
seg-fault in use.

Autoconf attempts to detect whether to build for RPi but there are some
include files needed, the search path to which must be specified.

ref: https://github.com/raspberrypi/firmware/issues/34

ref: https://github.com/raspberrypi/firmware/issues/99

This patch adds the needed include paths and forces the plugin to be
built for Raspberry Pi.

With this patch the following pipeline works on RPi,

  modprobe bcm2835-v4l2 gst_v4l2src_is_broken=1
  gst-launch-1.0 --gst-debug-no-color v4l2src \
  ! 'video/x-raw,format=RGB,width=1280,height=720,framerate=(fraction)30/1' \
  ! eglglessink max-lateness=-1

Change-Id: Iabd93c0601c2ab898de3352a7d30423ef9cfce43
Signed-off-by: Alex J Lennon <ajlennon@dynamicdevices.co.uk>
2014-06-12 00:09:10 +01:00