Commit Graph

90 Commits

Author SHA1 Message Date
Martin Jansa d88e625cf2 userland: fix installed-vs-shipped in multilib builds
Be aware that whole userland repo is marked as ancient and deprecated:
https://github.com/raspberrypi/userland/commit/96a7334ae9d5fc9db7ac92e59852377df63f1848
and explicitly says:
"If you are using code from here you should rethink your solution."

But even if your build is using vc4graphics in MACHINE_FEATURES
to avoid most of userland, this issue with multilib was preventing
do_install:append to actually remove those libraries provided by
lib32-mesa when building lib32-userland (e.g. to provide
virtual/libomxil or as dependency of raspidmx or runtime dependency
of omxplayer).

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
2024-03-19 00:26:25 +00:00
Khem Raj 108f83f0e9 userland: Update to trunk from 20230419
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2023-09-22 10:39:52 +01:00
Andrei Gherzan 38776890b7 userland: Bump revision to the current HEAD
Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
2022-07-31 02:16:37 +01:00
Khem Raj 354e7153be userland: Update to latest as of 20220323
Fix build with clang

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2022-04-04 20:04:06 +01:00
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
Martin Jansa 86015f0957 userland: package man pages in PN-doc
* last userland upgrade in:
  https://github.com/agherzan/meta-raspberrypi/commit/2a25b7ef8bb7b366a93dbe42d40ebf3923d1fccc
  brings this upstream commit:
  https://github.com/raspberrypi/userland/commit/45a0022ac64b4d0788def3c5230c972430f6fc23

  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
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
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 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
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
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
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
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
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:
  https://github.com/agherzan/meta-raspberrypi/commit/592274937b774b4d98045eef1ef820a5c27253fd
* 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 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 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 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 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: <https://github.com/GStreamer/gst-plugins-base/commit/2f3ff84f4082097a36732a91734121fb209efb84>

Signed-off-by: Hugo Hromic <hhromic@gmail.com>
2018-07-04 15:33:16 +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
Khem Raj 712558c64e userland: Update to master as of 20180219
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-03-08 20:31:12 -08:00
Jeff Wannamaker ee668d8072 userland: Update to latest master
Add patch to allow multiple wayland clients per process

userland has limit of one wayland client per process and thereby allow compositors
to launch multiple wayland client apps

Signed-off-by: Jeff Wannamaker <jeff_wannamaker@cable.comcast.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-02-02 11:13:24 +00:00
Paul Barker 337a419c0e userland: Use commit date as PV
This gives us a package version which can be reliably expected to move forwards
not backwards.

Signed-off-by: Paul Barker <pbarker@toganlabs.com>
2017-12-18 19:20:43 +00:00
Khem Raj 9b1a796cb7 userland: Update to latest revision
Forward port patches as needed

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2017-11-15 10:47:39 +00:00
Francesco Giancane 76f5a7df71 userland: RPROVIDES is missing libegl
userland package is the Raspberry Pi provider for the openGL stack.
If selected, it shall provide the gles2 and egl stacks in conjunction
with mesa-gl.

libegl was missing in the RPROVIDES variable, thus some run-time
dependencies were not met when using userland as provider.

Signed-off-by: Francesco Giancane <francescogiancane8@gmail.com>
2017-10-28 11:45:19 +02:00
Andrei Gherzan 91f59ae288 userland: Update to current master HEAD
Signed-off-by: Andrei Gherzan <andrei@gherzan.com>
2017-09-08 18:47:41 +01:00
Martin Jansa 56d0bdb5fe recipe: anchor regexps in COMPATIBLE_MACHINE
* bitbake is using re.match, so raspberrypi actually matches with anything
  ^raspberrypi.* which currently works, but it will also match with hypothetical
  raspberrypi-is-no-more-this-is-banana-now MACHINE which isn't intended by
  this COMPATIBLE_MACHINE.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-07-27 10:56:34 +02:00
Andrea Galbusera 1e1b50c55d userland: Add missing EGL_CAST defines
Needed by libepoxy

Signed-off-by: Andrea Galbusera <gizero@gmail.com>
2017-07-14 14:35:59 +01:00
Khem Raj 4f2dd0f0e8 userland: Update to latest
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2017-05-24 16:20:58 +01:00
Khem Raj 2aa6b1a637 userland: Add missing GLES2 defines
Needed by weston

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2017-05-11 18:18:05 +01:00
Khem Raj 1a42bce360 userland: Upgrade to latest
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2017-04-17 02:20:15 +01:00
Khem Raj e070005aa8 userland: Do not provide libgl
libgl is actually provided by mesa-gl and this
casued unneeded conflict between these two
packages resulting in sato image reporting missing
libGL.so.1

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2017-03-11 13:34:46 -08:00
Khem Raj a23003794f userland: Update to latest
Forward port the patches

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2017-03-11 04:39:13 -08:00
Khem Raj d01bf8751b userland: Upgrade to latest and implement triple buffering for wayland
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2017-02-16 20:53:04 +01:00
Khem Raj 1bf09a45a9 userland: Fix building on aarch64
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2016-12-29 19:33:20 +01:00
Khem Raj 90c45b48f6 userland: Update to latest
* Regenerate forward patches
* Remove upstreamed ones

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2016-12-29 19:33:17 +01:00