From 0ff4074224ea370e021d79526c63cef91356730d Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Fri, 2 Mar 2018 17:05:04 -0800 Subject: [PATCH] Require libdrm 2.4.89 or newer Both autotools and meson build systems had complicated logic around what version of libdrm to require for various options. Remove that and just check for a new enough version to support all of the options which need libdrm. Signed-off-by: Keith Packard Reviewed-by: Adam Jackson --- configure.ac | 7 +------ meson.build | 12 ++---------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index 439d42390..0ba7550a1 100644 --- a/configure.ac +++ b/configure.ac @@ -1281,12 +1281,7 @@ AM_CONDITIONAL(DRI3, test "x$DRI3" = xyes) if test "x$DRI" = xyes || test "x$DRI2" = xyes || test "x$DRI3" = xyes || test "x$CONFIG_UDEV_KMS" = xyes; then if test "x$DRM" = xyes; then AC_DEFINE(WITH_LIBDRM, 1, [Building with libdrm support]) - if test "x$DRI2" = xyes; then - dnl 2.4.65 is required for drmGetDevice - PKG_CHECK_MODULES([LIBDRM], libdrm >= 2.4.65) - else - PKG_CHECK_MODULES([LIBDRM], $LIBDRM) - fi + PKG_CHECK_MODULES([LIBDRM], $LIBDRM) fi fi diff --git a/meson.build b/meson.build index c66a2501c..430c770cb 100644 --- a/meson.build +++ b/meson.build @@ -301,16 +301,8 @@ else endif libdrm_required = (get_option('dri1') == 'true') or (get_option('dri2') == 'true') or (get_option('dri3') == 'true') -libdrm_dep = dependency('libdrm', version: '>= 2.3.1', required: libdrm_required) -build_modesetting = false -if libdrm_dep.found() - if build_dri2 - # 2.4.65 is required for drmGetDevice - dependency('libdrm', version: '>= 2.4.65') - endif - # 2.4.46 is required for cursor hotspot support. - build_modesetting = libdrm_dep.version().version_compare('>= 2.4.46') -endif +libdrm_dep = dependency('libdrm', version: '>= 2.4.89', required: libdrm_required) +build_modesetting = libdrm_dep.found() build_vbe = false if get_option('vbe') == 'auto'