This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gokdrive. from d5dd44e debian/changelog: fixup. new 8d83c5d patches.xorg/: add 21.1.7 subdirectory for Debian Bookworm (12) with rebased patch set. new d04bacf debian/changelog: fixup. 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: debian/changelog | 4 ++-- patches.xorg/{1.18.4 => 21.1.7}/quilt.env | 0 patches.xorg/{1.18.4 => 21.1.7}/series | 0 .../{21.1.4 => 21.1.7}/xorg-server-configure-ac.patch | 18 +++++++++--------- .../xorg-server-hw-kdrive-Makefile-am.patch | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) copy patches.xorg/{1.18.4 => 21.1.7}/quilt.env (100%) copy patches.xorg/{1.18.4 => 21.1.7}/series (100%) copy patches.xorg/{21.1.4 => 21.1.7}/xorg-server-configure-ac.patch (91%) copy patches.xorg/{1.20.13 => 21.1.7}/xorg-server-hw-kdrive-Makefile-am.patch (76%) -- 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 8d83c5deb692d3f387c7006d6e9d7e9fd99d0037 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Mar 3 20:26:31 2023 +0100 patches.xorg/: add 21.1.7 subdirectory for Debian Bookworm (12) with rebased patch set. --- debian/changelog | 2 + patches.xorg/21.1.7/quilt.env | 1 + patches.xorg/21.1.7/series | 2 + patches.xorg/21.1.7/xorg-server-configure-ac.patch | 113 +++++++++++++++++++++ .../21.1.7/xorg-server-hw-kdrive-Makefile-am.patch | 25 +++++ 5 files changed, 143 insertions(+) diff --git a/debian/changelog b/debian/changelog index b4b1ffe..9ff9e24 100644 --- a/debian/changelog +++ b/debian/changelog @@ -113,6 +113,8 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium applying patch. - x2gokdrive.spec: X11 server package is not split up into binary and common packages on *SuSE, so change dependency to xorg-x11-server. + - patches.xorg/: add 21.1.7 subdirectory for Debian Bookworm (12) with + rebased patch set. * debian/control: + Grammar fix. + Remove dependencies that refer to disabled features. diff --git a/patches.xorg/21.1.7/quilt.env b/patches.xorg/21.1.7/quilt.env new file mode 120000 index 0000000..543e930 --- /dev/null +++ b/patches.xorg/21.1.7/quilt.env @@ -0,0 +1 @@ +../common/quilt.env \ No newline at end of file diff --git a/patches.xorg/21.1.7/series b/patches.xorg/21.1.7/series new file mode 100644 index 0000000..6a74a24 --- /dev/null +++ b/patches.xorg/21.1.7/series @@ -0,0 +1,2 @@ +xorg-server-configure-ac.patch +xorg-server-hw-kdrive-Makefile-am.patch diff --git a/patches.xorg/21.1.7/xorg-server-configure-ac.patch b/patches.xorg/21.1.7/xorg-server-configure-ac.patch new file mode 100644 index 0000000..b257db1 --- /dev/null +++ b/patches.xorg/21.1.7/xorg-server-configure-ac.patch @@ -0,0 +1,113 @@ +--- a/configure.ac 2023-02-07 02:16:51.000000000 +0100 ++++ b/configure.ac 2023-03-03 20:24:26.658268981 +0100 +@@ -31,7 +31,7 @@ RELEASE_DATE="2023-02-07" + 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 +@@ -580,6 +580,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"]) +@@ -1747,6 +1748,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) + +@@ -1955,7 +1958,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]) +@@ -2174,9 +2176,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" +@@ -2216,6 +2224,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]) +@@ -2225,6 +2270,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 +@@ -2355,6 +2401,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.7/xorg-server-hw-kdrive-Makefile-am.patch b/patches.xorg/21.1.7/xorg-server-hw-kdrive-Makefile-am.patch new file mode 100644 index 0000000..88d6ba3 --- /dev/null +++ b/patches.xorg/21.1.7/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 -- 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 d04bacfb4f4214ed44b0deb55ebe2770afb47b5b Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Mar 3 20:27:04 2023 +0100 debian/changelog: fixup. --- debian/changelog | 2 -- 1 file changed, 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9ff9e24..f3b9416 100644 --- a/debian/changelog +++ b/debian/changelog @@ -111,8 +111,6 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium rebased patch set. - patches.xorg/21.1.4/xorg-server-configure-ac.patch: fix FTBFS, typo when applying patch. - - x2gokdrive.spec: X11 server package is not split up into binary and - common packages on *SuSE, so change dependency to xorg-x11-server. - patches.xorg/: add 21.1.7 subdirectory for Debian Bookworm (12) with rebased patch set. * debian/control: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
-
git-admin＠x2go.org