This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2gokdrive.
commit 1937c0159345531deafa07096804f194a8ca0619
Author: Mihai Moldovan <io...@ionic.de>
Date: Mon Jan 20 14:16:32 2020 +0100
patches.xorg/: add 1.20.6 files, essentially copied and refreshed from
1.20.5.
---
debian/changelog | 2 +
.../missing/hw/xfree86/common/modeline2c.awk | 93 +++++++++++++++++
patches.xorg/1.20.6/quilt.env | 1 +
patches.xorg/1.20.6/series | 2 +
patches.xorg/1.20.6/xorg-server-configure-ac.patch | 113 +++++++++++++++++++++
.../1.20.6/xorg-server-hw-kdrive-Makefile-am.patch | 25 +++++
6 files changed, 236 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 5e8fdeb..8ab176a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -52,6 +52,8 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium
- 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.
+ - patches.xorg/: add 1.20.6 files, essentially copied and refreshed from
+ 1.20.5.
* debian/control:
+ Grammar fix.
+ Remove dependencies that refer to disabled features.
diff --git a/patches.xorg/1.20.6/missing/hw/xfree86/common/modeline2c.awk
b/patches.xorg/1.20.6/missing/hw/xfree86/common/modeline2c.awk
new file mode 100644
index 0000000..3c9f602
--- /dev/null
+++ b/patches.xorg/1.20.6/missing/hw/xfree86/common/modeline2c.awk
@@ -0,0 +1,93 @@
+#!/usr/bin/awk -f
+#
+# Copyright (c) 2007 Joerg Sonnenberger <jo...@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 <jo...@netbsd.org>"
+ print " * Based on Perl script from Dirk Hohndel <hohn...@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.6/quilt.env b/patches.xorg/1.20.6/quilt.env
new file mode 120000
index 0000000..543e930
--- /dev/null
+++ b/patches.xorg/1.20.6/quilt.env
@@ -0,0 +1 @@
+../common/quilt.env
\ No newline at end of file
diff --git a/patches.xorg/1.20.6/series b/patches.xorg/1.20.6/series
new file mode 100644
index 0000000..6a74a24
--- /dev/null
+++ b/patches.xorg/1.20.6/series
@@ -0,0 +1,2 @@
+xorg-server-configure-ac.patch
+xorg-server-hw-kdrive-Makefile-am.patch
diff --git a/patches.xorg/1.20.6/xorg-server-configure-ac.patch
b/patches.xorg/1.20.6/xorg-server-configure-ac.patch
new file mode 100644
index 0000000..701da28
--- /dev/null
+++ b/patches.xorg/1.20.6/xorg-server-configure-ac.patch
@@ -0,0 +1,113 @@
+--- a/configure.ac 2019-11-23 00:44:19.000000000 +0100
++++ b/configure.ac 2020-01-20 14:14:41.883851697 +0100
+@@ -31,7 +31,7 @@ RELEASE_DATE="2019-11-22"
+ RELEASE_NAME="Enchiladas de Queso"
+ 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.6/xorg-server-hw-kdrive-Makefile-am.patch
b/patches.xorg/1.20.6/xorg-server-hw-kdrive-Makefile-am.patch
new file mode 100644
index 0000000..96b0641
--- /dev/null
+++ b/patches.xorg/1.20.6/xorg-server-hw-kdrive-Makefile-am.patch
@@ -0,0 +1,25 @@
+--- a/hw/kdrive/Makefile.am 2019-11-23 00:44:19.000000000 +0100
++++ b/hw/kdrive/Makefile.am 2020-01-20 14:14:46.857872079 +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
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits
