This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gokdrive. from 7d1a722 Add build support against X.Org server in Ubuntu bionic (18.04). new 0b19489 Add build support against X.Org server in Ubuntu xenial (16.04). The 1 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: patches.xorg/{1.20.4 => 1.18.4}/series | 0 patches.xorg/{1.19.2 => 1.18.4}/xorg-server-configure-ac.patch | 10 +++++----- .../{1.19.6 => 1.18.4}/xorg-server-hw-kdrive-Makefile-am.patch | 0 3 files changed, 5 insertions(+), 5 deletions(-) copy patches.xorg/{1.20.4 => 1.18.4}/series (100%) copy patches.xorg/{1.19.2 => 1.18.4}/xorg-server-configure-ac.patch (97%) copy patches.xorg/{1.19.6 => 1.18.4}/xorg-server-hw-kdrive-Makefile-am.patch (100%) -- 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 0b19489b977adcb7995b508b330af90e38f1a3da Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Jul 15 16:46:22 2019 +0200 Add build support against X.Org server in Ubuntu xenial (16.04). --- patches.xorg/1.18.4/series | 2 + patches.xorg/1.18.4/xorg-server-configure-ac.patch | 96 ++++++++++++++++++++++ .../1.18.4/xorg-server-hw-kdrive-Makefile-am.patch | 32 ++++++++ 3 files changed, 130 insertions(+) diff --git a/patches.xorg/1.18.4/series b/patches.xorg/1.18.4/series new file mode 100644 index 0000000..6a74a24 --- /dev/null +++ b/patches.xorg/1.18.4/series @@ -0,0 +1,2 @@ +xorg-server-configure-ac.patch +xorg-server-hw-kdrive-Makefile-am.patch diff --git a/patches.xorg/1.18.4/xorg-server-configure-ac.patch b/patches.xorg/1.18.4/xorg-server-configure-ac.patch new file mode 100644 index 0000000..0cae34d --- /dev/null +++ b/patches.xorg/1.18.4/xorg-server-configure-ac.patch @@ -0,0 +1,96 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -31,7 +31,7 @@ + RELEASE_NAME="Skordalia" + 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 +@@ -651,6 +651,7 @@ + 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]) + AC_ARG_ENABLE(xfake, AS_HELP_STRING([--enable-xfake], [Build the kdrive 'fake' server (default: auto)]), [XFAKE=$enableval], [XFAKE=auto]) + AC_ARG_ENABLE(xfbdev, AS_HELP_STRING([--enable-xfbdev], [Build the kdrive framebuffer device server (default: auto)]), [XFBDEV=$enableval], [XFBDEV=auto]) + dnl kdrive options +@@ -2356,9 +2357,15 @@ + XEPHYR_LIBS= + XEPHYR_INCS= + ++X2GOKDRIVE_LIBS= ++X2GOKDRIVE_INCS= ++ + AM_CONDITIONAL(KDRIVE, [test x$KDRIVE = xyes]) + + if test "$KDRIVE" = yes; then ++ ++ ### XEPHYR ++ + AC_DEFINE(KDRIVESERVER,1,[Build Kdrive X server]) + AC_DEFINE(KDRIVEDDXACTIONS,,[Build kdrive ddx]) + +@@ -2469,6 +2476,43 @@ + + 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]) +@@ -2484,6 +2528,7 @@ + AM_CONDITIONAL(TSLIB, [test "x$HAVE_TSLIB" = xyes]) + AM_CONDITIONAL(KDRIVEFBDEV, [test "x$XFBDEV" = xyes]) + AM_CONDITIONAL(XEPHYR, [test "x$KDRIVE" = xyes && test "x$XEPHYR" = xyes]) ++AM_CONDITIONAL(X2GOKDRIVE, [test "x$KDRIVE" = xyes && test "x$X2GOKDRIVE" = xyes]) + AM_CONDITIONAL(BUILD_KDRIVEFBDEVLIB, [test "x$KDRIVE" = xyes && test "x$KDRIVEFBDEVLIB" = xyes]) + AM_CONDITIONAL(XFAKESERVER, [test "x$KDRIVE" = xyes && test "x$XFAKE" = xyes]) + +@@ -2680,6 +2725,8 @@ + hw/kdrive/Makefile + hw/kdrive/ephyr/Makefile + hw/kdrive/ephyr/man/Makefile ++hw/kdrive/x2gokdrive/Makefile ++hw/kdrive/x2gokdrive/man/Makefile + hw/kdrive/fake/Makefile + hw/kdrive/fbdev/Makefile + hw/kdrive/linux/Makefile diff --git a/patches.xorg/1.18.4/xorg-server-hw-kdrive-Makefile-am.patch b/patches.xorg/1.18.4/xorg-server-hw-kdrive-Makefile-am.patch new file mode 100644 index 0000000..2128d6e --- /dev/null +++ b/patches.xorg/1.18.4/xorg-server-hw-kdrive-Makefile-am.patch @@ -0,0 +1,32 @@ +Index: xorg-server/hw/kdrive/Makefile.am +=================================================================== +--- xorg-server.orig/hw/kdrive/Makefile.am ++++ xorg-server/hw/kdrive/Makefile.am +@@ -6,6 +6,10 @@ if XFAKESERVER + XFAKE_SUBDIRS = fake + endif + ++if X2GOKDRIVE ++X2GOKDRIVE_SUBDIRS = x2gokdrive ++endif ++ + if XEPHYR + XEPHYR_SUBDIRS = ephyr + endif +@@ -17,6 +21,7 @@ endif + SERVER_SUBDIRS = \ + $(FBDEV_SUBDIRS) \ + $(XEPHYR_SUBDIRS) \ ++ $(X2GOKDRIVE_SUBDIRS) \ + $(XFAKE_SUBDIRS) + + SUBDIRS = \ +@@ -24,7 +29,7 @@ SUBDIRS = \ + $(LINUX_SUBDIRS) \ + $(SERVER_SUBDIRS) + +-DIST_SUBDIRS = fbdev ephyr src linux fake ++DIST_SUBDIRS = fbdev ephyr x2gokdrive src linux fake + + 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
-
git-admin＠x2go.org