[X2Go-Commits] [x2gokdrive] 01/01: add xcb-xfixes to deps.

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 547966135147a08f16b82e1fe68ed189db38e4d3 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Thu Aug 20 16:06:20 2020 -0500 add xcb-xfixes to deps. --- Makefile | 2 +- debian/changelog | 1 + debian/control | 1 + patches.xorg/1.18.4/xorg-server-configure-ac.patch | 2 +- patches.xorg/1.19.2/xorg-server-configure-ac.patch | 2 +- patches.xorg/1.19.6/xorg-server-configure-ac.patch | 2 +- patches.xorg/1.20.1/xorg-server-configure-ac.patch | 2 +- patches.xorg/1.20.3/xorg-server-configure-ac.patch | 2 +- patches.xorg/1.20.4/xorg-server-configure-ac.patch | 2 +- patches.xorg/1.20.5/xorg-server-configure-ac.patch | 2 +- patches.xorg/1.20.6/xorg-server-configure-ac.patch | 2 +- patches.xorg/1.20.7/xorg-server-configure-ac.patch | 2 +- 12 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index a39ee84..4ddaa35 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ X2GO_OBJECTS = x2gokdriveselection.o x2gokdrive.o \ x2gokdriveinit.o x2gokdrivecursor.o x2gokdriveremote.o x2gokdrive: $(X2GO_OBJECTS) $(Xephyr_DEPENDENCIES) $(EXTRA_Xephyr_DEPENDENCIES) - $(AM_V_CCLD)$(Xephyr_LINK) $(X2GO_OBJECTS) $(Xephyr_LDADD) $(LIBS) -lz -ljpeg -lpng -lpthread + $(AM_V_CCLD)$(Xephyr_LINK) $(X2GO_OBJECTS) $(Xephyr_LDADD) $(LIBS) -lz -ljpeg -lpng -lpthread -lxcb-xfixes x2goclean: rm *.o x2gokdrive diff --git a/debian/changelog b/debian/changelog index 152b81b..3ac81d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium line option. - Move selection functionality to separate thread. Use XCB API to manage selections. + - add xcb-xfixes to deps. [ Mihai Moldovan ] * Initial release: diff --git a/debian/control b/debian/control index abe5957..a7e3efc 100644 --- a/debian/control +++ b/debian/control @@ -88,6 +88,7 @@ Build-Depends: libxcb-randr0-dev, libxcb-xv0-dev, libxcb-glx0-dev, + libxcb-xfixes0-dev, libxcb-xf86dri0-dev (>= 1.6), Standards-Version: 4.3.0 Homepage: https://code.x2go.org/releases/source/x2gokdrive diff --git a/patches.xorg/1.18.4/xorg-server-configure-ac.patch b/patches.xorg/1.18.4/xorg-server-configure-ac.patch index c656d7f..c7769b3 100644 --- a/patches.xorg/1.18.4/xorg-server-configure-ac.patch +++ b/patches.xorg/1.18.4/xorg-server-configure-ac.patch @@ -40,7 +40,7 @@ + + ### 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" ++ 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 diff --git a/patches.xorg/1.19.2/xorg-server-configure-ac.patch b/patches.xorg/1.19.2/xorg-server-configure-ac.patch index 389f7ac..4412ff6 100644 --- a/patches.xorg/1.19.2/xorg-server-configure-ac.patch +++ b/patches.xorg/1.19.2/xorg-server-configure-ac.patch @@ -57,7 +57,7 @@ + + ### 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" ++ 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 diff --git a/patches.xorg/1.19.6/xorg-server-configure-ac.patch b/patches.xorg/1.19.6/xorg-server-configure-ac.patch index b730807..1e96abc 100644 --- a/patches.xorg/1.19.6/xorg-server-configure-ac.patch +++ b/patches.xorg/1.19.6/xorg-server-configure-ac.patch @@ -57,7 +57,7 @@ + + ### 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" ++ 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 diff --git a/patches.xorg/1.20.1/xorg-server-configure-ac.patch b/patches.xorg/1.20.1/xorg-server-configure-ac.patch index 9e4490b..d67783d 100644 --- a/patches.xorg/1.20.1/xorg-server-configure-ac.patch +++ b/patches.xorg/1.20.1/xorg-server-configure-ac.patch @@ -40,7 +40,7 @@ + + ### 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" ++ 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 diff --git a/patches.xorg/1.20.3/xorg-server-configure-ac.patch b/patches.xorg/1.20.3/xorg-server-configure-ac.patch index 09beb44..c0a139b 100644 --- a/patches.xorg/1.20.3/xorg-server-configure-ac.patch +++ b/patches.xorg/1.20.3/xorg-server-configure-ac.patch @@ -57,7 +57,7 @@ + + ### 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" ++ 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 diff --git a/patches.xorg/1.20.4/xorg-server-configure-ac.patch b/patches.xorg/1.20.4/xorg-server-configure-ac.patch index 9d09187..776b8fe 100644 --- a/patches.xorg/1.20.4/xorg-server-configure-ac.patch +++ b/patches.xorg/1.20.4/xorg-server-configure-ac.patch @@ -57,7 +57,7 @@ + + ### 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" ++ 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 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 1d57d9e..8cae1a9 100644 --- a/patches.xorg/1.20.5/xorg-server-configure-ac.patch +++ b/patches.xorg/1.20.5/xorg-server-configure-ac.patch @@ -59,7 +59,7 @@ index af16b0a..e4c71a7 100644 + + ### 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" ++ 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 diff --git a/patches.xorg/1.20.6/xorg-server-configure-ac.patch b/patches.xorg/1.20.6/xorg-server-configure-ac.patch index 701da28..bea88dc 100644 --- a/patches.xorg/1.20.6/xorg-server-configure-ac.patch +++ b/patches.xorg/1.20.6/xorg-server-configure-ac.patch @@ -57,7 +57,7 @@ + + ### 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" ++ 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 diff --git a/patches.xorg/1.20.7/xorg-server-configure-ac.patch b/patches.xorg/1.20.7/xorg-server-configure-ac.patch index a1787f0..63e6c2b 100644 --- a/patches.xorg/1.20.7/xorg-server-configure-ac.patch +++ b/patches.xorg/1.20.7/xorg-server-configure-ac.patch @@ -57,7 +57,7 @@ + + ### 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" ++ 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 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git