Merge pull request #295 from matt335672/improve_glamor_config

Improve --enable-glamor behaviour

.github/workflows/build.yml

@@ -29,6 +29,7 @@ jobs:
 
           - CC: gcc
             CONF_FLAGS: --enable-glamor
+            CHECK: 1
             name_extra: With glamor
 
           - CC: gcc
@@ -50,6 +51,7 @@ jobs:
 
           - CC: clang
             CONF_FLAGS: --enable-glamor
+            CHECK: 1
             name_extra: With glamor
 
           - CC: clang

configure.ac

@@ -56,9 +56,11 @@ PKG_CHECK_MODULES([XORG_SERVER], [xorg-server >= 0], [],
   [AC_MSG_ERROR([please install xserver-xorg-dev, xorg-x11-server-sdk or xorg-x11-server-devel])])
 if test "x${enable_glamor}" = "xyes"; then
   PKG_CHECK_MODULES([XORG_SERVER_GLAMOR], [xorg-server >= 1.19.0])
+  PKG_CHECK_MODULES([LIBDRM], [libdrm >= 0], [], [AC_MSG_ERROR([please install libdrm-dev or libdrm-devel])])
   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_VAR([XORG_SERVER_MODULES], [xorg-server], [moduledir])
 fi
 
 if test x$solaris = xyes; then

module/Makefile.am

@@ -5,6 +5,7 @@ EXTRA_HEADERS =
 SUBDIRS =
 ASMLIB =
 EGLLIB =
+LIB_SEARCH_PATH =
 
 if WITH_SIMD_AMD64
 EXTRA_FLAGS += -DSIMD_USE_ACCEL=1
@@ -19,10 +20,11 @@ ASMLIB += x86/libxorgxrdp-asm.la
 endif
 
 if WITH_GLAMOR
-EXTRA_FLAGS += -DXORGXRDP_GLAMOR -DGLAMOR_FOR_XORG
+EXTRA_FLAGS += $(LIBDRM_CFLAGS) -DXORGXRDP_GLAMOR -DGLAMOR_FOR_XORG
 EXTRA_SOURCES += rdpEgl.c
 EXTRA_HEADERS += rdpEgl.h
-EGLLIB += -lepoxy
+EGLLIB += -L$(XORG_SERVER_MODULES) -lglamoregl -lepoxy
+LIB_SEARCH_PATH += -R$(XORG_SERVER_MODULES)
 endif
 
 AM_CFLAGS = \
@@ -81,7 +83,7 @@ noinst_HEADERS = \
 
 libxorgxrdp_la_LTLIBRARIES = libxorgxrdp.la
 
-libxorgxrdp_la_LDFLAGS = -module -avoid-version
+libxorgxrdp_la_LDFLAGS = -module -avoid-version $(LIB_SEARCH_PATH)
 
 libxorgxrdp_ladir = $(moduledir)
 

xrdpdev/Makefile.am

@@ -5,7 +5,7 @@ EXTRA_HEADERS =
 
 
 if WITH_GLAMOR
-EXTRA_FLAGS += -DXORGXRDP_GLAMOR -DGLAMOR_FOR_XORG
+EXTRA_FLAGS += $(LIBDRM_CFLAGS) -DXORGXRDP_GLAMOR -DGLAMOR_FOR_XORG
 EXTRA_SOURCES += xrdpdri2.c xrdpdri3.c
 EXTRA_HEADERS += xrdpdri2.h xrdpdri3.h
 endif