1 files changed, 20 insertions, 7 deletions
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}