Thanks, looks good.
Alex
On Mon, 24 Oct 2022 at 17:08, Vincent Davis Jr <vi...@underview.tech> wrote:
>
> Allows mesa to be built with glvnd support.
> Thus, creates libEGL_mesa.so* and libGLX_mesa.so*
> libraries meant to coexist with vendor neutral
> dispatch libraries from libglvnd.
>
> Signed-off-by: Vincent Davis Jr <vi...@underview.tech>
> ---
> .../conf/distro/include/default-providers.inc | 1 +
> meta/recipes-graphics/mesa/mesa.inc | 20 +++++++++++++------
> 2 files changed, 15 insertions(+), 6 deletions(-)
>
> diff --git a/meta/conf/distro/include/default-providers.inc
> b/meta/conf/distro/include/default-providers.inc
> index 6defdca12d..3a4e989c1f 100644
> --- a/meta/conf/distro/include/default-providers.inc
> +++ b/meta/conf/distro/include/default-providers.inc
> @@ -5,6 +5,7 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
> PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
> PREFERRED_PROVIDER_virtual/egl ?= "mesa"
> PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
> +PREFERRED_PROVIDER_virtual/libglx ?= "mesa"
> PREFERRED_PROVIDER_virtual/libgl-native ?= "mesa-native"
> PREFERRED_PROVIDER_virtual/nativesdk-libgl ?= "nativesdk-mesa"
> PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
> diff --git a/meta/recipes-graphics/mesa/mesa.inc
> b/meta/recipes-graphics/mesa/mesa.inc
> index 8a74e0a80a..4eddf82644 100644
> --- a/meta/recipes-graphics/mesa/mesa.inc
> +++ b/meta/recipes-graphics/mesa/mesa.inc
> @@ -29,15 +29,18 @@ UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
> #because we cannot rely on the fact that all apps will use pkgconfig,
> #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
> do_install:append() {
> - if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)};
> then
> - sed -i -e 's/^#elif defined(__unix__) && defined(EGL_NO_X11)$/#elif
> defined(__unix__) \&\& defined(EGL_NO_X11) ||
> ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/'
> ${D}${includedir}/EGL/eglplatform.h
> - fi
> + # sed can't find EGL/eglplatform.h as it doesn't get installed when glvnd
> enabled.
> + # So, check if EGL/eglplatform.h exists before running sed.
> + if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)} && [
> -f ${D}${includedir}/EGL/eglplatform.h ]; then
> + sed -i -e 's/^#elif defined(__unix__) && defined(EGL_NO_X11)$/#elif
> defined(__unix__) \&\& defined(EGL_NO_X11) ||
> ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/'
> ${D}${includedir}/EGL/eglplatform.h
> + fi
> }
>
> DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native
> zlib chrpath-replacement-native python3-mako-native gettext-native"
> EXTRANATIVEPATH += "chrpath-native"
> PROVIDES = " \
> ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'virtual/libgl', '', d)}
> \
> + ${@bb.utils.contains('PACKAGECONFIG', 'glvnd', 'virtual/libglx', '', d)}
> \
> ${@bb.utils.contains('PACKAGECONFIG', 'gles', 'virtual/libgles1
> virtual/libgles2 virtual/libgles3', '', d)} \
> ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'virtual/egl', '', d)} \
> ${@bb.utils.contains('PACKAGECONFIG', 'gbm', 'virtual/libgbm', '', d)} \
> @@ -116,6 +119,7 @@ VULKAN_DRIVERS:append
> ="${@bb.utils.contains('PACKAGECONFIG', 'broadcom', ',broa
> PACKAGECONFIG[vulkan] =
> "-Dvulkan-drivers=${@strip_comma('${VULKAN_DRIVERS}')},
> -Dvulkan-drivers='',glslang-native vulkan-loader vulkan-headers"
>
> PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=false"
> +PACKAGECONFIG[glvnd] = "-Dglvnd=true, -Dglvnd=false,libglvnd"
>
> # "gles" requires "opengl"
> PACKAGECONFIG[gles] = "-Dgles1=enabled -Dgles2=enabled, -Dgles1=disabled
> -Dgles2=disabled"
> @@ -204,6 +208,7 @@ RDEPENDS:libopencl-mesa +=
> "${@bb.utils.contains('PACKAGECONFIG', 'opencl', 'lib
> PACKAGES =+ "libegl-mesa libegl-mesa-dev \
> libosmesa libosmesa-dev \
> libgl-mesa libgl-mesa-dev \
> + libglx-mesa libglx-mesa-dev \
> libglapi libglapi-dev \
> libgbm libgbm-dev \
> libgles1-mesa libgles1-mesa-dev \
> @@ -222,7 +227,7 @@ do_install:append () {
> rm -f ${D}${libdir}/gallium-pipe/*.la
> rm -f ${D}${libdir}/gbm/*.la
>
> - # it was packaged in libdricore9.1.3-1 and preventing upgrades when
> debian.bbclass was used
> + # it was packaged in libdricore9.1.3-1 and preventing upgrades when
> debian.bbclass was used
> chrpath --delete ${D}${libdir}/dri/*_dri.so || true
>
> # libwayland-egl has been moved to wayland 1.15+
> @@ -240,6 +245,7 @@ python __anonymous() {
> suffix = "-native"
> for p in (("egl", "libegl", "libegl1"),
> ("opengl", "libgl", "libgl1"),
> + ("glvnd", "libglx",),
> ("gles", "libgles1", "libglesv1-cm1"),
> ("gles", "libgles2", "libglesv2-2"),
> ("gles", "libgles3",),
> @@ -298,20 +304,22 @@ PACKAGES_DYNAMIC:class-native = "^mesa-driver-.*-native"
> FILES:mesa-megadriver = "${libdir}/dri/* ${datadir}/drirc.d"
> FILES:mesa-vulkan-drivers = "${libdir}/libvulkan_*.so ${datadir}/vulkan"
> FILES:${PN}-vdpau-drivers = "${libdir}/vdpau/*.so.*"
> -FILES:libegl-mesa = "${libdir}/libEGL.so.*"
> +FILES:libegl-mesa = "${libdir}/libEGL*.so.*"
> FILES:libgbm = "${libdir}/libgbm.so.*"
> FILES:libgles1-mesa = "${libdir}/libGLESv1*.so.*"
> FILES:libgles2-mesa = "${libdir}/libGLESv2.so.*"
> FILES:libgl-mesa = "${libdir}/libGL.so.*"
> +FILES:libglx-mesa = "${libdir}/libGLX*.so.* ${datadir}/glvnd"
> FILES:libopencl-mesa = "${libdir}/libMesaOpenCL.so.*
> ${libdir}/gallium-pipe/*.so ${sysconfdir}/OpenCL/vendors/mesa.icd"
> FILES:libglapi = "${libdir}/libglapi.so.*"
> FILES:libosmesa = "${libdir}/libOSMesa.so.*"
> FILES:libxatracker = "${libdir}/libxatracker.so.*"
>
> FILES:${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan
> ${libdir}/vdpau/*.so"
> -FILES:libegl-mesa-dev = "${libdir}/libEGL.* ${includedir}/EGL
> ${includedir}/KHR ${libdir}/pkgconfig/egl.pc"
> +FILES:libegl-mesa-dev = "${libdir}/libEGL*.so.* ${includedir}/EGL
> ${includedir}/KHR ${libdir}/pkgconfig/egl.pc"
> FILES:libgbm-dev = "${libdir}/libgbm.* ${libdir}/pkgconfig/gbm.pc
> ${includedir}/gbm.h"
> FILES:libgl-mesa-dev = "${libdir}/libGL.* ${includedir}/GL
> ${libdir}/pkgconfig/gl.pc"
> +FILES:libglx-mesa-dev = "${libdir}/libGLX*.*"
> FILES:libglapi-dev = "${libdir}/libglapi.*"
> FILES:libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES
> ${libdir}/pkgconfig/glesv1*.pc"
> FILES:libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2
> ${libdir}/pkgconfig/glesv2.pc"
> --
> 2.34.1
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#172106):
https://lists.openembedded.org/g/openembedded-core/message/172106
Mute This Topic: https://lists.openembedded.org/mt/94536595/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
