frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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 <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Keith Packard 2018-03-02 17:05:04 -08:00 committed by Adam Jackson
parent 43ffd57259
commit 0ff4074224
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -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$DRI" = xyes || test "x$DRI2" = xyes || test "x$DRI3" = xyes || test "x$CONFIG_UDEV_KMS" = xyes; then
if test "x$DRM" = xyes; then if test "x$DRM" = xyes; then
AC_DEFINE(WITH_LIBDRM, 1, [Building with libdrm support]) AC_DEFINE(WITH_LIBDRM, 1, [Building with libdrm support])
if test "x$DRI2" = xyes; then PKG_CHECK_MODULES([LIBDRM], $LIBDRM)
dnl 2.4.65 is required for drmGetDevice
PKG_CHECK_MODULES([LIBDRM], libdrm >= 2.4.65)
else
PKG_CHECK_MODULES([LIBDRM], $LIBDRM)
fi
fi fi
fi fi

12
meson.build
View File

@ -301,16 +301,8 @@ else
endif endif
libdrm_required = (get_option('dri1') == 'true') or (get_option('dri2') == 'true') or (get_option('dri3') == 'true') 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) libdrm_dep = dependency('libdrm', version: '>= 2.4.89', required: libdrm_required)
build_modesetting = false build_modesetting = libdrm_dep.found()
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
build_vbe = false build_vbe = false
if get_option('vbe') == 'auto' if get_option('vbe') == 'auto'