On Mon, 24 Oct 2022 at 08:48, Vincent Davis Jr <vi...@underview.tech> wrote: > + # sed can't find EGL/eglplatform.h as it doesn't get installed when > glvnd enabled > + if ${@bb.utils.contains('PACKAGECONFIG', 'openglx', 'true', 'false', > d)}; then > + return 0 > + fi > + > 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
This needs to be replaced with a direct check of EGL/eglplatform.h existence in the existing if block. > @@ -38,6 +43,7 @@ DEPENDS = "expat makedepend-native flex-native bison-native > libxml2-native zlib > EXTRANATIVEPATH += "chrpath-native" > PROVIDES = " \ > ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'virtual/libgl', '', d)} > \ > + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'virtual/libglx', > '', d)} \ Why DISTRO_FEATURES and not PACKAGECONFIG like others? > ${@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 +122,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[openglx] = "-Dglvnd=true, -Dglvnd=false,libglvnd" Packageconfig option should be named glvnd too. Alex
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#172076): https://lists.openembedded.org/g/openembedded-core/message/172076 Mute This Topic: https://lists.openembedded.org/mt/94528997/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-