Commit Graph

159 Commits

Author SHA1 Message Date
Marcel Hamer
e31fba4c96 recipes: Update SRC_URI protocols for github
Use protocols=https for GitHub SRC_URIs using the conversion script in
openembedded-core.

Signed-off-by: Marcel Hamer <marcel@solidxs.se>
2021-11-07 21:30:23 +00:00
Tom Rini
fcd7b67d9c xserver-xf86-config: Correctly append to FILES:${PN}
When updating FILES:${PN} based on an override you must use
FILES:${PN}:append:OVERRIDE as the syntax otherwise you will end up
replacing the contents of FILES:${PN} entirely.  Update to use this
syntax correctly and then only add "${sysconfdir}/X11/xorg.conf.d/*"

Reported-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
2021-08-19 11:01:49 +03:00
Martin Jansa
86015f0957 userland: package man pages in PN-doc
* last userland upgrade in:
  2a25b7ef8b
  brings this upstream commit:
  45a0022ac6

  which results in:
  ERROR: userland-20210623-r0 do_package: QA Issue: userland: Files/directories were installed but not shipped in any package:
    /usr/man
    /usr/man/man1
    /usr/man/man7
    /usr/man/man1/raspistill.1
    /usr/man/man1/raspividyuv.1
    /usr/man/man1/dtparam.1
    /usr/man/man1/raspivid.1
    /usr/man/man1/tvservice.1
    /usr/man/man1/vcmailbox.1
    /usr/man/man1/raspiyuv.1
    /usr/man/man1/dtoverlay.1
    /usr/man/man1/vcgencmd.1
    /usr/man/man1/dtmerge.1
    /usr/man/man7/raspicam.7
    /usr/man/man7/raspirev.7
    /usr/man/man7/raspiotp.7
    /usr/man/man7/vcmailbox.7
  Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
  userland: 17 installed and not shipped files. [installed-vs-shipped]

  it's incorrectly installed in /usr/man by CMake as discussed in upstream
  move it to /usr/share/man where it's picked by default FILES:${PN}-doc

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2021-08-09 15:25:46 +03:00
Khem Raj
2a25b7ef8b userland: Update to latest master branch
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2021-08-06 00:35:47 +03:00
Martin Jansa
3f703e1b1d Manually fix conversion
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2021-08-04 12:30:12 +03:00
Martin Jansa
9ea7aa2cd2 Convert to new override syntax
This is the result of automated script conversion:

oe-core/scripts/contrib/convert-overrides.py .

converting the metadata to use ":" as the override character instead of "_".

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2021-08-04 12:30:12 +03:00
matt-hammond-bbc
b601818301 libva: Fix for when using userland
https://github.com/agherzan/meta-raspberrypi/issues/842

Fixes failing build of libva when using `userland` recipe.
Same as: ac16b0e9d7

Signed-off-by: Matt Hammond <matt.hammond@bbc.co.uk>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2021-05-18 14:58:43 +01:00
Persian Prince
bb974dc078 userland: Correct PV after SRCREV update 2021-04-12 17:11:03 +01:00
Khem Raj
f9a13f3b9a userland: Update to latest master
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2021-04-03 17:07:25 +01:00
Khem Raj
de51de5ca0 mesa-gl: Use GALLIUMDRIVERS instead of DRIDRIVERS for passing swrast
latest mesa errors out
../mesa-21.0.0/meson.build:21:0: ERROR: Options "swrast" are not in allowed choices: "auto, i915, i965, r100, r200, nouveau"

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2021-04-03 17:07:25 +01:00
Khem Raj
361f42e346 raspidmx: Disable for all non-rpi hosts
Currently its only disabled when vc4graphics is in use but this recipe
actually needs userland and therefore can not be used for non-rpi
machines as well.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-12-14 23:20:22 +00:00
Trevor Woerner
e4f5c32925 raspidmx: add
Add a recipe to build a set of dispmanx examples.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
2020-12-13 20:34:11 +00:00
Trevor Woerner
4b89f63699 userland: fix invalid packageconfig
Fix the "allapps" PACKAGECONFIG to avoid the QA warning/error:

	userland-20201027-r0 do_configure: QA Issue: userland: invalid PACKAGECONFIG: allapps [invalid-packageconfig]

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
2020-12-11 17:00:15 +00:00
Khem Raj
1ae52a743c libglu: Fix build with userland graphics
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-12-04 11:18:40 +00:00
Khem Raj
80bcc2e0ed userland: Fix weston build with userland graphics
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-12-04 11:18:40 +00:00
Khem Raj
6c1c9ff4ee mesa-gl: Enable swrast dri backend for rpi/userland
After mesa switched build system to meson, the logic to generate dri
related artifacts changed too, which means when no dri backend is
enabled then dri drivers and corresponding headers dont get generated
and hence we end up with missing pkgconfig files e.g. dri.pc which
usually will come from full mesa3d package, but in rpi when userland is
used we only build GL pieces of mesa.

This patch therefore enables swrast dri backend when using userland,
which gives us the needed header and .pc files to build packages like
Xorg server, since EGL driver will come from userland, the dri backend
would be unused and hence should not be effective at runtime.

Addresses issue report with https://github.com/agherzan/meta-raspberrypi/pull/773

there is no need to check for graphics stack since mesa-gl is only used
with userland graphics

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Trevor Woerner <twoerner@gmail.com>
2020-12-02 22:10:03 +00:00
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