From 9445265a03394304d2f7bb7a055efd3cc9a2b8b2 Mon Sep 17 00:00:00 2001 From: laigor Date: Mon, 26 Sep 2022 15:21:43 +0300 Subject: [PATCH 1/2] Update configure.ac --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 3eef744e..7c169ba1 100644 --- a/configure.ac +++ b/configure.ac @@ -28,6 +28,7 @@ if test "x${enable_glamor}" = "xyes"; then PKG_CHECK_MODULES([XORG_SERVER_GBM], [gbm >= 0], [], [AC_MSG_ERROR([please install libgbm-dev or mesa-libgbm-devel])]) PKG_CHECK_MODULES([XORG_SERVER_EPOXY], [epoxy >= 0], [], [AC_MSG_ERROR([please install libepoxy-dev or libepoxy-devel])]) PKG_CHECK_MODULES([XORG_SERVER_EGL], [egl >= 0], [], [AC_MSG_ERROR([please install libegl1-mesa-dev or mesa-libEGL-devel])]) + PKG_CHECK_EXISTS(epoxy >= 1.5.4, [AC_DEFINE(GLAMOR_HAS_EGL_QUERY_DRIVER, 1, [Have GLAMOR_HAS_EGL_QUERY_DRIVER])], []) fi if test "x$XRDP_CFLAGS" = "x"; then From fb37fe777d07460a56bb476281b1981d5be78238 Mon Sep 17 00:00:00 2001 From: laigor Date: Mon, 26 Sep 2022 15:25:02 +0300 Subject: [PATCH 2/2] Update xrdpdri2.c --- xrdpdev/xrdpdri2.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xrdpdev/xrdpdri2.c b/xrdpdev/xrdpdri2.c index 1fc6a1bb..a8e2d2cf 100644 --- a/xrdpdev/xrdpdri2.c +++ b/xrdpdev/xrdpdri2.c @@ -183,7 +183,9 @@ rdpDri2Init(ScreenPtr pScreen) /* This ensures that dri/va (=driver[0]) and vdpau (=driver[1]) */ /* get the correct values. Currently only needed for intel drivers. */ /* Ask Glamor to obtain the DRI driver name via EGL_MESA_query_driver. */ - driver_names[0] = glamor_egl_get_driver_name(pScreen); + #if defined(GLAMOR_HAS_EGL_QUERY_DRIVER) + driver_names[0] = glamor_egl_get_driver_name(pScreen); + #endif if (driver_names[0]) {