inital import of spice/libvirt moduleset and associated jhbuildrc

4 files changed, 177 insertions, 0 deletions

diff --git a/README b/README
new file mode 100644
index 0000000..f0af5fb
--- /dev/null
+++ b/README
@@ -0,0 +1,27 @@
+This is a jhbuild moduleset to build spice (and optionnally libvirt) with
+smartcard support.
+To use it, you first have to download and install jhbuild from
+http://git.gnome.org/browse/jhbuild/
+It should be a simple matter of:
+git://git.gnome.org/jhbuild
+cd jhbuild
+./autogen.sh --prefix=....
+make install
+
+Then you can clone this jhbuild moduleset into ~/spice:
+mkdir -p ~/spice
+git clone git://people.freedesktop.org/~teuf/spice-jhbuild ~/spice/spice-jhbuild
+jhbuild -f ~/spice/spice-jhbuild/jhbuildrc
+
+and it will build qemu with spice support and smartcard support and
+spice-gtk as the spice client.
+
+It can be run with something like:
+jhbuild -f ~/spice/spice-jhbuild/jhbuildrc run qemu-system-x86_64 -vga qxl -spice port=5924,disable-ticketing -enable-kvm
+-m 512 -nographic -usbdevice tablet -cdrom ~/isos/livecd.iso
+and
+jhbuild -f ~/spice/spice-jhbuild/jhbuildrc run spicy
+
+If you run
+jhbuild -f ~/spice/spice-jhbuild/jhbuildrc virt-manager
+libvirt and virt-manager will be built instead.
diff --git a/jhbuildrc b/jhbuildrc
new file mode 100644
index 0000000..831c271
--- /dev/null
+++ b/jhbuildrc
@@ -0,0 +1,21 @@
+# how to use this file?
+#
+# mkdir -p $HOME/spice
+# git clone git://anongit.freedesktop.org/git/xorg/util/modular/ $HOME/xorg/util/modular
+# git clone git://people.freedesktop.org/~teuf/spice-jhbuild ~/spice/spice-jhbuild
+# jhbuild -f $HOME/spice/spice-jhbuild/jhbuildrc
+#
+# Source tree will be in $HOME/spice/
+# Binaries will be in $HOME/spice-usr
+#
+
+moduleset = os.path.join(os.environ['HOME'], 'spice', 'spice-jhbuild', 'modulesets', 'spice.xml')
+
+modules = [ 'spice-gtk', 'qemu' ]
+
+# All modules will be in $HOME/xorg/ after the checkout
+checkoutroot = os.path.join(os.environ['HOME'], 'spice')
+prefix = os.path.join(os.environ['HOME'], 'spice-usr')
+os.environ['ACLOCAL'] = 'aclocal -I ' + os.path.join(prefix, 'share', 'aclocal')
+os.environ['PKG_CONFIG_PATH'] = os.path.join(prefix, 'lib', 'pkgconfig') \
+    + ':' + os.path.join(prefix, 'share', 'pkgconfig')
diff --git a/modulesets/spice.xml b/modulesets/spice.xml
new file mode 100644
index 0000000..05d6088
--- /dev/null
+++ b/modulesets/spice.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" standalone="no"?><!--*- mode: nxml -*-->
+<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
+<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
+<moduleset>
+
+  <repository type="git" name="git.freedesktop.org"
+      href="git://anongit.freedesktop.org/"/>
+
+  <repository type="git" name="spice"
+      href="git://anongit.freedesktop.org/git/spice"/>
+
+  <repository type="git" name="git.gitorious.org"
+      href="git://gitorious.org/"/>
+
+  <tarball id="celt" version="0.5.1.3">
+    <source href="http://downloads.us.xiph.org/releases/celt/celt-0.5.1.3.tar.gz"
+            hash="sha256:fc2e5b68382eb436a38c3104684a6c494df9bde133c139fbba3ddb5d7eaa6a2e"
+            md5sum="67e7b5e45db57a6f1f0a6962f5ecb190" size="440772"/>
+    <dependencies>
+    </dependencies>
+  </tarball>
+
+  <autotools id="spice-server" autogenargs="--enable-werror --enable-smartcard --with-sasl --disable-client" >
+    <branch repo="spice" module="spice"/>
+    <dependencies>
+      <dep package="spice-protocol"/>
+      <dep package="celt"/>
+      <dep package="libcacard"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="spice-protocol">
+    <branch repo="spice" module="spice-protocol"/>
+    <dependencies>
+    </dependencies>
+  </autotools>
+
+  <autotools id="qemu" autogen-template="%(srcdir)s/configure --prefix=%(prefix)s --enable-spice --target-list=x86_64-softmmu --enable-smartcard-nss --enable-smartcard" >
+    <branch revision="spice.v32.kvm.ccid.v23" repo="spice" module="qemu"/>
+    <dependencies>
+      <dep package="libcacard"/>
+      <dep package="spice-server"/>
+      <dep package="vd-agent"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="slirp">
+    <branch repo="spice" module="slirp"/>
+    <dependencies>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libcacard">
+    <branch repo="git.freedesktop.org" module="~alon/libcacard"/>
+    <dependencies>
+    </dependencies>
+  </autotools>
+
+  <autotools id="spice-gtk">
+    <branch repo="git.gitorious.org" module="spice-gtk/spice-gtk.git"/>
+    <dependencies>
+      <dep package="spice-protocol"/>
+      <dep package="celt"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="vd-agent">
+    <branch repo="spice" module="linux/vd_agent"/>
+    <dependencies>
+      <dep package="spice-protocol"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="qxl">
+    <branch repo="spice" module="xorg/driver/xf86-video-qxl"/>
+    <dependencies>
+      <dep package="spice-protocol"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="win32-vd-agent">
+    <branch repo="spice" module="win32/vd_agent"/>
+    <dependencies>
+    </dependencies>
+  </autotools>
+
+  <autotools id="win32-qxl">
+    <branch repo="spice" module="win32/qxl"/>
+    <dependencies>
+    </dependencies>
+  </autotools>
+
+</moduleset>
diff --git a/modulesets/virt.xml b/modulesets/virt.xml
new file mode 100644
index 0000000..d60971a
--- /dev/null
+++ b/modulesets/virt.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" standalone="no"?><!--*- mode: nxml -*-->
+<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
+<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
+<moduleset>
+
+  <repository type="git" name="libvirt.org"
+      href="git://libvirt.org/"/>
+
+  <repository type="git" name="git.fedorahosted.org"
+      href="git://git.fedorahosted.org/git/"/>
+
+  <autotools id="libvirt">
+    <branch repo="libvirt.org" module="libvirt.git"/>
+    <dependencies>
+    </dependencies>
+  </autotools>
+
+  <autotools id="virt-manager">
+    <branch repo="git.fedorahosted.org" module="virt-manager.git"/>
+    <dependencies>
+    </dependencies>
+  </autotools>
+
+  <autotools id="virtinst">
+    <branch repo="git.fedorahosted.org" module="python-virtinst.git"/>
+    <dependencies>
+    </dependencies>
+  </autotools>
+
+  <autotools id="virt-viewer">
+    <branch repo="git.fedorahosted.org" module="virt-viewer.git"/>
+    <dependencies>
+    </dependencies>
+  </autotools>
+
+</moduleset>