[jhbuild] apps: clean up spice, drop celt, use opus

[Ryan Lortie <desrt src gnome org>]

commit d4446a8697b74c9f5b3a11d73ded3e22d584d57c
Author: Ryan Lortie <desrt desrt ca>
Date:   Tue Feb 11 09:35:33 2014 -0500

    apps: clean up spice, drop celt, use opus
    
    Update to the latest release of spice-gtk, which (after much
    anticipation) supports opus instead of the long-unmaintained celt051.
    
    Drop spice-protocol as a dependency of spice-gtk since it is now rolled
    into the tarball upstream (via gitsubmodules).
    
    Drop spice-server as well because nothing in the entire moduleset
    actually uses it.
    
    Add a sysdep for opus.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=724116

 modulesets/gnome-apps-3.12.modules    |   44 +++-----------------------------
 modulesets/gnome-sysdeps-3.12.modules |    5 +++
 2 files changed, 10 insertions(+), 39 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.12.modules b/modulesets/gnome-apps-3.12.modules
index 2aa403e..f8bd4ef 100644
--- a/modulesets/gnome-apps-3.12.modules
+++ b/modulesets/gnome-apps-3.12.modules
@@ -27,8 +27,6 @@
       href="http://www.spice-space.org/download/"/>
   <repository type="tarball" name="libvirt.org"
       href="http://libvirt.org/sources/"/>
-  <repository type="tarball" name="xiph.org"
-        href="http://downloads.xiph.org/releases/"/>
   <repository type="tarball" name="ftp.gnu.org"
       href="http://ftp.gnu.org/gnu/"/>
   <repository type="tarball" name="speech-dispatcher"
@@ -72,16 +70,6 @@
     </suggests>
   </autotools>
 
-  <autotools id="celt">
-    <branch repo="xiph.org"
-            module="celt/celt-0.5.1.3.tar.gz"
-            version="0.5.1.3"
-            hash="sha256:fc2e5b68382eb436a38c3104684a6c494df9bde133c139fbba3ddb5d7eaa6a2e"
-            size="440772"/>
-    <dependencies>
-    </dependencies>
-  </autotools>
-
   <autotools id="libvirt" autogenargs="--with-yajl">
     <branch repo="libvirt.org"
             module="libvirt-1.0.6.tar.gz"
@@ -260,38 +248,16 @@
     </dependencies>
   </autotools>
 
-  <autotools id="spice-protocol">
-    <branch repo="spice"
-            module="releases/spice-protocol-0.12.5.tar.bz2"
-            version="0.12.5"
-            hash="sha256:feacb14940cdcc10214ec8cdc2198d880e54eb206e6d65a9bddf8360b27f7bf9"/>
-    <dependencies>
-    </dependencies>
-  </autotools>
-
-  <autotools id="spice-server" autogenargs="--disable-smartcard --without-sasl --disable-client">
-    <branch repo="spice"
-            module="releases/spice-0.12.2.tar.bz2"
-            version="0.12.2"
-            hash="sha256:5654fac02f5568088ea01979088d539f4e95551568dd709ec197e965cf8612d5"
-            size="1685684"/>
-    <dependencies>
-      <dep package="spice-protocol"/>
-      <dep package="celt"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="spice-gtk" autogenargs="--disable-smartcard --enable-vala">
     <branch repo="spice"
-            module="gtk/spice-gtk-0.20.tar.bz2"
-            version="0.20"
-            hash="sha256:b1355823b0ceb2e118c1f9a9a602ccab78e1e2edf2d93f71fa42d3bc85ca75df"
-            size="1210694">
+            module="gtk/spice-gtk-0.23.tar.bz2"
+            version="0.23"
+            hash="sha256:bfdfa6cb12c40327b63167fe7191ce94e7f2a272473c87df31790c25d60cc81d"
+            size="1224546">
     </branch>
     <dependencies>
-      <dep package="celt"/>
+      <dep package="opus"/>
       <dep package="cyrus-sasl"/>
-      <dep package="spice-protocol"/>
       <dep package="gtk+"/>
       <dep package="vala"/>
     </dependencies>
diff --git a/modulesets/gnome-sysdeps-3.12.modules b/modulesets/gnome-sysdeps-3.12.modules
index 58a1ac7..ebe8785 100644
--- a/modulesets/gnome-sysdeps-3.12.modules
+++ b/modulesets/gnome-sysdeps-3.12.modules
@@ -825,4 +825,9 @@
     <pkg-config>gtkspell3-3.0.pc</pkg-config>
     <branch repo="system"/>
   </systemmodule>
+
+  <systemmodule id="opus">
+    <pkg-config>opus</pkg-config>
+    <branch repo="system" version="1.0"/>
+  </systemmodule>
 </moduleset>