Merge branch 'kvm'

component/noVNC/buildout.cfg

@@ -6,5 +6,5 @@ parts =
 recipe = hexagonit.recipe.download
 # Post-0.4 release from January 2013
 url = http://github.com/kanaka/noVNC/zipball/3b2acc2258d36137a37edfbe0f03a3099189c49d
-md5sum = 0d06abc20e59643e14fefe52b42daf60
+md5sum = a276be8fa193652bb5de8a271603f11f
 strip-top-level-dir = true

component/qemu-kvm/buildout.cfg

@@ -3,6 +3,7 @@ extends =
   ../../component/gnutls/buildout.cfg
   ../../component/libpng/buildout.cfg
   ../../component/libuuid/buildout.cfg
+  ../../component/xorg/buildout.cfg
   ../../component/zlib/buildout.cfg
 
 [kvm]
@@ -15,6 +16,7 @@ recipe = slapos.recipe.cmmi
 url = http://wiki.qemu-project.org/download/qemu-1.4.1.tar.bz2
 md5sum = eb2d696956324722b5ecfa46e41f9a75
 configure-options =
+  --target-list=""
   --disable-sdl
   --disable-xen
   --enable-vnc-tls
@@ -25,9 +27,11 @@ configure-options =
   --disable-docs
   --enable-vnc-png
   --disable-vnc-jpeg
+  --enable-vnc-ws
   --extra-cflags="-I${gnutls:location}/include -I${libuuid:location}/include -I${zlib:location}/include -I${libpng:location}/include"
   --extra-ldflags="-Wl,-rpath -Wl,${glib:location}/lib -L${glib:location}/lib -Wl,-rpath -Wl,${gnutls:location}/lib -L${gnutls:location}/lib -Wl,-rpath -Wl,${gpg-error:location}/lib -L${gpg-error:location}/lib -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib -Wl,-rpath -Wl,${libpng:location}/lib -L${libpng:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -lpng -lz -lgnutls"
   --disable-werror
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${gnutls:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${gnutls:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig
+