Commit Graph

143 Commits

Author SHA1 Message Date
Trevor Woerner
3a1fec22c0
userland: add knob for ALL_APPS
The userland sources include a bunch of sample applications. Add an "allapps"
PACKAGECONFIG to allow the user to build the additional optional applications.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
2020-11-30 16:16:29 +00:00
Khem Raj
fd83102af7 userland: Upgrade to latest as of 20201027
refresh patches

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-11-25 17:57:12 +00:00
Khem Raj
09a3c11696 userland: Apply format-overflow warning patch for gcc alone
This warning is gcc specific and causes build failures when building
with clang, lets therefore remove it when build is using clang compiler

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-10-21 17:56:14 +01:00
Luis Alfredo da Silva
c5633df788 Revert "mesa: querying dma_buf modifiers for specific formats"
This reverts commit 84cb8538cd.

Fixes:
    - https://gitlab.gnome.org/GNOME/mutter/-/issues/1421
    - #711
2020-09-17 15:25:39 +01:00
Khem Raj
968dcd3f40 libsdl2: Add userland dependency when not using vc4graphics
Needed to provide KHR/khrplatform.h header

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-08-28 14:59:43 +01:00
Khem Raj
979fb504c3 xserver-xorg: Depend on userland when vc4graphics is disabled
This helps in getting right headers, we have made a choice to let
userland provide KHR/khrplatform.h when using it instead of mesa-gl
which could have been another provider, xserver-xorg's glx
implementation depends on virtual/libgl which in case of rpi-without-vc4
driver is provided by mesa-gl, as a result, compilation fails since no
one is providing this header in this case.

Fixes errors like
usr/include/GL/glext.h:56:10: fatal error: KHR/khrplatform.h: No such file or directory
|    56 | #include <KHR/khrplatform.h>
|       |          ^~~~~~~~~~~~~~~~~~~

Fixes issue #391

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-08-28 14:59:43 +01:00
Khem Raj
497a90a220 userland: Update to 2020-06-24 top commit
Forward port patches

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-07-14 17:16:50 +01:00
Khem Raj
025a2025ea userland: Fix build with gcc10
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-04-03 17:34:07 +01:00
Khem Raj
909a962fe1 userland: Update to 20200316 snapshot
- Refresh patches

- userland now needs to create symlinks for egl.pc,glesv2.pc and vg.pc
  when vc4 is not used

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-04-03 17:34:07 +01:00
Khem Raj
ac5e346167 mesa: Fix patch fuzz
Fixes
ERROR: mesa-2_20.0.1-r0 do_patch: Fuzz detected:

Applying patch 0001-dri2-query-dma-buf-modifiers.patch
patching file src/gallium/state_trackers/dri/dri2.c
Hunk #1 succeeded at 1366 with fuzz 1 (offset -2 lines).

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-03-12 16:57:44 +00:00
rkhan467
84cb8538cd mesa: querying dma_buf modifiers for specific formats
mesa wl_drm protocol is the backend for wayland server side which requires
the dmabuf modifiers for some DRM formats on specific devices like RPI.
Currently there is no support of giving any dmabuf modifiers on wl_drm protocol.
This dma_buf modifiers allows EGL implementations to add extra attributes
to drm_fourcc format.

Upstream-Status: Pending

Signed-off-by: Balaji Velmurugan <balaji.velmurugan@ltts.com>
2020-03-10 17:49:23 +00:00
Martin Jansa
30eedfa095 userland: add pkg-config for openmaxil and add virtual/libomxil to PROVIDES
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2020-01-24 12:09:42 +00:00
Paul Barker
254c9366b9 vc-graphics: Clarify license conditions
The license text matches the 'Broadcom-RPi' custom license used in
bcm2835-bootfiles.

Signed-off-by: Paul Barker <paul@betafive.co.uk>
2019-10-24 14:08:16 +01:00
Khem Raj
d1614999e1 eglinfo: Drop bbappend
eglinfo has been removed from OE-Core since aa36510ebe

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-09-04 10:13:28 +03:00
Khem Raj
d7cd633b75 mesa: Enable vc4, v3d, kmsro gallium drivers
This enables new v3d driver which needs kmsro as dependency

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-08-28 20:08:55 +01:00
Andrei Gherzan
c6e0a7e467 mesa: Add v3d and kmsro driver as well
Videocore 5/6 support was added as a separate driver in mesa: v3d. Enable
this so we can have it available for Raspberry Pi 4. Also, this driver
depends on kmsro.

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
2019-08-15 16:50:50 +01:00
Khem Raj
55345dfd41 xorg-xserver: Adapt bbappend to latest OE-core
There is no need to override complete packageconfig but just the openGL
part, this ensures that any common change in oe-core reflects for rpi as
well and does not cause the packageconfigs to go stale

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-08-06 12:12:13 +01:00
Khem Raj
e237a18d94 userland: Upgrade to latest
Fix build with glibc 2.30
Forward patches to 20190724 release

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-07-28 21:51:16 +01:00
Andrei Gherzan
2e45813a6b firmware: Rename firmware inc file to raspberrypi-firmware.inc
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
2019-07-04 15:47:13 +01:00
dir
8636b63752 vc-graphics: Don't install sbin directory
Newer versions of the PI firmware don't contain a sbin directory
anymore. This patch removes the then failing attempt at installing.

Signed-off-by: Diez Roggisch <diez.roggisch@ableton.com>
2019-06-24 18:10:14 +01:00
Khem Raj
041cdd8040 userland: Update to 20190501
Forward port the patches as needed

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-29 12:08:38 +01:00
Martin Jansa
8eeb579c55 userland: use default PACKAGE_ARCH
* drop MACHINE_ARCH which was added in:
  592274937b
* the recipe is using MACHINE_FEATURES but if everybody either enables or disables vc4graphics
  for all rpi MACHINEs it isn't causing it to be MACHINE_ARCH any more than all other rpi
  overrides used in this layer.
* raspberrypi3-64 is the only one with vc4graphics by default, but it
  has different TUNE_PKGARCH than other rpi MACHINEs). Unfortunately not
  without its own set of issues:
  http://lists.openembedded.org/pipermail/openembedded-core/2019-April/281328.html
* fixes userland and everything which depends on it (qtbase, qtwebengine..)
  to be effectivelly MACHINE_ARCH

  === Comparing signatures for task do_package_write_ipk.sigdata between raspberrypi2 and raspberrypi3 ===
  ERROR: qtbase different signature for task do_package_write_ipk.sigdata between raspberrypi2 and raspberrypi3
  NOTE: Starting bitbake server...
  Hash for dependent task userland/userland_git.bb.do_packagedata changed from dcfe9e7982ce1e231f06293c1e568d77384f167358fe88debe761290483244a0 to baa4d4164b0045f46c966e773cfeeed87f2c491c3dbd368af7cf4cd63ce39177
  Unable to find matching sigdata for /OE/build/luneos-master/webos-ports/meta-raspberrypi/recipes-graphics/userland/userland_git.bb.do_packagedata with hashes dcfe9e7982ce1e231f06293c1e568d77384f167358fe88debe761290483244a0 or baa4d4164b0045f46c966e773cfeeed87f2c491c3dbd368af7cf4cd63ce39177

  ERROR: 1 errors found in /OE/build/luneos-master/webos-ports/tmp-glibc/sstate-diff/1555500556/signatures.raspberrypi3.do_package_write_ipk.sigdata.log

  bitbake-diffsigs tmp-glibc/sstate-diff/1555495762/r*/*/userland/do_fetch
  NOTE: Starting bitbake server...
  basehash changed from d767ab01261472a220e0ec80b01bc33e60764d56b5880ab3153afd42ea734703 to e57e594d7e4219f22778ccc5d8c102deeeaff64586e0f71cd90964fa2ace4e1c
  Variable MACHINE value changed from 'raspberrypi2' to 'raspberrypi3'

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2019-04-18 10:56:46 +01:00
Khem Raj
7e5fb3fca8 mesa-gl: Delete only KHR/khrplatform.h
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-03-05 12:19:25 +00:00
Khem Raj
c7e7f0b762 cairo: Enable egl/gles2 with userland
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-03-05 12:19:25 +00:00
Khem Raj
60dbfd2544 userland: Upgrade to latest as of 20190114
Forward port the patches
package vcfiled init scripts

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-02-24 11:07:36 +00:00
Khem Raj
52d0031c57 mesa-gl: Provide virtual/libgbm
We specificially enable building libgbm via packageconfig but then the
PROVIDES is hardcoded in main recipes, we make that change here so when
using userland as graphics driver, we can build wayland apps

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-02-24 11:04:38 +00:00
Khem Raj
2c8b2f6c6b mesa-gl: Let userland provide libEGL and GLESv2 when vc4 graphics is not used
When vc4graphics is not used then useland graphics provides these
libraries

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-02-24 11:04:38 +00:00
Khem Raj
752db52633 userland: Use original name libegl-mesa in rdeps
This avoids a missing rdep errors seen sometimes when switching
compilers or graphic driver providers

ERROR: userland-20181120-r0 do_package_qa: QA Issue: /usr/lib/libWFC.so contained in package userland requires li bEGL.so.1, but no providers found in RDEPENDS_userland? [file-rdeps]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-12-18 11:48:59 +00:00
Ming Liu
785e52bfad userland: do not provide libgl1
The userland should only provide egl libraries rather than gl libraries,
or else it will cause conflicts with other libgl providers like mesa.

Signed-off-by: Ming Liu <liu.ming50@gmail.com>
2018-12-18 11:48:39 +00:00
Khem Raj
a6f96854b6 userland: rprovide debiannamed libraries
These names are mapped to mesa equivalent rproviders
when using vc4 rdep should be on libegl1 which is then
mapped to libegl-mesa since thats what provides libegl1
when using mesa. The libegl is not a global name for this
library

Fixes

ERROR: userland-20181120-r0 do_package_qa: QA Issue: /usr/lib/libWFC.so
contained in package userland requires libEGL.so.1, but no providers
found in RDEPENDS_userland? [file-rdeps]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-12-01 12:10:49 +00:00
Khem Raj
7c94afee2b userland: Update to latest master
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-11-21 17:56:52 +02: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
d05f559089 userland-nogl: Add recipe which does not include GL libraries
This is needed when mesa is providing these libraries especially when
using vc4graphics

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-11-07 14:25:00 +00:00
Khem Raj
16a8bb9da0 xorg-server: Do not install 10-noglamor.conf
This causes glamor APIs to be disabled and glxgears run very slow
like 1FPS, without this it speeds up to 55.5fps

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-10-02 14:14:54 +01:00
Khem Raj
0b10f248d0 mesa: Build swrast gallium driver along with vc4
when running -ctestimage target, it fails because of errors it finds in
Xorg logs

| Log:
/mnt/a/yoe/build/tmp/work/raspberrypi3-yoe-linux-gnueabi/core-image-sato/1.0-r0/target_logs/Xorg.0.log
| -----------------------
| Central error: [    14.760] (EE) AIGLX error: dlopen of /usr/lib/dri/swrast_dri.so failed (/usr/lib/dri/swrast_dri.so: cannot open shared object file: No such file or directory)

Therefore we enable swrast gallium drivers to make xorg happy

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-10-02 14:14:54 +01:00
Khem Raj
b660366a30 piglit,kmscube: Disable when using userland graphics driver
These packages need stuff from mesa which is not available in
userland implementation as of now

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-08-16 11:34:33 +01:00
Khem Raj
0bea144135 userland: Define missing GLES2 defines needed for weston
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-07-16 16:57:38 +01:00
Khem Raj
9f523f5ecc Revert "userland: drop now obsolete backport khronos typedef patch"
This reverts commit e713c3f60d.
2018-07-16 16:57:38 +01:00
Khem Raj
a0beccee73 mesa-demos,piglit,packagegroup-core-tools-testapps: Remove dependency on mesa-demos
mesa-demos demand libgles1 and userland driver does not have it, therefore make it
conditional on choice of graphics driver, remove it when using userland driver and
keep it when using vc4 graphics driver.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-07-16 16:57:38 +01:00
Khem Raj
d5f7ff887d userland: Update to latest as of 20180702
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-07-07 11:27:15 +01:00
Hugo Hromic
e713c3f60d userland: drop now obsolete backport khronos typedef patch
The patch introduced in 237e0c7 is now fixed upstream in gstreamer-base-1.14.1, hence drop it.

See: <2f3ff84f40>

Signed-off-by: Hugo Hromic <hhromic@gmail.com>
2018-07-04 15:33:16 +01:00
Hugo Hromic
b825f32ccd meta-raspberrypi: use _% suffix instead of specific versions for bbappends
Keep naming consistency and ensure they are still applied when the upstream recipes are updated.

Signed-off-by: Hugo Hromic <hhromic@gmail.com>
2018-06-27 13:38:23 +01:00
Hugo Hromic
71a040dc11 userland: fix backport khronos typedef patch
The patch in 237e0c7 used a define guard that clashes with an actual feature of Khronos (EGL_KHR_stream).
This makes some packages such as `qtbase` to think that the outdated Krhonos in userland has newer features.
This fix uses a more specific name for the relevant define guard (EGL_KHR_uint64_typedef).

Signed-off-by: Hugo Hromic <hhromic@gmail.com>
2018-06-27 13:28:52 +01:00
Hugo Hromic
7f7bc9e778 wayland: only remove libwayland-egl if not using vc4graphics, e.g. when using userland
Related to PR #247.

Signed-off-by: Hugo Hromic <hhromic@gmail.com>
2018-05-16 19:24:15 +01:00
Hugo Hromic
237e0c79c6 userland: bumped version and backport khronos typedef for EGL_EXT_image_dma_buf_import
The `gstreamer1.0-plugins-base` package version `1.14` uses `EGL_EXT_image_dma_buf_import`, which
expects the `EGLuint64KHR` typedef that is present in recent versions of Khronos.
However, the older version included in userland does not provide it.

This patch backports the missing typedef from recent Khronos into userland.
See: <https://www.khronos.org/registry/EGL/api/EGL/eglext.h>

Submitted to userland in <https://github.com/raspberrypi/userland/pull/467>

Signed-off-by: Hugo Hromic <hhromic@gmail.com>
2018-05-14 14:35:43 +01:00
Hugo Hromic
de8912cbcb wayland: do not install libwayland-egl from wayland
Wayland was updated recently in Poky, and now includes `libwayland-egl`:

    commit 8097bf7012a0d97d3b8b48eceb5dc20cc4ae7ca9
    Author: Denys Dmytriyenko <denys@ti.com>
    Date:   Tue Apr 10 15:06:09 2018 -0400

        wayland: upgrade to 1.15.0

        Official announcement:
        https://lists.freedesktop.org/archives/wayland-devel/2018-April/037767.html

        | libwayland-egl is now part of libwayland, and will presumably be removed
        | from mesa in the not too distant future.

        Update mesa recipe by removing corresponding libwayland-egl entries.

        (From OE-Core rev: 6e5952fcfc13ff4b63c9376bd41a1dbba957f425)

        Signed-off-by: Denys Dmytriyenko <denys@ti.com>
        Signed-off-by: Ross Burton <ross.burton@intel.com>
        Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

However, the `userland` ships its own version of the library (see issue #243).
Until further testing, for now discard the version in `wayland` in favour of the version in `userland`.

Signed-off-by: Hugo Hromic <hhromic@gmail.com>
2018-05-14 10:33:19 +01:00
Khem Raj
cf9971fa8b xserver-xf86-config: Disable glamor for vc4 in general
We need this fix across 32bit and 64bit with vc4/mesa

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-05-04 22:08:38 +01:00
Paul Barker
9b2cbacb07 Drop unnecessary dependencies and tasks
We have a few recipes which only deploy files that go into the boot partition
and do not create packages to be installed into the rootfs. These recipes don't
need to run the usual packaging tasks so we can drop them to speed up the build
a little.

We also have a bunch of recipes that don't need the usual toolchain as they just
copy files or invoke native commands like `mkimage`. So to speed up the build a
little more we can set INHIBIT_DEFAULT_DEPS to avoid an unnecessary dependency
on the toolchain.

Signed-off-by: Paul Barker <pbarker@toganlabs.com>
2018-04-23 14:08:04 +01:00
Andreas Müller
963761aac3 mesa: enable dri3 explicitly
Currently oe-core enables dri3 only for x11 AND vulcan. Although patch enabling
dri3 by default in oe-core was sent out, make sure here dri3 is enabled -
whatever oe-core suggest in the future.

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-04-06 12:33:40 +01:00
Khem Raj
790e100a90 userland: Add wayland support for libbrcmEGL
These renames are recently added
dd98890106

Some packages e.g. libSDL2 has started using the new names
and are resulting in undefined symbols e.g.

| /mnt/a/oe/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-gnueabi/libsdl2-mixer/2.0.2-r0/recipe-sysroot/usr/lib/libb
rcmEGL.so: undefined reference to `wl_resource_post_error'

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-03-08 20:31:12 -08:00