Signed-off-by: Eduardo Lima (Etrunko) <etrunko@xxxxxxxxxx>
---
jhbuildrc | 2 ++
modulesets/spice.xml | 35 ++++++++++++++++++-----------------
2 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/jhbuildrc b/jhbuildrc
index 8b15ef6..1fb1c0e 100644
--- a/jhbuildrc
+++ b/jhbuildrc
@@ -11,6 +11,8 @@
moduleset = os.path.join(os.environ['HOME'], 'spice', 'spice-jhbuild', 'modulesets', 'spice.xml')
+mesonargs = '--buildtype=debugoptimized'
+
modules = [ 'spice-gtk', 'qemu' ]
# All module sources will be in $HOME/spice/ after the checkout
diff --git a/modulesets/spice.xml b/modulesets/spice.xml
index 05a6270..feb1cea 100644
--- a/modulesets/spice.xml
+++ b/modulesets/spice.xml
@@ -28,25 +28,25 @@
<repository type="git" name="git.gnome.org"
href="git://git.gnome.org/"/>
- <autotools id="spice-server"
- autogenargs=
-"--enable-werror
---enable-smartcard
---enable-lz4
---with-sasl">
+ <meson id="spice-server"
+ mesonargs=
+"-Dwerror=true
+-Dsmartcard=true
+-Dlz4=true
+-Dsasl=true">
<branch repo="spice" module="spice"/>
<dependencies>
<dep package="spice-protocol"/>
<dep package="libcacard"/>
<dep package="pyparsing"/>
</dependencies>
- </autotools>
+ </meson>
- <autotools id="spice-protocol">
+ <meson id="spice-protocol">
<branch repo="spice" module="spice-protocol"/>
<dependencies>
</dependencies>
- </autotools>
+ </meson>
<!-- qemu isn't a real autotools user, but it provides a configure script
which is really similar to the one in autotools build systems.
@@ -102,13 +102,14 @@
version="2.0.3" size="1462653"/>
</distutils>
- <autotools id="spice-gtk"
- autogenargs=
-"--enable-werror
---enable-webdav
---enable-smartcard
---enable-usbredir
---disable-polkit">
+ <meson id="spice-gtk"
+ mesonargs=
+"-Dwerror=true
+-Dwebdav=enabled
+-Dsmartcard=enabled
+-Dusbredir=enabled
+-Dpolkit=disabled
+-Dgtk_doc=disabled">
<branch repo="spice" module="spice-gtk.git"/>
<dependencies>
<dep package="libcacard"/>
@@ -117,7 +118,7 @@
<dep package="spice-protocol"/>
<dep package="usbredir"/>
</dependencies>
- </autotools>
+ </meson>
<autotools id="vd-agent">
<branch repo="spice" module="linux/vd_agent"/>
--
2.20.1
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel