[X2Go-Commits] [x2gokdrive] 01/01: patches.xorg/1.20.5/: Provide patchset against X.org server 1.20.5

git-admin at x2go.org git-admin at x2go.org
Sat Sep 28 15:38:57 CEST 2019


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gokdrive.

commit ba6b11a68f3b7967ecfc1084eedccf4515e8c360
Author: Mike DePaulo <mikedep333 at gmail.com>
Date:   Sat Sep 28 09:24:40 2019 -0400

    patches.xorg/1.20.5/: Provide patchset against X.org server 1.20.5
    
    Which is currently used by Fedora 30 with updates.
---
 patches.xorg/1.20.5/series                         |  2 +
 patches.xorg/1.20.5/xorg-server-configure-ac.patch | 98 ++++++++++++++++++++++
 .../1.20.5/xorg-server-hw-kdrive-Makefile-am.patch | 27 ++++++
 3 files changed, 127 insertions(+)

diff --git a/patches.xorg/1.20.5/series b/patches.xorg/1.20.5/series
new file mode 100644
index 0000000..6a74a24
--- /dev/null
+++ b/patches.xorg/1.20.5/series
@@ -0,0 +1,2 @@
+xorg-server-configure-ac.patch
+xorg-server-hw-kdrive-Makefile-am.patch
diff --git a/patches.xorg/1.20.5/xorg-server-configure-ac.patch b/patches.xorg/1.20.5/xorg-server-configure-ac.patch
new file mode 100644
index 0000000..b1e93ce
--- /dev/null
+++ b/patches.xorg/1.20.5/xorg-server-configure-ac.patch
@@ -0,0 +1,98 @@
+diff --git a/configure.ac b/configure.ac
+index af16b0a..9fe3c91 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -31,7 +31,7 @@ RELEASE_DATE="2019-05-30"
+ RELEASE_NAME="Red Lentil Dal"
+ 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_STRING([--enable-glamor], [Build glamor di
+ 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"])
+@@ -2306,9 +2307,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"
+@@ -2348,6 +2355,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])
+@@ -2357,6 +2401,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
+ 
+@@ -2578,6 +2623,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.5/xorg-server-hw-kdrive-Makefile-am.patch b/patches.xorg/1.20.5/xorg-server-hw-kdrive-Makefile-am.patch
new file mode 100644
index 0000000..cbe3b60
--- /dev/null
+++ b/patches.xorg/1.20.5/xorg-server-hw-kdrive-Makefile-am.patch
@@ -0,0 +1,27 @@
+diff --git a/hw/kdrive/Makefile.am b/hw/kdrive/Makefile.am
+index dc71dbd..0f83fc9 100644
+--- a/hw/kdrive/Makefile.am
++++ b/hw/kdrive/Makefile.am
+@@ -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


More information about the x2go-commits mailing list