openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File glamor.patch of Package xorgxrdp

diff -uNr xorgxrdp-0.9.19.orig/configure.ac xorgxrdp-0.9.19/configure.ac
--- xorgxrdp-0.9.19.orig/configure.ac	2023-06-24 16:18:09.626641470 +0800
+++ xorgxrdp-0.9.19/configure.ac	2023-06-24 16:20:13.822138662 +0800
@@ -25,9 +25,11 @@
   [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$XRDP_CFLAGS" = "x"; then
diff -uNr xorgxrdp-0.9.19.orig/module/Makefile.am xorgxrdp-0.9.19/module/Makefile.am
--- xorgxrdp-0.9.19.orig/module/Makefile.am	2023-06-24 16:18:09.630641447 +0800
+++ xorgxrdp-0.9.19/module/Makefile.am	2023-06-24 16:22:11.597810787 +0800
@@ -28,6 +28,8 @@
 AM_CFLAGS = \
   $(XORG_SERVER_CFLAGS) \
   $(XRDP_CFLAGS) \
+  $(LIBDRM_CFLAGS) \
+  $(EPOXY_CFLAGS) \
   -DPACKAGE_VERSION_MAJOR=@package_version_major@ \
   -DPACKAGE_VERSION_MINOR=@package_version_minor@ \
   -DPACKAGE_VERSION_PATCHLEVEL=@package_version_patchlevel@ \
@@ -82,6 +84,9 @@
 libxorgxrdp_la_LTLIBRARIES = libxorgxrdp.la
 
 libxorgxrdp_la_LDFLAGS = -module -avoid-version
+if WITH_GLAMOR
+libxorgxrdp_la_LDFLAGS += $(EPOXY_LDFLAGS) -L$(XORG_SERVER_MODULES) -lglamoregl -Wl,-rpath,$(XORG_SERVER_MODULES)
+endif
 
 libxorgxrdp_ladir = $(moduledir)
 
diff -uNr xorgxrdp-0.9.19.orig/xrdpdev/Makefile.am xorgxrdp-0.9.19/xrdpdev/Makefile.am
--- xorgxrdp-0.9.19.orig/xrdpdev/Makefile.am	2023-06-24 16:18:09.626641470 +0800
+++ xorgxrdp-0.9.19/xrdpdev/Makefile.am	2023-06-24 16:23:29.973592583 +0800
@@ -13,6 +13,7 @@
 AM_CFLAGS = \
   $(XORG_SERVER_CFLAGS) \
   $(XRDP_CFLAGS) \
+  $(LIBDRM_CFLAGS) \
   -DPACKAGE_VERSION_MAJOR=@package_version_major@ \
   -DPACKAGE_VERSION_MINOR=@package_version_minor@ \
   -DPACKAGE_VERSION_PATCHLEVEL=@package_version_patchlevel@ \
diff -uNr xorgxrdp-0.9.19.orig/xrdpkeyb/Makefile.am xorgxrdp-0.9.19/xrdpkeyb/Makefile.am
--- xorgxrdp-0.9.19.orig/xrdpkeyb/Makefile.am	2023-06-24 16:18:09.630641447 +0800
+++ xorgxrdp-0.9.19/xrdpkeyb/Makefile.am	2023-06-24 16:24:56.453042623 +0800
@@ -11,6 +11,9 @@
 xrdpkeyb_drv_la_LTLIBRARIES = xrdpkeyb_drv.la
 
 xrdpkeyb_drv_la_LDFLAGS = -module -avoid-version
+if WITH_GLAMOR
+xrdpkeyb_drv_la_LDFLAGS += -L$(XORG_SERVER_MODULES) -lglamoregl -Wl,-rpath,$(XORG_SERVER_MODULES)
+endif
 
 xrdpkeyb_drv_ladir = $(moduledir)/input

Places

File glamor.patch of Package xorgxrdp

Places