system/xf86-video-qxl: Updated for version 20120823_a261bef

Also added an XSPICE= option

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

5 files changed, 56 insertions, 11 deletions

diff --git a/system/xf86-video-qxl/README b/system/xf86-video-qxl/README
index 1647598fff..f9f70ec91b 100644
--- a/system/xf86-video-qxl/README
+++ b/system/xf86-video-qxl/README
@@ -1,4 +1,8 @@
 xf86-video-qxl (X.org spice qxl video driver) 
 
 This X.Org driver provides support for QEMU QXL paravirt video.
-It's meant to be used in your virtualized guests.
+It's meant to be used only in your virtualized guests.
+
+Also an Xspice X server can be built, passing the script
+XSPICE=yes. This requires the optional dependency spice.
+Note that it's still experimental (=unstable)
diff --git a/system/xf86-video-qxl/README.Xspice b/system/xf86-video-qxl/README.Xspice
new file mode 100644
index 0000000000..9ff95f74d9
--- /dev/null
+++ b/system/xf86-video-qxl/README.Xspice
@@ -0,0 +1,11 @@
+Run server with:
+export XSPICE_PORT=5900
+X -noreset -config spiceqxl.xorg.conf :3.0
+
+Or:
+Xspice --config spiceqxl.xorg.conf --password mypass --port 5900 :3.0
+(you can use also --disable-ticketing to disable authentication!)
+
+Use a spice client (like spicec) to connect.
+
+Run X clients as usual by setting DISPLAY=:3.0
diff --git a/system/xf86-video-qxl/doinst.sh b/system/xf86-video-qxl/doinst.sh
new file mode 100644
index 0000000000..c45f8450b8
--- /dev/null
+++ b/system/xf86-video-qxl/doinst.sh
@@ -0,0 +1,17 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+if [ -f etc/X11/spiceqxl.xorg.conf.new ]; then
+  config etc/X11/spiceqxl.xorg.conf.new
+fi
+config usr/share/X11/xorg.conf.d/05-qxl.conf.new
diff --git a/system/xf86-video-qxl/xf86-video-qxl.SlackBuild b/system/xf86-video-qxl/xf86-video-qxl.SlackBuild
index b730bdd5d1..7848b6f6ff 100644
--- a/system/xf86-video-qxl/xf86-video-qxl.SlackBuild
+++ b/system/xf86-video-qxl/xf86-video-qxl.SlackBuild
@@ -4,7 +4,7 @@
 # written by Matteo Bernardini <ponce@slackbuilds.org>
 
 PRGNAM=xf86-video-qxl
-VERSION=${VERSION:-20120209_96349eb}
+VERSION=${VERSION:-20120823_a261bef}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -35,13 +35,19 @@ else
   LIBDIRSUFFIX=""
 fi
 
+if [ "${XSPICE:-no}" = "yes" ]; then
+  with_xspice="--enable-xspice=yes"
+else
+  with_xspice=""
+fi
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -59,16 +65,22 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  $with_xspice \
   --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
-# add an xorg.conf file
-install -m 0644 -D $CWD/05-qxl.conf $PKG/usr/share/X11/xorg.conf.d/05-qxl.conf
-
-# we have nothing in bin
-rm -fr $PKG/usr/bin
+# add a config file for Xorg and another one for Xspice (if needed)
+install -m 0644 -D $CWD/05-qxl.conf \
+  $PKG/usr/share/X11/xorg.conf.d/05-qxl.conf.new
+if [ "${XSPICE:-no}" = "yes" ]; then
+  install -m 0644 -D examples/spiceqxl.xorg.conf.example \
+    $PKG/etc/X11/spiceqxl.xorg.conf.new
+  install -m 0755 -D scripts/Xspice $PKG/usr/bin/Xspice
+else
+  rm -fr $PKG/usr/bin     # we have nothing in bin
+fi
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -79,6 +91,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/xf86-video-qxl/xf86-video-qxl.info b/system/xf86-video-qxl/xf86-video-qxl.info
index ec4a252c46..2ee79312fd 100644
--- a/system/xf86-video-qxl/xf86-video-qxl.info
+++ b/system/xf86-video-qxl/xf86-video-qxl.info
@@ -1,8 +1,8 @@
 PRGNAM="xf86-video-qxl"
-VERSION="20120209_96349eb"
+VERSION="20120823_a261bef"
 HOMEPAGE="http://spice-space.org"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/xf86-video-qxl-20120209_96349eb.tar.xz"
-MD5SUM="46ec2b71a52c918ed563180ae746c471"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/xf86-video-qxl-20120823_a261bef.tar.xz"
+MD5SUM="1e948181f8dad6ea23d02954884f1363"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="spice-protocol"