This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gokdrive. from 3c053c3 move calling of possibly thread-unsafe ospoll functions (SetNotifyFd, RemoveNotifyFd) to main thread. new 1843dc1 patches.xorg/: add 1.20.11 files, essentially copied and refreshed from 1.20.7. This is the X.Org Xserver version shipped with Debian bullseye. new 2f8f376 debian/control: Add B-D mesa-common-dev. Introduced here with the X.Org Xserver 1.20.11 patchset. new 9e86bfa x2gokdriveinit.c: Only define ddxInputThreadInit() prototype for XORG_VERSION_CURRENT less than 1.20.7. Starting with 1.20.8, the prototype definition is now available in include/os.h. new 5580cf9 x2gokdrivedebug.h: Introduce this new file and move all EPHYR_DBG stuff into there. And: disable EPHYR_WANT_DEBUG as with it, the project fails to build with standard Debian compiler flags." The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/control | 1 + .../missing/hw/xfree86/common/modeline2c.awk | 0 patches.xorg/{1.18.4 => 1.20.11}/quilt.env | 0 patches.xorg/{1.18.4 => 1.20.11}/series | 0 .../xorg-server-configure-ac.patch | 22 +++++----- .../xorg-server-hw-kdrive-Makefile-am.patch | 0 x2gokdrive.c | 1 + x2gokdrivedebug.h | 51 ++++++++++++++++++++++ x2gokdriveinit.c | 3 ++ x2gokdriveremote.c | 3 ++ x2gokdriveremote.h | 21 --------- x2gokdriveselection.c | 3 ++ 12 files changed, 73 insertions(+), 32 deletions(-) copy patches.xorg/{1.20.3 => 1.20.11}/missing/hw/xfree86/common/modeline2c.awk (100%) copy patches.xorg/{1.18.4 => 1.20.11}/quilt.env (100%) copy patches.xorg/{1.18.4 => 1.20.11}/series (100%) copy patches.xorg/{1.20.4 => 1.20.11}/xorg-server-configure-ac.patch (89%) copy patches.xorg/{1.20.7 => 1.20.11}/xorg-server-hw-kdrive-Makefile-am.patch (100%) create mode 100644 x2gokdrivedebug.h -- 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 2f8f37614c97d265bf51964edf194c7e3fb43b2c Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Jun 13 23:52:54 2021 +0200 debian/control: Add B-D mesa-common-dev. Introduced here with the X.Org Xserver 1.20.11 patchset. --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index a7e3efc..d348b9b 100644 --- a/debian/control +++ b/debian/control @@ -90,6 +90,7 @@ Build-Depends: libxcb-glx0-dev, libxcb-xfixes0-dev, libxcb-xf86dri0-dev (>= 1.6), + mesa-common-dev, Standards-Version: 4.3.0 Homepage: https://code.x2go.org/releases/source/x2gokdrive Vcs-Git: git://code.x2go.org/x2gokdrive.git -- 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 1843dc1366e54f0ad5ad0a904492102c67cbfa95 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Jun 13 23:51:50 2021 +0200 patches.xorg/: add 1.20.11 files, essentially copied and refreshed from 1.20.7. This is the X.Org Xserver version shipped with Debian bullseye. --- .../missing/hw/xfree86/common/modeline2c.awk | 93 +++++++++++++++++ patches.xorg/1.20.11/quilt.env | 1 + patches.xorg/1.20.11/series | 2 + .../1.20.11/xorg-server-configure-ac.patch | 113 +++++++++++++++++++++ .../xorg-server-hw-kdrive-Makefile-am.patch | 25 +++++ 5 files changed, 234 insertions(+) diff --git a/patches.xorg/1.20.11/missing/hw/xfree86/common/modeline2c.awk b/patches.xorg/1.20.11/missing/hw/xfree86/common/modeline2c.awk new file mode 100644 index 0000000..3c9f602 --- /dev/null +++ b/patches.xorg/1.20.11/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.11/quilt.env b/patches.xorg/1.20.11/quilt.env new file mode 120000 index 0000000..543e930 --- /dev/null +++ b/patches.xorg/1.20.11/quilt.env @@ -0,0 +1 @@ +../common/quilt.env \ No newline at end of file diff --git a/patches.xorg/1.20.11/series b/patches.xorg/1.20.11/series new file mode 100644 index 0000000..6a74a24 --- /dev/null +++ b/patches.xorg/1.20.11/series @@ -0,0 +1,2 @@ +xorg-server-configure-ac.patch +xorg-server-hw-kdrive-Makefile-am.patch diff --git a/patches.xorg/1.20.11/xorg-server-configure-ac.patch b/patches.xorg/1.20.11/xorg-server-configure-ac.patch new file mode 100644 index 0000000..3270467 --- /dev/null +++ b/patches.xorg/1.20.11/xorg-server-configure-ac.patch @@ -0,0 +1,113 @@ +--- a/configure.ac 2021-06-13 22:26:02.644694476 +0200 ++++ b/configure.ac 2021-06-13 22:26:02.640694461 +0200 +@@ -31,7 +31,7 @@ RELEASE_DATE="2021-04-13" + RELEASE_NAME="Arroz con Pollo" + 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 +@@ -598,6 +598,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"]) +@@ -1786,6 +1787,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' +@@ -2000,7 +2003,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]) +@@ -2284,9 +2286,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" +@@ -2326,6 +2334,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 xcb-xfixes 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]) +@@ -2335,6 +2380,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 + +@@ -2556,6 +2602,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.11/xorg-server-hw-kdrive-Makefile-am.patch b/patches.xorg/1.20.11/xorg-server-hw-kdrive-Makefile-am.patch new file mode 100644 index 0000000..d43472c --- /dev/null +++ b/patches.xorg/1.20.11/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
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 5580cf9153f5af72051c013e1070ef9c549e2c04 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Jun 13 23:56:14 2021 +0200 x2gokdrivedebug.h: Introduce this new file and move all EPHYR_DBG stuff into there. And: disable EPHYR_WANT_DEBUG as with it, the project fails to build with standard Debian compiler flags." --- x2gokdrive.c | 1 + x2gokdrivedebug.h | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ x2gokdriveinit.c | 1 + x2gokdriveremote.c | 3 +++ x2gokdriveremote.h | 21 --------------------- x2gokdriveselection.c | 3 +++ 6 files changed, 59 insertions(+), 21 deletions(-) diff --git a/x2gokdrive.c b/x2gokdrive.c index 8673a6e..a98afd8 100644 --- a/x2gokdrive.c +++ b/x2gokdrive.c @@ -43,6 +43,7 @@ #include "inputstr.h" #include "scrnintstr.h" +#include "x2gokdrivedebug.h" #include "x2gokdrivelog.h" #include "xkbsrv.h" diff --git a/x2gokdrivedebug.h b/x2gokdrivedebug.h new file mode 100644 index 0000000..86368ef --- /dev/null +++ b/x2gokdrivedebug.h @@ -0,0 +1,51 @@ +/* + * X2GoKDrive - A kdrive X server for X2Go (based on Xephyr) + * Author Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> + * + * Copyright © 2018 phoca-GmbH + * + * + * + * Xephyr - A kdrive X server thats runs in a host X window. + * Authored by Matthew Allum <mallum@o-hand.com> + * + * Copyright © 2004 Nokia + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#ifndef X2GOKDRIVEDEBUG_H +#define X2GOKDRIVEDEBUG_H + +// # warning DEBUG ENABLED +// #define EPHYR_WANT_DEBUG + +#ifdef EPHYR_WANT_DEBUG +#define EPHYR_DBG(x, a...) \ +if(pthread_self()==debug_sendThreadId)\ +fprintf(stderr,"SEND:"__FILE__ ":%d,%s() " x "\n", __LINE__, __func__, ##a);\ +else if (pthread_self()==debug_selectThreadId)\ +fprintf(stderr,"SEL:"__FILE__ ":%d,%s() " x "\n", __LINE__, __func__, ##a);\ +else \ +fprintf(stderr,"MAIN:"__FILE__ ":%d,%s() " x "\n", __LINE__, __func__, ##a) +#else +#define EPHYR_DBG(x, a...) do {} while (0) +#endif + +#ifdef EPHYR_WANT_DEBUG +unsigned long long int debug_sendThreadId; +unsigned long long int debug_selectThreadId; +#endif /* EPHYR_WANT_DEBUG */ + +#endif /* X2GOKDRIVE_H */ diff --git a/x2gokdriveinit.c b/x2gokdriveinit.c index b2400b9..ac07132 100644 --- a/x2gokdriveinit.c +++ b/x2gokdriveinit.c @@ -38,6 +38,7 @@ #include "x2gokdrivelog.h" #include "glx_extinit.h" #include "x2gokdriveremote.h" +#include "x2gokdrivedebug.h" extern Window EphyrPreExistingHostWin; extern Bool EphyrWantGrayScale; diff --git a/x2gokdriveremote.c b/x2gokdriveremote.c index f317cb3..fb5165e 100644 --- a/x2gokdriveremote.c +++ b/x2gokdriveremote.c @@ -35,6 +35,7 @@ #endif #include "x2gokdriveremote.h" +#include "x2gokdrivedebug.h" #include "x2gokdriveselection.h" #include <zlib.h> @@ -1436,7 +1437,9 @@ void *send_frame_thread (void *threadid) { enum SelectionType r; +#ifdef EPHYR_WANT_DEBUG debug_sendThreadId=pthread_self(); +#endif /* EPHYR_WANT_DEBUG */ while(1) { diff --git a/x2gokdriveremote.h b/x2gokdriveremote.h index d7d368b..b658e1b 100644 --- a/x2gokdriveremote.h +++ b/x2gokdriveremote.h @@ -100,24 +100,6 @@ //Changes 3 - 4: extended clipboard support for web client #define FEATURE_VERSION 4 - -#define EPHYR_WANT_DEBUG 1 -// #warning DEBUG ENABLED - - -#if (EPHYR_WANT_DEBUG) -#define EPHYR_DBG(x, a...) \ -if(pthread_self()==debug_sendThreadId)\ -fprintf(stderr,"SEND:"__FILE__ ":%d,%s() " x "\n", __LINE__, __func__, ##a);\ -else if (pthread_self()==debug_selectThreadId)\ -fprintf(stderr,"SEL:"__FILE__ ":%d,%s() " x "\n", __LINE__, __func__, ##a);\ -else \ -fprintf(stderr,"MAIN:"__FILE__ ":%d,%s() " x "\n", __LINE__, __func__, ##a) -#else -#define EPHYR_DBG(x, a...) do {} while (0) -#endif - - #define MAXMSGSIZE 1024*16 //port to listen by default @@ -450,9 +432,6 @@ struct _remoteHostVars struct SelectionStructure selstruct; } ; -unsigned long long int debug_sendThreadId; -unsigned long long int debug_selectThreadId; - int send_selection_chunk(int sel, unsigned char* data, uint32_t length, uint32_t format, BOOL first, BOOL last, uint32_t compressed, uint32_t total); int send_output_selection(struct OutputChunk* chunk); diff --git a/x2gokdriveselection.c b/x2gokdriveselection.c index d996320..89aa3ed 100644 --- a/x2gokdriveselection.c +++ b/x2gokdriveselection.c @@ -45,6 +45,7 @@ #endif #include "x2gokdriveselection.h" +#include "x2gokdrivedebug.h" #define SELECTION_DELAY 30000 //timeout for selection operation #define INCR_SIZE 256*1024 //size of part for incr selection incr selection @@ -931,7 +932,9 @@ void *selection_thread (void* id) xcb_xfixes_query_version_cookie_t xfixes_query_cookie; xcb_xfixes_query_version_reply_t *xfixes_query; +#ifdef EPHYR_WANT_DEBUG debug_selectThreadId=pthread_self(); +#endif /* EPHYR_WANT_DEBUG */ /* Create the window */ remoteVars->selstruct.xcbConnection = xcb_connect (RemoteHostVars.displayName, NULL); -- 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 9e86bfaff09b6cd50701eb40c67d16785676a267 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Jun 13 23:54:37 2021 +0200 x2gokdriveinit.c: Only define ddxInputThreadInit() prototype for XORG_VERSION_CURRENT less than 1.20.7. Starting with 1.20.8, the prototype definition is now available in include/os.h. --- x2gokdriveinit.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/x2gokdriveinit.c b/x2gokdriveinit.c index f37e90b..b2400b9 100644 --- a/x2gokdriveinit.c +++ b/x2gokdriveinit.c @@ -61,9 +61,11 @@ void processScreenArg(const char *screen_size, char *parent_id); int ephyrInitFake(void); #endif /* XORG_VERSION_CURRENT */ +#if XORG_VERSION_CURRENT < 12007000 #if INPUTTHREAD void ddxInputThreadInit(void); #endif /* INPUTTHREAD */ +#endif /* XORG_VERSION_CURRENT */ int main(int argc, char *argv[], char *envp[]) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
-
git-admin＠x2go.org