diff mbox series

[kirkstone+] ti-img-rogue-umlibs: Make x11 dependency optional

Message ID 20230621075811.1998481-1-d.schultz@phytec.de
State Rejected
Delegated to: Ryan Eatmon
Headers show
Series [kirkstone+] ti-img-rogue-umlibs: Make x11 dependency optional | expand

Commit Message

Daniel Schultz June 21, 2023, 7:58 a.m. UTC
libx11-xcb has a hard dependency for x11 but is included by the
libvk-rogue package. Only include libvk-rogue when the
DISTRO_FEATURES "vulkan x11 wayland" are enabled, which is identical
to the RRECOMMENDS variable.

Signed-off-by: Daniel Schultz <d.schultz@phytec.de>
---
 .../powervr-umlibs/ti-img-rogue-umlibs_23.1.6404501.bb       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Randolph Sapp June 21, 2023, 6:23 p.m. UTC | #1
On 6/21/23 02:58, Daniel Schultz wrote:
> libx11-xcb has a hard dependency for x11 but is included by the
> libvk-rogue package. Only include libvk-rogue when the
> DISTRO_FEATURES "vulkan x11 wayland" are enabled, which is identical
> to the RRECOMMENDS variable.
> 
> Signed-off-by: Daniel Schultz <d.schultz@phytec.de>
> ---

Hold on, let me get you a proper fix now that I'm packaging components 
separately.
diff mbox series

Patch

diff --git a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.1.6404501.bb b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.1.6404501.bb
index 26090038..23596895 100644
--- a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.1.6404501.bb
+++ b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.1.6404501.bb
@@ -33,13 +33,16 @@  do_install:append() {
         mv ${D}/lib/firmware ${D}${nonarch_base_libdir}
         rmdir ${D}/lib
     fi
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'false', 'true', d)}; then
+        rm -rf ${D}${libdir}/libVK_IMG.so*
+    fi
 }
 
 PACKAGES = " \
     libgles1-rogue libgles1-rogue-dev \
     libgles2-rogue libgles2-rogue-dev \
     libgles3-rogue libgles3-rogue-dev \
-    libvk-rogue libvk-rogue-dev \
+    ${@bb.utils.contains("DISTRO_FEATURES", "vulkan x11 wayland", "libvk-rogue libvk-rogue-dev", "", d)} \
     libopencl-rogue libopencl-rogue-dev \
     libopencl-rogue-tools \
     ${PN}-tools \