scottk/meta-tegra
1
0
Fork 0
mirror of https://github.com/lingble/meta-tegra.git synced 2025-10-29 03:22:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

libglvnd: updates to accommodate recipe in meta-oe

Browse Source 
A recipe for libglvnd has landed in meta-oe with a version
newer than our copy here. We need to handle builds with and
without meta-oe in the layer set, so update to work like we
do with libv4l2/v4l-utils:

* Rename our recipe to libglvnd-tegra, restricted to tegra
  machines only.  Add appropriate PROVIDES/RPROVIDES so users
  can still reference just 'libglvnd', update it to 1.5.0 to
  match the meta-oe recipe, and fix a typo.

* Add a bbappend for libglvnd under external/openembedded-layer.
  The bbappend applies the tegra-specific build settings we need
  and makes the packages built tegra-specific.

Signed-off-by: Matt Madison <matt@madison.systems>
This commit is contained in:
Matt Madison
2022-10-31 05:53:06 -07:00
parent 3cec70b0ff
commit 46c1b1a714
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
recipes-graphics/libglvnd/libglvnd_1.4.0.bb → recipes-graphics/libglvnd/libglvnd-tegra_1.5.0.bb
View File

@@ -7,13 +7,13 @@ SRC_REPO = "gitlab.freedesktop.org/glvnd/libglvnd.git;protocol=https"
SRCBRANCH = "master"
SRC_URI = "git://${SRC_REPO};branch=${SRCBRANCH}"
# v1.4.0 tag
SRCREV = "8f3c5b17a21e2222ab3e5fd38870b915815aca49"
# v1.5.0 tag
SRCREV = "c7cdf0cc4395b57563294d1f340b6bb1b95366a0"
COMPATIBLE_MACHINE = "(tegra)"
REQUIRED_DISTRO_FEATURES = "opengl"
PROVIDES += "virtual/egl virtual/libgl virtual/libgles1 virtual/libgles2 virtual/libgles3"
PROVIDES += "libglvnd virtual/egl virtual/libgl virtual/libgles1 virtual/libgles2 virtual/libgles3"
DEPENDS = "l4t-nvidia-glheaders"
@@ -27,12 +27,13 @@ PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
PACKAGECONFIG[x11] = "-Dx11=enabled -Dglx=enabled,-Dx11=disabled -Dglx=disabled,libx11 libxext xorgproto,tegra-libraries-glxcore"
RPROVIDES:${PN} += "libegl libgl libgles1 libgles2"
RPROVIDES:${PN}-dev += "libegl-dev libgl-dev libgles1-dev libgles2-dev libgles3-dev"
RPROVIDES:${PN} += "libglvnd libegl libgl libgles1 libgles2"
RPROVIDES:${PN}-dev += "libglvnd-dev libegl-dev libgl-dev libgles1-dev libgles2-dev libgles3-dev"
RCONFLICTS:${PN} = "libegl libgl ligbles1 libgles2"
RCONFLICTS:${PN}-dev += "libegl-dev libgl-dev libgles1-dev libgles2-dev libgles3-dev"
RREPLACES:${PN} = "libegl libgl libgles1 ligbles2"
RREPLACESS_${PN}-dev += "libegl-dev libgl-dev libgles1-dev libgles2-dev libgles3-dev"
RREPLACES_${PN}-dev += "libegl-dev libgl-dev libgles1-dev libgles2-dev libgles3-dev"
RPROVIDES:${PN}-dbg += "libglvnd-dbg"
RDEPENDS:${PN}:append:tegra = " tegra-libraries-eglcore tegra-libraries-glescore"
RDEPENDS:${PN}-dev:append:tegra = " l4t-nvidia-glheaders-dev"