This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gokdrive. from ba6b11a patches.xorg/1.20.5/: Provide patchset against X.org server 1.20.5 new e0dbca7 patches.xorg/1.20.5/: Define XORG_VERSION_CURRENT new b30f5d2 Add draft RPM packaging x2gokdrive.spec 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.20.5/xorg-server-configure-ac.patch | 27 +++- x2gokdrive.spec | 171 +++++++++++++++++++++ 2 files changed, 193 insertions(+), 5 deletions(-) create mode 100644 x2gokdrive.spec -- 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 e0dbca73f11e9aa7a066e748e6d08ba256be69cf Author: Mike DePaulo <mikedep333@gmail.com> Date: Sat Sep 28 12:16:33 2019 -0400 patches.xorg/1.20.5/: Define XORG_VERSION_CURRENT all the time. So that we do not need to rely on the xorg ddx being built to build this ddx. This should be done for the other patchsets as well, after testing that they enable the debian builds to not build the xorg ddx. --- patches.xorg/1.20.5/xorg-server-configure-ac.patch | 27 ++++++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/patches.xorg/1.20.5/xorg-server-configure-ac.patch b/patches.xorg/1.20.5/xorg-server-configure-ac.patch index b1e93ce..1d57d9e 100644 --- a/patches.xorg/1.20.5/xorg-server-configure-ac.patch +++ b/patches.xorg/1.20.5/xorg-server-configure-ac.patch @@ -1,5 +1,5 @@ diff --git a/configure.ac b/configure.ac -index af16b0a..9fe3c91 100644 +index af16b0a..e4c71a7 100644 --- a/configure.ac +++ b/configure.ac @@ -31,7 +31,7 @@ RELEASE_DATE="2019-05-30" @@ -19,7 +19,24 @@ index af16b0a..9fe3c91 100644 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 +@@ -1812,6 +1813,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' +@@ -2026,7 +2029,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]) +@@ -2306,9 +2308,15 @@ dnl kdrive DDX XEPHYR_LIBS= XEPHYR_INCS= @@ -35,7 +52,7 @@ index af16b0a..9fe3c91 100644 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 +@@ -2348,6 +2356,43 @@ if test "$KDRIVE" = yes; then AC_SUBST([XEPHYR_LIBS]) AC_SUBST([XEPHYR_INCS]) @@ -79,7 +96,7 @@ index af16b0a..9fe3c91 100644 fi AC_SUBST([KDRIVE_INCS]) AC_SUBST([KDRIVE_PURE_INCS]) -@@ -2357,6 +2401,7 @@ AC_SUBST([KDRIVE_MAIN_LIB]) +@@ -2357,6 +2402,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]) @@ -87,7 +104,7 @@ index af16b0a..9fe3c91 100644 dnl Xwayland DDX -@@ -2578,6 +2623,8 @@ hw/xquartz/xpr/Makefile +@@ -2578,6 +2624,8 @@ hw/xquartz/xpr/Makefile hw/kdrive/Makefile hw/kdrive/ephyr/Makefile hw/kdrive/ephyr/man/Makefile -- 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 b30f5d289341c657d145dd3dc5ae1d8be8d314c1 Author: Mike DePaulo <mikedep333@gmail.com> Date: Sat Sep 28 12:19:39 2019 -0400 Add draft RPM packaging x2gokdrive.spec Tested successfully against Fedora 30 (with the updates repo enabled, so that xorg-x11-server-source 1.20.5 is used.) --- x2gokdrive.spec | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 171 insertions(+) diff --git a/x2gokdrive.spec b/x2gokdrive.spec new file mode 100644 index 0000000..f9a50dc --- /dev/null +++ b/x2gokdrive.spec @@ -0,0 +1,171 @@ +# %%exclude %%{_prefix}lib/debug/usr/bin/x2gokdrive* +# gets created, but we cannot exlude it under %%files +# without rpmlint throwing an error. +%define _debugsource_packages 0 + +Name: x2gokdrive +Version: 0.0.0.1 +Release: 0.0x2go1%{?dist} +Summary: X2GoKDrive - KDrive X-Server for X2Go + +%if 0%{?fedora} || 0%{?rhel} +Group: Applications/Communications +# Per debian/copyright, only the testscripts folder is GPLv2 +License: GPLv2+ and GPLv2 +%else +Group: Productivity/Networking/Remote Desktop +License: GPL-2.0+ +%endif + +URL: https://www.x2go.org +Source0: https://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz + +# Required specifically for x2gokdrive +BuildRequires: libpng-devel +# x2gokdrive provides patch dirs for xorg-x11-server-source in quilt format +BuildRequires: quilt + +# XCB bits for Xephyr +# Copied and pasted block from: +# https://src.fedoraproject.org/rpms/xorg-x11-server/blob/master/f/xorg-x11-se... + +BuildRequires: pkgconfig(xcb-aux) pkgconfig(xcb-image) pkgconfig(xcb-icccm) +BuildRequires: pkgconfig(xcb-keysyms) pkgconfig(xcb-renderutil) +# Copied and pasted block from: +# https://src.fedoraproject.org/rpms/tigervnc/blob/master/f/tigervnc.spec +# Copied because almost all of them are required for xorg-x11-server-source +# +# Note that TigerVNC upstream does not provide distro-neutral packaging for us +# to use as a reference, just el6 and el7 specific .spec files. +# https://github.com/TigerVNC/tigervnc/tree/master/contrib/packages/rpm +BuildRequires: gcc-c++ +BuildRequires: libX11-devel, automake, autoconf, libtool, gettext, gettext-autopoint +BuildRequires: libXext-devel, xorg-x11-server-source, libXi-devel +BuildRequires: xorg-x11-xtrans-devel, xorg-x11-util-macros, libXtst-devel +BuildRequires: libxkbfile-devel, openssl-devel, libpciaccess-devel +BuildRequires: mesa-libGL-devel, libXinerama-devel, +BuildRequires: freetype-devel, libXdmcp-devel, libxshmfence-devel +BuildRequires: desktop-file-utils, java-devel, jpackage-utils +BuildRequires: libjpeg-turbo-devel, gnutls-devel, pam-devel +BuildRequires: libdrm-devel, libXt-devel, pixman-devel +BuildRequires: systemd, cmake +%if 0%{?fedora} > 24 || 0%{?rhel} >= 7 +BuildRequires: libXfont2-devel +%else +BuildRequires: libXfont-devel +%endif +BuildRequires: xorg-x11-server-devel + +# Copied and pasted "server" subpackage block from: +# https://github.com/TigerVNC/tigervnc/blob/master/contrib/packages/rpm/el7/SP... +# (With TigerVNC speciifc stuff removed, such as Perl for their launch scripts.) +Requires: xorg-x11-xauth +Requires: xorg-x11-xinit + +# Copied and pasted "server-minimal" subpackage block from above +Requires: xkeyboard-config, xorg-x11-xkb-utils + +%if 0%{?rhel} <= 7 +Requires: mesa-dri-drivers +Requires: x2goserver >= 4.2.0.0 +%else +Recommends: mesa-dri-drivers +Recommends: x2goserver >= 4.2.0.0 +%endif + +%description +KDrive graphical server backend for X2Go Server + X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client-side mass storage mounting support + - client-side printing support + - audio support + - authentication by smartcard and USB stick + . + This package is built from the X.org xserver module. X2Go KDrive is a + KDrive based Xserver for X2Go. It provides support for running modern + desktop environments like GNOME, KDE Plasma, Cinnamon, etc. in X2Go + Sessions. + . + The X2Go KDrive graphical backend is not suitable for low bandwidth WAN + connections between X2Go Client and X2Go Server. It is supposed for X2Go + being used on the local area network. + . + More information about X.Org can be found at: + <URL:https://www.x.org> + . + More information about X2Go can be found at: + <URL:https://wiki.x2go.org> + + +%prep +# %%autosetup creates BUILD subdir +%autosetup + +# prepare xorg-server build tree +cp -r /usr/share/xorg-x11-server-source/* BUILD +# Precaution from: +# https://src.fedoraproject.org/rpms/tigervnc/blob/master/f/tigervnc.spec +for all in `find BUILD/ -type f -perm -001`; do + chmod -x "$all" +done +mkdir BUILD/hw/kdrive/x2gokdrive/ -p + +# inject x2gokdrive into xorg-server build tree +cp Makefile.am *.c *.h BUILD/hw/kdrive/x2gokdrive/ +cp -r man/ BUILD/hw/kdrive/x2gokdrive/ + +# patch xorg-server build tree, so that it will build x2gokdrive +set -x; export XORG_UPSTREAM_VERSION=`cat BUILD/configure.ac | grep AC_INIT | sed -r 's/^AC_INIT[^,]*, ([^,]+),.*/\\1/'` \ + && cd BUILD \ + && test -d ../patches.xorg/$XORG_UPSTREAM_VERSION && QUILT_PATCHES=../patches.xorg/$XORG_UPSTREAM_VERSION/ quilt push -a \ + || ( set +x; echo "\n##################################################\nERROR: This X2Go KDrive version does not support\nbuilding against X.Org version $XORG_UPSTREAM_VERSION.\n##################################################\n"; exit 1); + +%build +%ifarch sparcv9 sparc64 s390 s390x +export CFLAGS="$RPM_OPT_FLAGS -fPIC" +%else +export CFLAGS="$RPM_OPT_FLAGS -fpic" +%endif +export CXXFLAGS="$CFLAGS" + +pushd BUILD +autoreconf -fiv +# Another block from tigervnc.spec, except for the 1st option line. +%configure \ + --enable-kdrive --enable-x2gokdrive \ + --disable-xorg --disable-xnest --disable-xvfb --disable-dmx \ + --disable-xwin --disable-xephyr --disable-xwayland \ + --with-pic --disable-static \ + --with-default-font-path="catalogue:%{_sysconfdir}/X11/fontpath.d,built-ins" \ + --with-fontdir=%{_datadir}/X11/fonts \ + --with-xkb-output=%{_localstatedir}/lib/xkb \ + --enable-install-libxf86config \ + --enable-glx --disable-dri --enable-dri2 --disable-dri3 \ + --disable-unit-tests \ + --disable-config-hal \ + --disable-config-udev \ + --with-dri-driver-path=%{_libdir}/dri \ + --without-dtrace \ + --disable-devel-docs \ + --disable-selective-werror +make %{?_smp_mflags} +popd + +%install +pushd BUILD +make install DESTDIR=%{buildroot} +popd + +%files +%defattr(-,root,root) +%{_bindir}/x2gokdrive +%exclude %{_libdir}/xorg/protocol.txt +%exclude %{_mandir}/man1/Xserver.1.gz +%exclude %{_var}/lib/xkb/ +%doc %{_mandir}/man1/x2gokdrive.1.gz + +%changelog + -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
-
git-admin＠x2go.org