xserver-xorg-video-qxl: Changes to 'debian-unstable'
ChangeLog | 117 +++++++++++++++++++++++++++++++++++++++++
debian/Xspice.1 | 115 ++++++++++++++++++++++++++++++++++++++++
debian/changelog | 3 -
debian/control | 15 +++++
debian/rules | 6 ++
debian/xserver-xspice.docs | 2
debian/xserver-xspice.install | 3 +
debian/xserver-xspice.manpages | 1
8 files changed, 261 insertions(+), 1 deletion(-)
New commits:
commit b3a2aa5f114a5b0b0c2e963b9f0c95397f83c0e2
Author: Laurent Bigonville <bigon@debian.org>
Date: Tue Dec 20 10:23:29 2016 +0100
Update ChangeLog file
diff --git a/ChangeLog b/ChangeLog
index c0767a0..64be661 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,120 @@
+commit 8d344cf49fdb021ab80354eaaa57a419a6746a56
+Author: Christophe Fergeau <cfergeau@redhat.com>
+Date: Mon Dec 19 17:36:36 2016 +0100
+
+ NEWS: Xspice now works with X.org 1.19
+
+commit a283cda0c4dbacb1d4b398b45f271275a3d1121a
+Author: Christophe Fergeau <cfergeau@redhat.com>
+Date: Mon Dec 19 17:28:41 2016 +0100
+
+ Revert "Remove unused 'event_mask' field"
+
+ This reverts commit bfb724076d575d5a49d08913b86885688251a176.
+ This was pushed by mistake.
+
+commit bfb724076d575d5a49d08913b86885688251a176
+Author: Christophe Fergeau <cfergeau@redhat.com>
+Date: Mon Dec 19 10:51:09 2016 +0100
+
+ Remove unused 'event_mask' field
+
+ With the Xorg 1.19 codepaths, the 'event_mask' field of SpiceWatch is
+ only useful for sanity checking the event we get from Xorg. This commit
+ assumes Xorg is sane, and removes this extra field.
+
+commit 009776a8a3fb096b11ec95033d1e1a366e26f188
+Author: Christophe Fergeau <cfergeau@redhat.com>
+Date: Thu Dec 15 10:47:51 2016 +0100
+
+ Xspice: Replace malloc/strdup use with xnfalloc/xnfstrdup
+
+ spiceqxl_*.c files are Xspice-only code. They contain a few uses of
+ malloc/strdup, and none of these are checked for failure. It's better to
+ replace these with xfnalloc/xnfstrdup which are provided by the X server
+ and cannot fail (aborts on failure).
+
+ Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+
+commit db353f559d32119e811eab71a9d3128847a64609
+Author: Christophe Fergeau <cfergeau@redhat.com>
+Date: Wed Dec 14 10:37:03 2016 +0100
+
+ xspice: Adjust to X.org 1.19 changes
+
+ In newer X.org versions, it's no longer supported to modify the set of
+ FDs passed to a BlockHandler method to get notified when the FD has data
+ to be read. This was limited anyway as we could only get read events
+ this way, and had to do our own polling to get notified about socket
+ writeability.
+
+ Starting from xserver 1.19, the supported way of doing this is to use
+ the SetNotifyFd/RemoveNotifyFd API, which is actually a much better way
+ as it matches very well the 'watch' API spice-server expects Xspice to
+ implement.
+
+ This commit switches to that new API, which removes the need for
+ RegisterBlockAndWakeupHandlers().
+
+ Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+ Acked-by: Uri Lublin <uril@redhat.com>
+
+commit 13d4afc1ba55eaed3e7ed4da8c948d3f334598d3
+Author: Christophe Fergeau <cfergeau@redhat.com>
+Date: Thu Apr 14 18:05:59 2016 +0200
+
+ build-sys: Update for 0.1.5 release
+
+commit ce00ab5df8cee45b0dc029973d6eeb937547144d
+Author: Francois Gouget <fgouget@codeweavers.com>
+Date: Thu Dec 8 09:15:55 2016 +0100
+
+ spiceqxl: Improve the Xspice and Xorg configuration option descriptions
+
+ Group the options more logically and improve their descriptions.
+ Add the missing help strings for Xspice --help and standardize the
+ messages to start with a lowercase and not end with a period.
+ In the Xorg configuration, always show the default in the
+ commented-out sample.
+
+ Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
+ Acked-by: Christophe Fergeau <cfergeau@redhat.com>
+
+commit 7657ffb8a5cba20f221c2af93e0c83b81356053c
+Author: Christophe Fergeau <cfergeau@redhat.com>
+Date: Fri Oct 28 11:56:47 2016 +0200
+
+ build: Error out when enabling xspice with X.Org 1.19
+
+ xspice needs to be updated to cope with some X.Org 1.19 API changes,
+ better to make that explicit at configure time rather than letting
+ people discover the hard way (it builds with warnings but will not work)
+ that it's broken.
+
+commit 4783c5439552a461516a6d917765000a9b60c295
+Author: Christophe Fergeau <cfergeau@redhat.com>
+Date: Fri Oct 28 10:54:55 2016 +0200
+
+ Fix "calles" typo in comment
+
+commit 4fbe63601d5806814b9bcaef07349759a4b0834d
+Author: Dave Airlie <airlied@redhat.com>
+Date: Fri Aug 5 16:58:04 2016 +0200
+
+ Disable composite/a8 surfaces for KMS
+
+ This should help with bug #974198
+
+commit 0daf59bd23b8b92b69a28b7bb1fa5961a8e86d97
+Author: Dave Airlie <airlied@redhat.com>
+Date: Fri Aug 5 16:55:31 2016 +0200
+
+ Disable surfaces when KMS is used
+
+ This is not working properly at the moment.
+
commit 4d7160c49614c9132e7b7ae4ccfda952daffeefb
Author: Francois Gouget <fgouget@codeweavers.com>
Date: Fri Oct 28 16:50:18 2016 +0200
commit 06bf1e428efe3ecfbf91c92d66a3c3702755b9a1
Author: Laurent Bigonville <bigon@debian.org>
Date: Tue Dec 20 10:13:08 2016 +0100
Revert "Disable Xspice again, it's not working with XOrg 1.19 release"
Last release now works with XOrg 1.19
This reverts commit aa2edb328359c56a6056036642f17c7176ede83a.
diff --git a/debian/Xspice.1 b/debian/Xspice.1
new file mode 100644
index 0000000..2ed555c
--- /dev/null
+++ b/debian/Xspice.1
@@ -0,0 +1,115 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.6.
+.TH XSPICE "1" "May 2015" "Xspice" "User Commands"
+.SH NAME
+Xspice \- X server and SPICE server
+.SH DESCRIPTION
+usage: Xspice [Xspice and Xorg options intermixed]
+.PP
+X and Spice server. example usage: Xspice \fB\-\-port\fR 5900 \fB\-\-disable\-ticketing\fR :1.0
+.SS "optional arguments:"
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.HP
+\fB\-\-xorg\fR XORG
+.TP
+\fB\-\-auto\fR
+Automatically create a temporary xorg.conf and start
+the X server
+.TP
+\fB\-\-xsession\fR XSESSION
+If given, will run after Xorg launch. Should be a
+program like x\-session\-manager
+.HP
+\fB\-\-config\fR CONFIG
+.TP
+\fB\-\-port\fR PORT
+standard spice port
+.TP
+\fB\-\-exit\-on\-disconnect\fR
+Exit the X server when any client disconnects
+.TP
+\fB\-\-deferred\-fps\fR DEFERRED_FPS
+If given, render to a buffer and send updates only
+this many times per second
+.TP
+\fB\-\-tls\-port\fR TLS_PORT
+spice tls port
+.TP
+\fB\-\-disable\-ticketing\fR
+do not require a client password
+.TP
+\fB\-\-sasl\fR
+enable sasl
+.TP
+\fB\-\-x509\-dir\fR X509_DIR
+x509 directory for tls
+.TP
+\fB\-\-cacert\-file\fR CACERT_FILE
+ca certificate file for tls
+.TP
+\fB\-\-x509\-cert\-file\fR X509_CERT_FILE
+server certificate file for tls
+.TP
+\fB\-\-x509\-key\-file\fR X509_KEY_FILE
+server key file for tls
+.TP
+\fB\-\-x509\-key\-password\fR X509_KEY_PASSWORD
+key file password for tls
+.HP
+\fB\-\-tls\-ciphers\fR TLS_CIPHERS
+.HP
+\fB\-\-dh\-file\fR DH_FILE
+.TP
+\fB\-\-password\fR PASSWORD
+set password required to connect to server
+.TP
+\fB\-\-image\-compression\fR {off,auto_glz,auto_lz,quic,glz,lz}
+auto_glz by default
+.TP
+\fB\-\-jpeg\-wan\-compression\fR {auto,never,always}
+auto by default
+.TP
+\fB\-\-zlib\-glz\-wan\-compression\fR {auto,never,always}
+auto by default
+.TP
+\fB\-\-streaming\-video\fR {off,all,filter}
+filter by default
+.HP
+\fB\-\-ipv4\-only\fR
+.HP
+\fB\-\-ipv6\-only\fR
+.TP
+\fB\-\-vdagent\fR
+launch vdagent & vdagentd. They provide clipboard &
+resolution automation
+.TP
+\fB\-\-vdagent\-virtio\-path\fR VDAGENT_VIRTIO_PATH
+virtio socket path used by vdagentd
+.TP
+\fB\-\-vdagent\-uinput\-path\fR VDAGENT_UINPUT_PATH
+uinput socket path used by vdagent
+.TP
+\fB\-\-vdagentd\-exec\fR VDAGENTD_EXEC
+path to spice\-vdagentd (used with \fB\-\-vdagent\fR)
+.TP
+\fB\-\-vdagent\-exec\fR VDAGENT_EXEC
+path to spice\-vdagent (used with \fB\-\-vdagent\fR)
+.TP
+\fB\-\-vdagent\-no\-launch\fR
+do not launch vdagent & vdagentd, used for debugging
+or if some external script wants to take care of that
+.TP
+\fB\-\-vdagent\-uid\fR VDAGENT_UID
+set vdagent user id. changing it makes sense only in
+conjunction with \fB\-\-vdagent\-no\-launch\fR
+.TP
+\fB\-\-vdagent\-gid\fR VDAGENT_GID
+set vdagent group id. changing it makes sense only in
+conjunction with \fB\-\-vdagent\-no\-launch\fR
+.TP
+\fB\-\-audio\-fifo\-dir\fR AUDIO_FIFO_DIR
+set fifo directory for playback audio. designed to
+work with PulseAudio's module\-pipe\-sink
+.PP
+Any options not parsed by Xspice get passed to Xorg as is.
diff --git a/debian/changelog b/debian/changelog
index 7c2384d..a3910bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ xserver-xorg-video-qxl (0.1.5-1) UNRELEASED; urgency=medium
* New upstream release
- Drop debian/patches/no-surfaces-kms.patch and
debian/patches/qxl-kms-disable-composite.patch, applied upstream
+ * Re-reenable Xspice, last release now works with XOrg 1.19
- -- Laurent Bigonville <bigon@debian.org> Tue, 20 Dec 2016 10:09:00 +0100
+ -- Laurent Bigonville <bigon@debian.org> Tue, 20 Dec 2016 10:12:19 +0100
xserver-xorg-video-qxl (0.1.4+20161126git4d7160c-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index d1b20ab..291b3ca 100644
--- a/debian/control
+++ b/debian/control
@@ -44,3 +44,18 @@ Description: X.Org X server -- QXL display driver
<URL:https://www.X.org>
.
This package is built from the X.org xf86-video-qxl driver module.
+
+Package: xserver-xspice
+Architecture: amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, xserver-xorg, ${xviddriver:Depends}, python-argparse
+Breaks: xserver-xorg-video-qxl (<< 0.1.4-2~)
+Replaces: xserver-xorg-video-qxl (<< 0.1.4-2~)
+Description: Xspice X server
+ Xspice is an X server and Spice server in one. It consists of a wrapper script
+ for executing Xorg with the right parameters and environment variables, a
+ module names spiceqxl_drv.so implementing three drivers: a video mostly
+ identical code to the guest qxl X driver, and keyboard and mouse reading from
+ the spice inputs channel.
+ .
+ Xspice allows regular X connections, while a spice client provides the keyboard
+ and mouse and video output.
diff --git a/debian/rules b/debian/rules
index 6bd5fe1..62d36b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,7 @@ override_dh_auto_install:
override_dh_install:
find debian/tmp -name '*.la' -delete
-rm -r debian/tmp/usr/share
+ install -D -m 644 -o root -g root ./examples/spiceqxl.xorg.conf.example debian/tmp/etc/X11/spiceqxl.xorg.conf
dh_install --fail-missing
# That's a plugin, use appropriate warning level:
@@ -27,8 +28,13 @@ override_dh_xsf_substvars:
echo "xviddriver:Depends=$(VIDEODEP)" >> debian/xserver-xspice.substvars
dh_xsf_substvars
+# Enable Xspice support
override_dh_auto_configure:
+ifeq ($(DEB_HOST_GNU_TYPE), x86_64-linux-gnu)
+ dh_auto_configure -- --libdir=/usr/lib --enable-xspice
+else
dh_auto_configure -- --libdir=/usr/lib
+endif
%:
dh $@ --with quilt,autoreconf,xsf,python2 --builddirectory=build/
diff --git a/debian/xserver-xspice.docs b/debian/xserver-xspice.docs
new file mode 100644
index 0000000..61fc1f0
--- /dev/null
+++ b/debian/xserver-xspice.docs
@@ -0,0 +1,2 @@
+README.xspice
+examples/spiceqxl.xorg.conf.example
diff --git a/debian/xserver-xspice.install b/debian/xserver-xspice.install
new file mode 100644
index 0000000..d4e1c62
--- /dev/null
+++ b/debian/xserver-xspice.install
@@ -0,0 +1,3 @@
+etc/X11/spiceqxl.xorg.conf
+usr/lib/xorg/modules/drivers/spiceqxl_drv.so
+usr/bin
diff --git a/debian/xserver-xspice.manpages b/debian/xserver-xspice.manpages
new file mode 100644
index 0000000..8f8662a
--- /dev/null
+++ b/debian/xserver-xspice.manpages
@@ -0,0 +1 @@
+debian/Xspice.1
Reply to: