[jhbuild] 3.24: Move pulseaudio to sysdeps



commit 3582165178f846bea096cb4a1569f2e3037a44f1
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Wed Dec 7 10:44:14 2016 -0600

    3.24: Move pulseaudio to sysdeps
    
    We depend on a very old version, and the git master build is broken.

 modulesets/gnome-suites-core-3.24.modules |   33 -----------------------------
 modulesets/gnome-sysdeps-3.24.modules     |    6 +++++
 2 files changed, 6 insertions(+), 33 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-3.24.modules b/modulesets/gnome-suites-core-3.24.modules
index fc446eb..b3003a6 100644
--- a/modulesets/gnome-suites-core-3.24.modules
+++ b/modulesets/gnome-suites-core-3.24.modules
@@ -538,39 +538,6 @@
     </suggests>
   </autotools>
 
-  <autotools id="pulseaudio"
-             supports-non-srcdir-builds="no"
-             autogenargs="--disable-hal --disable-oss-output --disable-esound --disable-gconf --disable-gtk3 
--enable-bluez5">
-    <if condition-unset="linux">
-      <autogenargs value="--disable-bluez4 --disable-bluez5"/>
-    </if>
-    <if condition-set="macos">
-      <autogenargs value="--disable-alsa --disable-avahi"/>
-    </if>
-    <branch repo="pulseaudio.freedesktop.org"/>
-    <dependencies>
-      <dep package="dbus"/>
-      <dep package="json"/>
-      <dep package="libsndfile"/>
-      <dep package="libtool-ltdl"/>
-      <dep package="glib"/>
-      <dep package="speex"/>
-      <if condition-set="linux">
-        <dep package="bluez"/>
-        <dep package="libcap"/>
-        <dep package="libudev"/>
-        <dep package="sbc"/>
-      </if>
-      <if condition-set="systemd">
-        <dep package="libsystemd"/>
-      </if>
-      <if condition-unset="macos">
-        <dep package="alsa"/>
-        <dep package="avahi"/>
-      </if>
-    </dependencies>
-  </autotools>
-
   <autotools id="rygel" supports-non-srcdir-builds="no">
     <branch/>
     <dependencies>
diff --git a/modulesets/gnome-sysdeps-3.24.modules b/modulesets/gnome-sysdeps-3.24.modules
index 6234fd4..6b51cd5 100644
--- a/modulesets/gnome-sysdeps-3.24.modules
+++ b/modulesets/gnome-sysdeps-3.24.modules
@@ -956,6 +956,12 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="pulseaudio">
+    <pkg-config>libpulse-mainloop-glib.pc</pkg-config>
+    <branch repo="system"
+            version="2.0"/>
+  </systemmodule>
+
   <systemmodule id="py3cairo">
     <pkg-config>py3cairo.pc</pkg-config>
     <branch repo="system"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]