From 8da4c65aac9393208e3c2a57d335f711ae114b50 Mon Sep 17 00:00:00 2001
From: Jay Sorg <jay.sorg@gmail.com>
Date: Sat, 10 Mar 2012 15:48:29 -0800
Subject: [PATCH] xorg: X11rdp

---
 xorg/X11R7.6/buildx.sh     |  3 +-
 xorg/X11R7.6/rdp/Makefile  |  7 ++--
 xorg/X11R7.6/rdp/rdpmain.c | 76 +++++++++++++++++++++++++++++++++++++-
 3 files changed, 80 insertions(+), 6 deletions(-)

diff --git a/xorg/X11R7.6/buildx.sh b/xorg/X11R7.6/buildx.sh
index c2710a78..2e5073e2 100755
--- a/xorg/X11R7.6/buildx.sh
+++ b/xorg/X11R7.6/buildx.sh
@@ -349,7 +349,8 @@ make
 if [ $? -ne 0 ]; then
   echo ""
   echo "X11rdp make failed"
-  echo ""
+  echo "dropping you in dir, type exit to get out"
+  bash
   exit 1
 fi
 
diff --git a/xorg/X11R7.6/rdp/Makefile b/xorg/X11R7.6/rdp/Makefile
index c373d91e..d4bbec70 100644
--- a/xorg/X11R7.6/rdp/Makefile
+++ b/xorg/X11R7.6/rdp/Makefile
@@ -25,7 +25,7 @@ LIBS = $(XSRCBASE)/dbe/.libs/libdbe.a \
 	$(XSRCBASE)/glx/.libs/libglx.a \
 	$(XSRCBASE)/xfixes/.libs/libxfixes.a \
 	librdp.a \
-	-lfreetype -lz -lm -lXfont -lXau -lXdmcp -lpixman-1
+	-lfreetype -lz -lm -lXfont -lXau -lXdmcp -lpixman-1 -lrt -ldl -lgcrypt
 
 CFLAGS = -O2 -Wall -fno-strength-reduce \
 	-I../../include \
@@ -44,19 +44,20 @@ CFLAGS = -O2 -Wall -fno-strength-reduce \
 	-I../xfree86/os-support \
 	-D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_REENTRANT \
 	-DGLX_USE_MESA -DXRECORD -D_GNU_SOURCE -DXAPPGROUP \
-	-DXCSECURITY -DTOGCUP -DSINGLEDEPTH -DXFree86Server \
+	-DTOGCUP -DSINGLEDEPTH -DXFree86Server \
 	-DDBE -DEVI -DXVMC -DFONTCACHE -DGCCUSESGAS -DSTATIC_COLOR \
 	-DAVOID_GLYPHBLT -DFUNCPROTO=15 -DNARROWPROTO -DDDXOSFATALERROR \
 	-DPART_NET -DDDXTIME -D_HAVE_XALLOC_DECLS \
 	\
 	-DXFIXES \
 	-DSMART_SCHEDULE -DSERVER_LOCK -DGLXEXT -DSHAPE -DRENDER -DRANDR \
-	-DBIGREQS -D_POSIX_SOURCE -D_BSD_SOURCE -DSCREENSAVER -DXF86BIGFONT \
+	-DBIGREQS -D_POSIX_SOURCE -D_BSD_SOURCE -DSCREENSAVER \
 	-DXCMISC -DXTEST -DXTRAP -DXV -DXSYNC -DMITMISC -DPANORAMIX \
 	-DDPMSExtension -DXvExtension -DXvMCExtension -DXResExtension \
 	-DMITSHM -DPIXPRIV -DNDEBUG -DDDXOSINIT -DXKB -DXINPUT
 
 # -pedantic
+# -DXCSECURITY -DXF86BIGFONT
 
 # these are defined in xorg-server.h
 # -D_XOPEN_SOURCE=500L
diff --git a/xorg/X11R7.6/rdp/rdpmain.c b/xorg/X11R7.6/rdp/rdpmain.c
index cca24488..758759ab 100644
--- a/xorg/X11R7.6/rdp/rdpmain.c
+++ b/xorg/X11R7.6/rdp/rdpmain.c
@@ -30,6 +30,9 @@ Sets up the  functions
 #define DEBUG_OUT(arg) ErrorF arg
 #endif
 
+Bool noSecurityExtension = FALSE;
+Bool noXFree86BigfontExtension = FALSE;
+
 rdpScreenInfoRec g_rdpScreen; /* the one screen */
 ScreenPtr g_pScreen = 0;
 
@@ -349,11 +352,11 @@ rdpScreenInit(int index, ScreenPtr pScreen, int argc, char** argv)
   }
   if (g_rdpScreen.bitsPerPixel == 1)
   {
-    ret = fbCreateDefColormap(pScreen);
+    //todo ret = fbCreateDefColormap(pScreen);
   }
   else
   {
-    ret = fbCreateDefColormap(pScreen);
+    //todo ret = fbCreateDefColormap(pScreen);
   }
   if (ret)
   {
@@ -588,6 +591,75 @@ OsVendorPreInit(void)
 {
 }
 
+/******************************************************************************/
+void
+CloseInput(void)
+{
+  ErrorF("CloseInput\n");
+}
+
+/******************************************************************************/
+void
+DDXRingBell(int volume, int pitch, int duration)
+{
+  ErrorF("DDXRingBell\n");
+}
+
+/******************************************************************************/
+void
+DeleteInputDeviceRequest(DeviceIntPtr dev)
+{
+  ErrorF("DeleteInputDeviceRequest\n");
+}
+
+/******************************************************************************/
+Bool
+fbInitializeColormap(ColormapPtr pmap)
+{
+  ErrorF("fbInitializeColormap\n");
+  return 1;
+}
+
+/******************************************************************************/
+void
+fbInstallColormap(ColormapPtr pmap)
+{
+  ErrorF("fbInstallColormap\n");
+}
+
+/******************************************************************************/
+void
+fbUninstallColormap(ColormapPtr pmap)
+{
+  ErrorF("fbUninstallColormap\n");
+}
+
+/******************************************************************************/
+int
+fbListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps)
+{
+  ErrorF("fbListInstalledColormaps\n");
+  return 1;
+}
+
+/******************************************************************************/
+void
+fbResolveColor(unsigned short *pred, unsigned short *pgreen,
+               unsigned short *pblue, VisualPtr pVisual)
+{
+  ErrorF("fbResolveColor\n");
+}
+
+/******************************************************************************/
+Bool
+fbInitVisuals(VisualPtr* visualp, DepthPtr* depthp, int* nvisualp,
+  int* ndepthp, int* rootDepthp, VisualID* defaultVisp, unsigned long sizes,
+  int bitsPerRGB)
+{
+  ErrorF("fbInitVisuals\n");
+  return 1;
+}
+
 /******************************************************************************/
 /*
  * Answer queries about the RandR features supported.