Building xorgxrdp with xlibre-xserver-devel fails while compiling rdpClientCon.c due to 'display' being undeclared

[artist4xlibre]

Select the version

25.0.0.X

Describe your issue

xlibre-xserver-devel 25.0.0.14
xorgxrdp 0.10.4

Building xorgxrdp with xlibre-xserver-devel fails while compiling rdpClientCon.c due to 'display' being undeclared.
This on Artix Linux (Arch derivative).

Error is:

rdpClientCon.c: In function 'rdpClientConInit':
rdpClientCon.c:1584:21: error: 'display' undeclared (first use in this function)
 1584 |     i = (int)strtol(display, &endptr, 10);

Steps to reproduce

1. Install xlibre-xserver-devel
2. Build xorgxrdp

The git version of xorgxrdp also fails to compile

What did you expect?

xorgxrdp to build successfully with xlibre-xserver-devel

Additional Information

No response

Extra fields

• I have checked the existing issues
• I have read the Contributing Guidelines
• I'd like to work on this issue

[cepelinas9000]

see: #487 my patch here is not enough ?

[artist4xlibre]

see: #487 my patch here is not enough ?

Unfortunately not.

[artist4xlibre]

This is where the new logic seems to fail: https://github.com/neutrinolabs/xorgxrdp/blob/8ed4c4571ef4564427c323aa4a7ab1eb34458167/configure.ac#L123

AC_CHECK_DECL([dixGetDisplayName],
    [AC_DEFINE([HAS_DIX_GET_DISPLAY_NAME], [1], [support display getter])],
    [],
    [[#include <dix.h>]])

As the output of configure shows:
checking whether dixGetDisplayName is declared... no

[cepelinas9000]

@artist4xlibre try this one:

diff --git a/configure.ac b/configure.ac
index 70977ec..e95a0db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,7 +123,8 @@ CFLAGS="$CFLAGS $XORG_SERVER_CFLAGS"
 AC_CHECK_DECL([dixGetDisplayName],
     [AC_DEFINE([HAS_DIX_GET_DISPLAY_NAME], [1], [support display getter])],
     [],
-    [[#include <dix.h>]])
+    [[#include <xorg-server.h>
+    #include <dix.h>]])
 CFLAGS="$CFLAGS_sav"
 
 
diff --git a/module/rdpCapture.c b/module/rdpCapture.c
index 83abb38..e5e7dd8 100644
--- a/module/rdpCapture.c
+++ b/module/rdpCapture.c
@@ -757,7 +757,7 @@ rdpCopyBoxList(rdpClientCon *clientCon, PixmapPtr dstPixmap,
         return FALSE;
     }
     tmpval[0].val = GXcopy;
-    ChangeGC(NullClient, copyGC, GCFunction, tmpval);
+    ChangeGC(NULL, copyGC, GCFunction, tmpval);
     ValidateGC(&(hwPixmap->drawable), copyGC);
     count = num_out_rects;
     pbox = out_rects;
diff --git a/module/rdpEgl.c b/module/rdpEgl.c
index 04866d8..ff6ca78 100644
--- a/module/rdpEgl.c
+++ b/module/rdpEgl.c
@@ -735,7 +735,7 @@ rdpEglCaptureRfx(rdpClientCon *clientCon, RegionPtr in_reg, BoxPtr *out_rects,
     {
         tmpval[0].val = GXcopy;
         tmpval[1].val = 0;
-        ChangeGC(NullClient, rfxGC, GCFunction | GCForeground, tmpval);
+        ChangeGC(NULL, rfxGC, GCFunction | GCForeground, tmpval);
         ValidateGC(&(screen_pixmap->drawable), rfxGC);
         pixmap = pScreen->CreatePixmap(pScreen, width, height,
                                        pScreen->rootDepth,
diff --git a/module/rdpMain.c b/module/rdpMain.c
index cca3d6f..8840095 100644
--- a/module/rdpMain.c
+++ b/module/rdpMain.c
@@ -95,7 +95,6 @@ static xf86ScreenInitProc *g_orgScreenInit;
 static Bool g_nvidia_grid = 0;
 
 extern DriverPtr *xf86DriverList;
-extern int xf86NumDrivers;
 
 /*****************************************************************************/
 static Bool
@@ -492,10 +491,6 @@ xorgxrdpCheckWrap(void)
     {
         return 0;
     }
-    if (xf86NumDrivers < 1)
-    {
-        return 0;
-    }
     if ((xf86DriverList == NULL) || (xf86DriverList[0] == NULL) ||
         (xf86DriverList[0]->driverName == NULL))
     {

variable xf86NumDrivers is private in xlibre, but going though code it looks redundant check here. the configure.ac required to include xorh-server.h (if you have any qualms about m4 - is not my strong suit).

[artist4xlibre]

This patch is based on different code than from https://github.com/neutrinolabs/xorgxrdp/releases/download/v0.10.4/xorgxrdp-0.10.4.tar.gz

I updated the patch so it succeeds for the 1st 3 files.
File module/rdpMain.c does does contain any 'xf86Num' string so that part of the patch cannot be applied.

This is the resulting error:

rdpKeyboard.c: In function 'rdpLoadLayout':
rdpKeyboard.c:867:49: error: 'display' undeclared (first use in this function)
  867 |                keylayout, client_info->variant, display));