[jhbuild] 3.10: Move pulseaudio to -core

[Javier Jardón <jjardon src gnome org>]

commit f2832068fc241ac4105dac5773edbda72e34c9d2
Author: Javier Jardón <jjardon gnome org>
Date:   Sun Jul 14 21:44:07 2013 +0100

    3.10: Move pulseaudio to -core
    
    So we can build latest pulseaudio with Bluez5 support

 modulesets/gnome-suites-core-3.10.modules |   22 +++++++++++++++
 modulesets/gnome-sysdeps-3.10.modules     |   43 +++++++++++++++++++++++++----
 2 files changed, 59 insertions(+), 6 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-3.10.modules b/modulesets/gnome-suites-core-3.10.modules
index 316c724..208cf9d 100644
--- a/modulesets/gnome-suites-core-3.10.modules
+++ b/modulesets/gnome-suites-core-3.10.modules
@@ -9,6 +9,8 @@
       href="git://git.gnome.org/"/>
   <repository type="git" name="git.freedesktop.org"
       href="git://anongit.freedesktop.org/"/>
+  <repository type="git" name="pulseaudio.freedesktop.org"
+      href="git://anongit.freedesktop.org/pulseaudio/"/>
   <repository type="git" name="telepathy.freedesktop.org"
     href="git://anongit.freedesktop.org/telepathy/"/>
   <repository type="git" name="packagekit.gitorious.org"
@@ -425,6 +427,26 @@
     </suggests>
   </autotools>
 
+  <autotools id="pulseaudio"
+             autogenargs="--disable-hal --disable-oss-output --disable-esound --disable-gconf 
--disable-gtk3">
+    <branch repo="pulseaudio.freedesktop.org"/>
+    <dependencies>
+      <dep package="alsa"/>
+      <dep package="avahi"/>
+      <dep package="bluez"/>
+      <dep package="dbus"/>
+      <dep package="json"/>
+      <dep package="libsndfile"/>
+      <dep package="libtool-ltdl"/>
+      <dep package="libudev"/>
+      <dep package="glib"/>
+      <dep package="speex"/>
+    </dependencies>
+    <after>
+      <dep package="polkit"/>
+    </after>
+  </autotools>
+
   <autotools id="telepathy-mission-control" autogenargs="--disable-Werror">
     <branch repo="telepathy.freedesktop.org"/>
     <dependencies>
diff --git a/modulesets/gnome-sysdeps-3.10.modules b/modulesets/gnome-sysdeps-3.10.modules
index bff2457..2bb3c60 100644
--- a/modulesets/gnome-sysdeps-3.10.modules
+++ b/modulesets/gnome-sysdeps-3.10.modules
@@ -9,6 +9,12 @@
 
   <repository type="system" name="system"/>
 
+  <systemmodule id="alsa">
+    <pkg-config>alsa.pc</pkg-config>
+    <branch repo="system"
+            version="1.0.19"/>
+  </systemmodule>
+
   <systemmodule id="avahi">
     <pkg-config>avahi-gobject.pc</pkg-config>
     <branch repo="system"
@@ -255,6 +261,12 @@
     <branch repo="system"/>
   </systemmodule>
 
+  <systemmodule id="json">
+    <pkg-config>json.pc</pkg-config>
+    <branch repo="system"
+            version="0.9"/>
+  </systemmodule>
+
   <systemmodule id="lcms2">
     <pkg-config>lcms2.pc</pkg-config>
     <branch repo="system"
@@ -434,6 +446,12 @@
     <branch repo="system"/>
   </systemmodule>
 
+  <systemmodule id="libsndfile">
+    <pkg-config>sndfile.pc</pkg-config>
+    <branch repo="system"
+            version="1.0.21"/>
+  </systemmodule>
+
   <systemmodule id="libtasn1">
     <pkg-config>libtasn1.pc</pkg-config>
     <branch repo="system"
@@ -447,6 +465,19 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="libtool-ltdl">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="c_include" name="ltdl.h"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="libudev">
+    <pkg-config>libudev.pc</pkg-config>
+    <branch repo="system"
+            version="143"/>
+  </systemmodule>
+
   <systemmodule id="libunistring">
     <branch repo="system"/>
     <systemdependencies>
@@ -558,12 +589,6 @@
             version="0.20"/>
   </systemmodule>
 
-  <systemmodule id="pulseaudio">
-    <pkg-config>libpulse-mainloop-glib.pc</pkg-config>
-    <branch repo="system"
-            version="2.1"/>
-  </systemmodule>
-
   <systemmodule id="ppp">
     <branch repo="system"/>
     <systemdependencies>
@@ -640,6 +665,12 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="speex">
+    <pkg-config>speex.pc</pkg-config>
+    <branch repo="system"
+            version="1.2rc1"/>
+  </systemmodule>
+
   <systemmodule id="sqlite3">
     <pkg-config>sqlite3.pc</pkg-config>
     <branch repo="system"