This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gokdrive. from 76766ce Continue development new 55ff1ec patches.xorg/21.1.11/: Add patchset against X.org 21.1.11. new 47a9749 Merge branch 'personal/sunweaver/xorg-21-1-11' into 'master' The 2 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.18.4 => 21.1.11}/quilt.env | 0 patches.xorg/{1.18.4 => 21.1.11}/series | 0 patches.xorg/{21.1.10 => 21.1.11}/xorg-server-configure-ac.patch | 0 .../{21.1.10 => 21.1.11}/xorg-server-hw-kdrive-Makefile-am.patch | 0 patches.xorg/latest-available | 2 +- 5 files changed, 1 insertion(+), 1 deletion(-) copy patches.xorg/{1.18.4 => 21.1.11}/quilt.env (100%) copy patches.xorg/{1.18.4 => 21.1.11}/series (100%) copy patches.xorg/{21.1.10 => 21.1.11}/xorg-server-configure-ac.patch (100%) copy patches.xorg/{21.1.10 => 21.1.11}/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 55ff1ec58e0a68d4f6e341ca22b083ceccad27c4 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Mar 25 09:15:15 2024 +0000 patches.xorg/21.1.11/: Add patchset against X.org 21.1.11. --- patches.xorg/21.1.11/quilt.env | 1 + patches.xorg/21.1.11/series | 2 + .../21.1.11/xorg-server-configure-ac.patch | 115 +++++++++++++++++++++ .../xorg-server-hw-kdrive-Makefile-am.patch | 25 +++++ patches.xorg/latest-available | 2 +- 5 files changed, 144 insertions(+), 1 deletion(-) diff --git a/patches.xorg/21.1.11/quilt.env b/patches.xorg/21.1.11/quilt.env new file mode 120000 index 0000000..543e930 --- /dev/null +++ b/patches.xorg/21.1.11/quilt.env @@ -0,0 +1 @@ +../common/quilt.env \ No newline at end of file diff --git a/patches.xorg/21.1.11/series b/patches.xorg/21.1.11/series new file mode 100644 index 0000000..6a74a24 --- /dev/null +++ b/patches.xorg/21.1.11/series @@ -0,0 +1,2 @@ +xorg-server-configure-ac.patch +xorg-server-hw-kdrive-Makefile-am.patch diff --git a/patches.xorg/21.1.11/xorg-server-configure-ac.patch b/patches.xorg/21.1.11/xorg-server-configure-ac.patch new file mode 100644 index 0000000..713eb02 --- /dev/null +++ b/patches.xorg/21.1.11/xorg-server-configure-ac.patch @@ -0,0 +1,115 @@ +Index: xorg-server/configure.ac +=================================================================== +--- xorg-server.orig/configure.ac ++++ xorg-server/configure.ac +@@ -31,7 +31,7 @@ RELEASE_DATE="2023-12-13" + RELEASE_NAME="Caramel Ice Cream" + AC_CONFIG_SRCDIR([Makefile.am]) + AC_CONFIG_MACRO_DIR([m4]) +-AM_INIT_AUTOMAKE([foreign dist-xz]) ++AM_INIT_AUTOMAKE([foreign dist-xz subdir-objects]) + AC_USE_SYSTEM_EXTENSIONS + + # Require xorg-macros minimum of 1.14 for XORG_COMPILER_BRAND in XORG_DEFAULT_OPTIONS +@@ -589,6 +589,7 @@ AC_ARG_ENABLE(xf86-input-inputtest, AS_H + 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"]) +@@ -1771,6 +1772,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 + PKG_CHECK_MODULES([LIBXCVT], $LIBXCVT) + +@@ -1979,7 +1982,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]) +@@ -2198,9 +2200,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" +@@ -2240,6 +2248,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]) +@@ -2249,6 +2294,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 and the rest of these are generic, so they're in config.h +@@ -2379,6 +2425,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 + test/Makefile + xserver.ent diff --git a/patches.xorg/21.1.11/xorg-server-hw-kdrive-Makefile-am.patch b/patches.xorg/21.1.11/xorg-server-hw-kdrive-Makefile-am.patch new file mode 100644 index 0000000..88d6ba3 --- /dev/null +++ b/patches.xorg/21.1.11/xorg-server-hw-kdrive-Makefile-am.patch @@ -0,0 +1,25 @@ +--- a/hw/kdrive/Makefile.am 2023-02-07 02:16:51.000000000 +0100 ++++ b/hw/kdrive/Makefile.am 2023-03-03 20:24:26.669269030 +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 diff --git a/patches.xorg/latest-available b/patches.xorg/latest-available index 02e0958..0469ba5 120000 --- a/patches.xorg/latest-available +++ b/patches.xorg/latest-available @@ -1 +1 @@ -21.1.10 \ No newline at end of file +21.1.11 \ No newline at end of file -- 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 47a9749114ad2b66d53b5d9adbd06821b024afde Merge: 76766ce 55ff1ec Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jun 20 19:42:25 2024 +0000 Merge branch 'personal/sunweaver/xorg-21-1-11' into 'master' patches.xorg/21.1.11/: Add patchset against X.org 21.1.11. Attributes GL MR !6: https://gitlab.x2go.org/x2go/server/drivers/x2gokdrive/-/merge_requests/6 patches.xorg/21.1.11/quilt.env | 1 + patches.xorg/21.1.11/series | 2 + .../21.1.11/xorg-server-configure-ac.patch | 115 +++++++++++++++++++++ .../xorg-server-hw-kdrive-Makefile-am.patch | 25 +++++ patches.xorg/latest-available | 2 +- 5 files changed, 144 insertions(+), 1 deletion(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
-
git-admin＠x2go.org