mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-10-01 06:21:56 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/xwayland: libdrm is required, not optional

Browse Source 
Fixes:
http://autobuild.buildroot.net/results/476/47665d417dbae76bf27e805a5bcb1d8d6ab1f445/

xwayland unconditionally includes xf86drm.h, so libdrm is required and not
optional:

grep -rs xf86drm.h
glamor/glamor_egl.c:#include <xf86drm.h>
hw/xwayland/xwayland-glamor.h:#include <xf86drm.h>
hw/xwayland/xwayland-glamor-eglstream.c:#include <xf86drm.h>
hw/xwayland/xwayland-window.h:#include <xf86drm.h>
hw/xwayland/xwayland-drm-lease.c:#include <xf86drm.h>
hw/xwayland/xwayland-glamor-gbm.c:#include <xf86drm.h>

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 797de283c7)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard
2023-12-11 17:45:29 +01:00
parent 4a1dfdc494
commit 6cf8ed02cd
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
package/x11r7/xwayland/Config.in
View File

@@ -8,6 +8,7 @@ config BR2_PACKAGE_XWAYLAND
# them, otherwise, use the small libsha1 library. # them, otherwise, use the small libsha1 library.
depends on !BR2_RISCV_32 # xlib_libxshmfence depends on !BR2_RISCV_32 # xlib_libxshmfence
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # xlib_libxshmfence depends on BR2_TOOLCHAIN_HAS_SYNC_4 # xlib_libxshmfence
select BR2_PACKAGE_LIBDRM
select BR2_PACKAGE_LIBSHA1 if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT) select BR2_PACKAGE_LIBSHA1 if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT)
select BR2_PACKAGE_PIXMAN select BR2_PACKAGE_PIXMAN
select BR2_PACKAGE_WAYLAND select BR2_PACKAGE_WAYLAND

13
package/x11r7/xwayland/xwayland.mk
View File

@@ -12,6 +12,7 @@ XWAYLAND_LICENSE_FILES = COPYING
XWAYLAND_CPE_ID_VENDOR = x.org XWAYLAND_CPE_ID_VENDOR = x.org
XWAYLAND_INSTALL_STAGING = YES XWAYLAND_INSTALL_STAGING = YES
XWAYLAND_DEPENDENCIES = \ XWAYLAND_DEPENDENCIES = \
libdrm \
pixman \ pixman \
wayland \ wayland \
wayland-protocols \ wayland-protocols \
@@ -23,15 +24,16 @@ XWAYLAND_DEPENDENCIES = \
xlib_xtrans \ xlib_xtrans \
xorgproto xorgproto
XWAYLAND_CONF_OPTS = \ XWAYLAND_CONF_OPTS = \
-Ddri3=true \
-Dxwayland_eglstream=false \ -Dxwayland_eglstream=false \
-Dxvfb=false \ -Dxvfb=false \
-Ddefault_font_path=/usr/share/fonts/X11/ \ -Ddefault_font_path=/usr/share/fonts/X11/ \
-Ddtrace=false \ -Ddtrace=false \
-Ddocs=false -Ddocs=false
ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_LIBEPOXY),yy) ifeq ($(BR2_PACKAGE_LIBEPOXY),y)
XWAYLAND_CONF_OPTS += -Dglamor=true XWAYLAND_CONF_OPTS += -Dglamor=true
XWAYLAND_DEPENDENCIES += libdrm libepoxy XWAYLAND_DEPENDENCIES += libepoxy
else else
XWAYLAND_CONF_OPTS += -Dglamor=false XWAYLAND_CONF_OPTS += -Dglamor=false
endif endif
@@ -79,13 +81,6 @@ XWAYLAND_CONF_OPTS += -Dsha1=libsha1
XWAYLAND_DEPENDENCIES += libsha1 XWAYLAND_DEPENDENCIES += libsha1
endif endif
ifeq ($(BR2_PACKAGE_LIBDRM),y)
XWAYLAND_CONF_OPTS += -Ddri3=true
XWAYLAND_DEPENDENCIES += libdrm
else
XWAYLAND_CONF_OPTS += -Ddri3=false
endif
ifeq ($(BR2_PACKAGE_LIBUNWIND),y) ifeq ($(BR2_PACKAGE_LIBUNWIND),y)
XWAYLAND_CONF_OPTS += -Dlibunwind=true XWAYLAND_CONF_OPTS += -Dlibunwind=true
XWAYLAND_DEPENDENCIES += libunwind XWAYLAND_DEPENDENCIES += libunwind