From 37bca35a6e6f5b945418a3d46deb067ac21d5615 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Wed, 2 Oct 2019 22:35:45 +0200 Subject: mesalib: udev is no longer needed The code that used it was removed a long time ago. waffle, glmark2 and xorg-server relied on the indirect dependency on udev, so move it there. Signed-off-by: Michael Olbrich --- rules/glmark2.in | 2 ++ rules/mesalib.in | 7 ------- rules/waffle.in | 1 + rules/xorg-server.in | 3 +++ 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/rules/glmark2.in b/rules/glmark2.in index 148e14720..af48f91ad 100644 --- a/rules/glmark2.in +++ b/rules/glmark2.in @@ -4,6 +4,8 @@ menuconfig GLMARK2 tristate prompt "glmark2 " select MESALIB + select UDEV if GLMARK2_FLAVOR_DRM_GL || GLMARK2_FLAVOR_DRM_GLES2 + select UDEV_LIBUDEV if GLMARK2_FLAVOR_DRM_GL || GLMARK2_FLAVOR_DRM_GLES2 select HOST_SYSTEM_PYTHON3 select LIBPNG select LIBJPEG diff --git a/rules/mesalib.in b/rules/mesalib.in index 12e6f1d9e..4ffefd732 100644 --- a/rules/mesalib.in +++ b/rules/mesalib.in @@ -12,8 +12,6 @@ menuconfig MESALIB select GCCLIBS_CXX select LIBDRM select LIBDRM_INTEL if MESALIB_DRI_I915 || MESALIB_DRI_I965 - select UDEV if MESALIB_UDEV - select UDEV_LIBUDEV if MESALIB_UDEV select WAYLAND if MESALIB_EGL_WAYLAND select WAYLAND_PROTOCOLS if MESALIB_EGL_WAYLAND select LIBDRM_RADEON if MESALIB_DRI_R200 @@ -40,9 +38,6 @@ menuconfig MESALIB if MESALIB -config MESALIB_UDEV - bool - comment "Drivers" config MESALIB_DRI_SWRAST @@ -145,12 +140,10 @@ config MESALIB_GLX config MESALIB_EGL bool - select MESALIB_UDEV prompt "EGL" config MESALIB_GBM bool - select MESALIB_UDEV prompt "GBM" comment "Platforms" diff --git a/rules/waffle.in b/rules/waffle.in index 93dcbc87d..a9f86de7b 100644 --- a/rules/waffle.in +++ b/rules/waffle.in @@ -10,6 +10,7 @@ menuconfig WAFFLE select MESALIB_GLX if WAFFLE_GLX select WAYLAND if WAFFLE_WAYLAND select MESALIB_EGL if WAFFLE_WAYLAND || WAFFLE_X11_EGL || WAFFLE_GBM + select UDEV if WAFFLE_GBM select UDEV_LIBUDEV if WAFFLE_GBM select MESALIB_GBM if WAFFLE_GBM help diff --git a/rules/xorg-server.in b/rules/xorg-server.in index 19e661941..dacd628d8 100644 --- a/rules/xorg-server.in +++ b/rules/xorg-server.in @@ -31,6 +31,9 @@ menuconfig XORG_SERVER select OPENSSL select XORG_LIB_XKBFILE + select UDEV if XORG_SERVER_UDEV + select UDEV_LIBUDEV if XORG_SERVER_UDEV + select LIBDRM if XORG_SERVER_LIBDRM # glx triggered -- cgit v1.2.3