This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 24a40d4ffd9c53b0de152f0d3ab48d32547fe48c Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Jan 20 14:12:07 2020 +0100 x2gokdrive{.c,remote.c,init.{c,h}}: patch for X.Org 1.18.x compatibility, merging in the content from patches.legacy/osuse_42.3.patch via preprocessor defines. --- debian/changelog | 3 +++ x2gokdrive.c | 23 ++++++++++++++++++++--- x2gokdriveinit.c | 3 +++ x2gokdriveremote.c | 27 +++++++++++++++++++++++++++ x2gokdriveremote.h | 8 ++++++++ 5 files changed, 61 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5f057da..5e8fdeb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -49,6 +49,9 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium - patches.xorg/1.20.3: add actual (rebased) patches and potentially missing files. - patches.xorg/1.18.4: refresh against Ubuntu 16.04/xenial version. + - x2gokdrive{.c,remote.c,init.{c,h}}: patch for X.Org 1.18.x + compatibility, merging in the content from + patches.legacy/osuse_42.3.patch via preprocessor defines. * debian/control: + Grammar fix. + Remove dependencies that refer to disabled features. diff --git a/x2gokdrive.c b/x2gokdrive.c index 91d0dd3..3789fee 100644 --- a/x2gokdrive.c +++ b/x2gokdrive.c @@ -234,7 +234,12 @@ ephyrMapFramebuffer(KdScreenInfo * screen) buffer_height = ephyrBufferHeight(screen); priv->base = - remote_screen_init(screen, screen->x, screen->y, + remote_screen_init(screen, +#if XORG_VERSION_CURRENT < 11900000 + 0, 0, +#else /* XORG_VERSION_CURRENT */ + screen->x, screen->y, +#endif /* XORG_VERSION_CURRENT */ screen->width, screen->height, buffer_height, &priv->bytes_per_line, &screen->fb.bitsPerPixel); @@ -346,14 +351,22 @@ ephyrInternalDamageRedisplay(ScreenPtr pScreen) static void -ephyrScreenBlockHandler(ScreenPtr pScreen, void *timeout) +ephyrScreenBlockHandler(ScreenPtr pScreen, void *timeout +#if XORG_VERSION_CURRENT < 11900000 + , void *pReadMask +#endif /* XORG_VERSION_CURRENT */ + ) { KdScreenPriv(pScreen); KdScreenInfo *screen = pScreenPriv->screen; EphyrScrPriv *scrpriv = screen->driver; pScreen->BlockHandler = scrpriv->BlockHandler; - (*pScreen->BlockHandler)(pScreen, timeout); + (*pScreen->BlockHandler)(pScreen, timeout +#if XORG_VERSION_CURRENT < 11900000 + , pReadMask +#endif /* XORG_VERSION_CURRENT */ + ); scrpriv->BlockHandler = pScreen->BlockHandler; pScreen->BlockHandler = ephyrScreenBlockHandler; @@ -1069,11 +1082,15 @@ ScreenPtr ephyrCursorScreen; /* screen containing the cursor */ static void ephyrWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y) { +#if XORG_VERSION_CURRENT < 11900000 input_lock(); +#endif /* XORG_VERSION_CURRENT */ ephyrCursorScreen = pScreen; miPointerWarpCursor(inputInfo.pointer, pScreen, x, y); +#if XORG_VERSION_CURRENT < 11900000 input_unlock(); +#endif /* XORG_VERSION_CURRENT */ } miPointerScreenFuncRec ephyrPointerScreenFuncs = { diff --git a/x2gokdriveinit.c b/x2gokdriveinit.c index 89fabb6..bfad59f 100644 --- a/x2gokdriveinit.c +++ b/x2gokdriveinit.c @@ -333,5 +333,8 @@ ephyrInitFake(void) { return 1; } KdOsFuncs EphyrOsFuncs = { .Init = ephyrInitFake, +#if XORG_VERSION_CURRENT < 11900000 + .pollEvents = pollEvents, +#endif /* XORG_VERSION_CURRENT */ }; #endif /* XORG_VERSION_CURRENT */ diff --git a/x2gokdriveremote.c b/x2gokdriveremote.c index 7ed24cd..17aaa61 100644 --- a/x2gokdriveremote.c +++ b/x2gokdriveremote.c @@ -1436,7 +1436,9 @@ void *send_frame_thread (void *threadid) //only accept one client, close server socket shutdown(remoteVars.serversock, SHUT_RDWR); close(remoteVars.serversock); +#if XORG_VERSION_CURRENT < 11900000 SetNotifyFd(remoteVars.clientsock, clientReadNotify, X_NOTIFY_READ, NULL); +#endif /* XORG_VERSION_CURRENT */ remoteVars.client_connected=TRUE; if(remoteVars.checkConnectionTimer) { @@ -1457,7 +1459,9 @@ void *send_frame_thread (void *threadid) if(!remoteVars.client_connected) { EPHYR_DBG ("TCP connection closed\n"); +#if XORG_VERSION_CURRENT < 11900000 RemoveNotifyFd(remoteVars.clientsock); +#endif /* XORG_VERSION_CURRENT */ shutdown(remoteVars.clientsock, SHUT_RDWR); close(remoteVars.clientsock); pthread_mutex_unlock(&remoteVars.sendqueue_mutex); @@ -2094,6 +2098,29 @@ clientReadNotify(int fd, int ready, void *data) } +#if XORG_VERSION_CURRENT < 11900000 +void pollEvents(void) +{ + //EPHYR_DBG("polling events"); + struct pollfd fds[2]; + int nfds = 1; + BOOL con; + pthread_mutex_lock(&remoteVars.sendqueue_mutex); + con=remoteVars.client_connected; + pthread_mutex_unlock(&remoteVars.sendqueue_mutex); + if(!con) + return; + + memset(fds, 0 , sizeof(fds)); + fds[0].fd = remoteVars.clientsock; + fds[0].events = POLLIN; + if(poll(fds, nfds, 0)) + { + clientReadNotify(remoteVars.clientsock, 0, NULL); + } +} +#endif /* XORG_VERSION_CURRENT */ + unsigned int checkSocketConnection(OsTimerPtr timer, CARD32 time, void* args) { EPHYR_DBG("CHECKING ACCEPTED CONNECTION"); diff --git a/x2gokdriveremote.h b/x2gokdriveremote.h index 9a23b69..728edb5 100644 --- a/x2gokdriveremote.h +++ b/x2gokdriveremote.h @@ -87,6 +87,10 @@ #include <netinet/in.h> #include <netdb.h> #include <arpa/inet.h> +#if XORG_VERSION_CURRENT < 11900000 +#include <poll.h> +#endif /* XORG_VERSION_CURRENT */ + #define EPHYR_WANT_DEBUG 1 // #warning DEBUG ENABLED @@ -372,6 +376,10 @@ struct _remoteHostVars int send_selection(int sel, char* data, uint32_t length, uint32_t mimeData); +#if XORG_VERSION_CURRENT < 11900000 +void clientReadNotify(int fd, int ready, void *data); +void pollEvents(void); +#endif /* XORG_VERSION_CURRENT */ void clear_cache_data(uint32_t maxsize); void clear_frame_cache(uint32_t max_elements); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit a00a136187b0793b19efc4e91709d7343150ac95 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Jan 20 14:27:40 2020 +0100 debian/control: make libxfont1-dev an entirely optional dependency and libxfont-dev a hard one. This should always install libxfont-dev (which typically is the libXfont2-version), but also the libXfont1-version if available. Ubuntu 16.04/xenial has X.Org Server 1.18.4 which is not compatible with libXfont2, but Debian 9/stretch uses X.Org Server 1.19.2, which is compatible with libXfont2 (and actually requires it), but also has both packages available. --- debian/changelog | 7 +++++++ debian/control | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8ab176a..f02df79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -64,6 +64,13 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium + Try to pull libxfont1-dev (for old Ubuntu versions such as 16.04/xenial that don't support building X.Org against libXfont2) and fallback to libxfont-dev to retain the old, default behavior. + + Make libxfont1-dev an entirely optional dependency and libxfont-dev a + hard one. This should always install libxfont-dev (which typically is + the libXfont2-version), but also the libXfont1-version if available. + Ubuntu 16.04/xenial has X.Org Server 1.18.4 which is not compatible with + libXfont2, but Debian 9/stretch uses X.Org Server 1.19.2, which is + compatible with libXfont2 (and actually requires it), but also has both + packages available. * x2gokdrive.spec: + Drop Debian-style formatting in description. + Typo fixes. diff --git a/debian/control b/debian/control index 1c3abaa..9884bfb 100644 --- a/debian/control +++ b/debian/control @@ -47,7 +47,8 @@ Build-Depends: xtrans-dev (>= 1.3.2), libxau-dev (>= 1:1.0.5-2), libxdmcp-dev (>= 1:0.99.1), - libxfont1-dev (>= 1.4.2) | libxfont-dev (>= 1.4.2), + libxfont1-dev (>= 1.4.2) | hello, + libxfont-dev (>= 1.4.2), libxkbfile-dev (>= 1:0.99.1), libpixman-1-dev (>= 0.27.2), libpciaccess-dev (>= 0.12.901), -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit ec84072d276c321af0a5413ecb53890c4bd4e718 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Jan 20 14:33:02 2020 +0100 patches.xorg/: add 1.20.7 files, essentially copied and refreshed from 1.20.6. --- debian/changelog | 2 + .../missing/hw/xfree86/common/modeline2c.awk | 93 +++++++++++++++++ patches.xorg/1.20.7/quilt.env | 1 + patches.xorg/1.20.7/series | 2 + patches.xorg/1.20.7/xorg-server-configure-ac.patch | 113 +++++++++++++++++++++ .../1.20.7/xorg-server-hw-kdrive-Makefile-am.patch | 25 +++++ 6 files changed, 236 insertions(+) diff --git a/debian/changelog b/debian/changelog index f02df79..c0fc1e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -54,6 +54,8 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium patches.legacy/osuse_42.3.patch via preprocessor defines. - patches.xorg/: add 1.20.6 files, essentially copied and refreshed from 1.20.5. + - patches.xorg/: add 1.20.7 files, essentially copied and refreshed from + 1.20.6. * debian/control: + Grammar fix. + Remove dependencies that refer to disabled features. diff --git a/patches.xorg/1.20.7/missing/hw/xfree86/common/modeline2c.awk b/patches.xorg/1.20.7/missing/hw/xfree86/common/modeline2c.awk new file mode 100644 index 0000000..3c9f602 --- /dev/null +++ b/patches.xorg/1.20.7/missing/hw/xfree86/common/modeline2c.awk @@ -0,0 +1,93 @@ +#!/usr/bin/awk -f +# +# Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>. +# All rights reserved. +# +# Based on Perl script by Dirk Hohndel. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# Usage: modeline2c.awk < modefile > xf86DefModeSet.c +# + +BEGIN { + flagsdict[""] = "0" + + flagsdict["+hsync +vsync"] = "V_PHSYNC | V_PVSYNC" + flagsdict["+hsync -vsync"] = "V_PHSYNC | V_NVSYNC" + flagsdict["-hsync +vsync"] = "V_NHSYNC | V_PVSYNC" + flagsdict["-hsync -vsync"] = "V_NHSYNC | V_NVSYNC" + flagsdict["+hsync +vsync interlace"] = "V_PHSYNC | V_PVSYNC | V_INTERLACE" + flagsdict["+hsync -vsync interlace"] = "V_PHSYNC | V_NVSYNC | V_INTERLACE" + flagsdict["-hsync +vsync interlace"] = "V_NHSYNC | V_PVSYNC | V_INTERLACE" + flagsdict["-hsync -vsync interlace"] = "V_NHSYNC | V_NVSYNC | V_INTERLACE" + + print "/* THIS FILE IS AUTOMATICALLY GENERATED -- DO NOT EDIT -- LOOK at" + print " * modeline2c.awk */" + print "" + print "/*" + print " * Author: Joerg Sonnenberger <joerg@NetBSD.org>" + print " * Based on Perl script from Dirk Hohndel <hohndel@XFree86.Org>" + print " */" + print "" + print "#ifdef HAVE_XORG_CONFIG_H" + print "#include <xorg-config.h>" + print "#endif" + print "" + print "#include \"xf86.h\"" + print "#include \"xf86Config.h\"" + print "#include \"xf86Priv.h\"" + print "#include \"xf86_OSlib.h\"" + print "" + print "#include \"globals.h\"" + print "" + print "#define MODEPREFIX NULL, NULL, NULL, MODE_OK, M_T_DEFAULT" + print "#define MODESUFFIX 0,0, 0,0,0,0,0,0,0, 0,0,0,0,0,0,FALSE,FALSE,0,NULL,0,0.0,0.0" + print "" + print "const DisplayModeRec xf86DefaultModes [] = {" + + modeline = "\t{MODEPREFIX,%d, %d,%d,%d,%d,0, %d,%d,%d,%d,0, %s, MODESUFFIX},\n" + modeline_data = "^[a-zA-Z]+[ \t]+[^ \t]+[ \t0-9.]+" +} + +/^[mM][oO][dD][eE][lL][iI][nN][eE]/ { + flags = $0 + gsub(modeline_data, "", flags) + flags = tolower(flags) + printf(modeline, $3 * 1000, $4, $5, $6, $7, + $8, $9, $10, $11, flagsdict[flags]) + # Half-width double scanned modes + printf(modeline, $3 * 500, $4/2, $5/2, $6/2, $7/2, + $8/2, $9/2, $10/2, $11/2, flagsdict[flags] " | V_DBLSCAN") +} + +/^#/ { + print "/*" substr($0, 2) " */" +} + +END { + print "};" + printf "const int xf86NumDefaultModes = ARRAY_SIZE(xf86DefaultModes);" +} diff --git a/patches.xorg/1.20.7/quilt.env b/patches.xorg/1.20.7/quilt.env new file mode 120000 index 0000000..543e930 --- /dev/null +++ b/patches.xorg/1.20.7/quilt.env @@ -0,0 +1 @@ +../common/quilt.env \ No newline at end of file diff --git a/patches.xorg/1.20.7/series b/patches.xorg/1.20.7/series new file mode 100644 index 0000000..6a74a24 --- /dev/null +++ b/patches.xorg/1.20.7/series @@ -0,0 +1,2 @@ +xorg-server-configure-ac.patch +xorg-server-hw-kdrive-Makefile-am.patch diff --git a/patches.xorg/1.20.7/xorg-server-configure-ac.patch b/patches.xorg/1.20.7/xorg-server-configure-ac.patch new file mode 100644 index 0000000..a1787f0 --- /dev/null +++ b/patches.xorg/1.20.7/xorg-server-configure-ac.patch @@ -0,0 +1,113 @@ +--- a/configure.ac 2020-01-13 23:57:05.000000000 +0100 ++++ b/configure.ac 2020-01-20 14:31:12.970926474 +0100 +@@ -31,7 +31,7 @@ RELEASE_DATE="2020-01-13" + RELEASE_NAME="Stuffed French Toast" + AC_CONFIG_SRCDIR([Makefile.am]) + AC_CONFIG_MACRO_DIR([m4]) +-AM_INIT_AUTOMAKE([foreign dist-bzip2]) ++AM_INIT_AUTOMAKE([foreign dist-bzip2 subdir-objects]) + AC_USE_SYSTEM_EXTENSIONS + + # Require xorg-macros minimum of 1.14 for XORG_COMPILER_BRAND in XORG_DEFAULT_OPTIONS +@@ -597,6 +597,7 @@ AC_ARG_ENABLE(glamor, AS_HELP_ST + dnl kdrive and its subsystems + AC_ARG_ENABLE(kdrive, AS_HELP_STRING([--enable-kdrive], [Build kdrive servers (default: no)]), [KDRIVE=$enableval], [KDRIVE=no]) + AC_ARG_ENABLE(xephyr, AS_HELP_STRING([--enable-xephyr], [Build the kdrive Xephyr server (default: auto)]), [XEPHYR=$enableval], [XEPHYR=auto]) ++AC_ARG_ENABLE(x2gokdrive, AS_HELP_STRING([--enable-x2gokdrive], [Build the kdrive x2gokdrive server (default: auto)]), [X2GOKDRIVE=$enableval], [X2GOKDRIVE=auto]) + dnl kdrive options + AC_ARG_ENABLE(libunwind, AS_HELP_STRING([--enable-libunwind], [Use libunwind for backtracing (default: auto)]), [LIBUNWIND="$enableval"], [LIBUNWIND="auto"]) + AC_ARG_ENABLE(xshmfence, AS_HELP_STRING([--disable-xshmfence], [Disable xshmfence (default: auto)]), [XSHMFENCE="$enableval"], [XSHMFENCE="auto"]) +@@ -1769,6 +1770,8 @@ if test "x$XORG" = xauto; then + fi + AC_MSG_RESULT([$XORG]) + ++AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) ++ + if test "x$XORG" = xyes; then + XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' + XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' +@@ -1983,7 +1986,6 @@ if test "x$XORG" = xyes; then + AC_DEFINE(XORG_SERVER, 1, [Building Xorg server]) + AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) + AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) +- AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) + AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) + AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) + AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) +@@ -2263,9 +2265,15 @@ dnl kdrive DDX + XEPHYR_LIBS= + XEPHYR_INCS= + ++X2GOKDRIVE_LIBS= ++X2GOKDRIVE_INCS= ++ + AM_CONDITIONAL(KDRIVE, [test x$KDRIVE = xyes]) + + if test "$KDRIVE" = yes; then ++ ++ ### XEPHYR ++ + XEPHYR_REQUIRED_LIBS="xau xdmcp xcb xcb-shape xcb-render xcb-renderutil xcb-aux xcb-image xcb-icccm xcb-shm >= 1.9.3 xcb-keysyms xcb-randr xcb-xkb" + if test "x$XV" = xyes; then + XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xcb-xv" +@@ -2305,6 +2313,43 @@ if test "$KDRIVE" = yes; then + + AC_SUBST([XEPHYR_LIBS]) + AC_SUBST([XEPHYR_INCS]) ++ ++ ### X2GOKDRIVE ++ ++ X2GOKDRIVE_REQUIRED_LIBS="xau xdmcp xcb xcb-shape xcb-render xcb-renderutil xcb-aux xcb-image xcb-icccm xcb-shm >= 1.9.3 xcb-keysyms xcb-randr xcb-xkb zlib libjpeg libpng" ++ if test "x$DRI" = xyes && test "x$GLX" = xyes; then ++ X2GOKDRIVE_REQUIRED_LIBS="$X2GOKDRIVE_REQUIRED_LIBS $LIBDRM xcb-glx xcb-xf86dri > 1.6" ++ fi ++ ++ if test "x$X2GOKDRIVE" = xauto; then ++ PKG_CHECK_MODULES(X2GOKDRIVE, $X2GOKDRIVE_REQUIRED_LIBS, [X2GOKDRIVE="yes"], [X2GOKDRIVE="no"]) ++ elif test "x$X2GOKDRIVE" = xyes ; then ++ PKG_CHECK_MODULES(X2GOKDRIVE, $X2GOKDRIVE_REQUIRED_LIBS) ++ fi ++ ++ # X2GOKDRIVE needs nanosleep() which is in librt on Solaris ++ AC_CHECK_FUNC([nanosleep], [], ++ AC_CHECK_LIB([rt], [nanosleep], X2GOKDRIVE_LIBS="$X2GOKDRIVE_LIBS -lrt")) ++ ++ # damage shadow extension glx (NOTYET) fb mi ++ KDRIVE_INC='-I$(top_srcdir)/hw/kdrive/src' ++ KDRIVE_PURE_INCS="$KDRIVE_INC $MIEXT_SYNC_INC $MIEXT_DAMAGE_INC $MIEXT_SHADOW_INC $XEXT_INC $FB_INC $MI_INC" ++ KDRIVE_OS_INC='-I$(top_srcdir)/hw/kdrive/linux' ++ KDRIVE_INCS="$KDRIVE_PURE_INCS $KDRIVE_OS_INC" ++ ++ KDRIVE_CFLAGS="$XSERVER_CFLAGS" ++ ++ KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $OS_LIB" ++ KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.la' ++ KDRIVE_MAIN_LIB="$MAIN_LIB" ++ KDRIVE_LOCAL_LIBS="$DIX_LIB $KDRIVE_LIB" ++ KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS" ++ KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB" ++ KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS" ++ ++ AC_SUBST([X2GOKDRIVE_LIBS]) ++ AC_SUBST([X2GOKDRIVE_INCS]) ++ + fi + AC_SUBST([KDRIVE_INCS]) + AC_SUBST([KDRIVE_PURE_INCS]) +@@ -2314,6 +2359,7 @@ AC_SUBST([KDRIVE_MAIN_LIB]) + AC_SUBST([KDRIVE_LOCAL_LIBS]) + AC_SUBST([KDRIVE_LIBS]) + AM_CONDITIONAL(XEPHYR, [test "x$KDRIVE" = xyes && test "x$XEPHYR" = xyes]) ++AM_CONDITIONAL(X2GOKDRIVE, [test "x$KDRIVE" = xyes && test "x$X2GOKDRIVE" = xyes]) + + dnl Xwayland DDX + +@@ -2535,6 +2581,8 @@ hw/xquartz/xpr/Makefile + hw/kdrive/Makefile + hw/kdrive/ephyr/Makefile + hw/kdrive/ephyr/man/Makefile ++hw/kdrive/x2gokdrive/Makefile ++hw/kdrive/x2gokdrive/man/Makefile + hw/kdrive/src/Makefile + hw/xwayland/Makefile + test/Makefile diff --git a/patches.xorg/1.20.7/xorg-server-hw-kdrive-Makefile-am.patch b/patches.xorg/1.20.7/xorg-server-hw-kdrive-Makefile-am.patch new file mode 100644 index 0000000..d43472c --- /dev/null +++ b/patches.xorg/1.20.7/xorg-server-hw-kdrive-Makefile-am.patch @@ -0,0 +1,25 @@ +--- a/hw/kdrive/Makefile.am 2020-01-13 23:57:05.000000000 +0100 ++++ b/hw/kdrive/Makefile.am 2020-01-20 14:31:17.113943624 +0100 +@@ -1,15 +1,20 @@ ++if X2GOKDRIVE ++X2GOKDRIVE_SUBDIRS = x2gokdrive ++endif ++ + if XEPHYR + XEPHYR_SUBDIRS = ephyr + endif + + SERVER_SUBDIRS = \ +- $(XEPHYR_SUBDIRS) ++ $(XEPHYR_SUBDIRS) \ ++ $(X2GOKDRIVE_SUBDIRS) + + SUBDIRS = \ + src \ + $(SERVER_SUBDIRS) + +-DIST_SUBDIRS = ephyr src ++DIST_SUBDIRS = ephyr x2gokdrive src + + relink: + $(AM_V_at)for i in $(SERVER_SUBDIRS) ; do $(MAKE) -C $$i relink || exit 1 ; done -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git