Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Tommy Boatman (ef75d4db756e6cbae36254269e37632cc4e6a252)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Tommy Boatman <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Tommy Boatman (ef75d4db756e6cbae36254269e37632cc4e6a252)
  • Date: Thu, 30 Aug 2012 10:00:25 -0500

GIT changes to master grimoire by Tommy Boatman <tboatman AT sourcemage.org>:

audio-drivers/pulseaudio/HISTORY | 4 ++++
audio-drivers/pulseaudio/PRE_SUB_DEPENDS | 3 +++
audio-drivers/pulseaudio/SUB_DEPENDS | 3 +++
gnome2-libs/gnome-settings-daemon/CONFIGURE | 5 +++++
gnome2-libs/gnome-settings-daemon/DEPENDS | 7 +++++--
gnome2-libs/gnome-settings-daemon/HISTORY | 6 ++++++
6 files changed, 26 insertions(+), 2 deletions(-)

New commits:
commit 945d33adc82b0f0d86acb06af14dd483b6aa8c1c
Author: Tommy Boatman <tboatman AT sourcemage.org>
Commit: Tommy Boatman <tboatman AT sourcemage.org>

pulseaudio: subdepend glib2 for gnome (Fixes issue #400)

commit 58f6da79290a1d32ba07b067c23c3c27ac0f075e
Author: Tommy Boatman <tboatman AT sourcemage.org>
Commit: Tommy Boatman <tboatman AT sourcemage.org>

gnome-settings-daemon: pulseaudio subdepend glib2 - fix issue #400

diff --git a/audio-drivers/pulseaudio/HISTORY
b/audio-drivers/pulseaudio/HISTORY
index a433dff..d759129 100644
--- a/audio-drivers/pulseaudio/HISTORY
+++ b/audio-drivers/pulseaudio/HISTORY
@@ -1,3 +1,7 @@
+2012-08-30 Tommy Boatman <tboatman AT sourcemage.org>
+ * [PRE_]SUB_DEPENDS: add glib2 to force Gnome support
+ Fixes issue #400
+
2012-05-31 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 2.0

diff --git a/audio-drivers/pulseaudio/PRE_SUB_DEPENDS
b/audio-drivers/pulseaudio/PRE_SUB_DEPENDS
index 9eee2f5..21f94e7 100755
--- a/audio-drivers/pulseaudio/PRE_SUB_DEPENDS
+++ b/audio-drivers/pulseaudio/PRE_SUB_DEPENDS
@@ -2,6 +2,9 @@ case $THIS_SUB_DEPENDS in
AVAHI) is_depends_enabled $SPELL avahi &&
return 0
;;
+ GLIB) is_depends_enabled $SPELL glib2 &&
+ return 0
+ ;;
esac

return 1
diff --git a/audio-drivers/pulseaudio/SUB_DEPENDS
b/audio-drivers/pulseaudio/SUB_DEPENDS
index e58e6bb..4e48b80 100755
--- a/audio-drivers/pulseaudio/SUB_DEPENDS
+++ b/audio-drivers/pulseaudio/SUB_DEPENDS
@@ -2,6 +2,9 @@ case $THIS_SUB_DEPENDS in
AVAHI) echo "ZeroConf support requested, forcing avahi dependency."
depends avahi '--enable-avahi'
;;
+ GLIB) echo "GNOME support requested, forcing glib2 dependency."
+ depends glib2 '--enable-glib2'
+ ;;
*) echo "Unknown sub-dependency $THIS_SUB_DEPENDS!"
return 1
;;
diff --git a/gnome2-libs/gnome-settings-daemon/CONFIGURE
b/gnome2-libs/gnome-settings-daemon/CONFIGURE
new file mode 100755
index 0000000..992916e
--- /dev/null
+++ b/gnome2-libs/gnome-settings-daemon/CONFIGURE
@@ -0,0 +1,5 @@
+config_query_option PULSE \
+ 'Enable PulseAudio support?' \
+ y \
+ 'pulse' \
+ 'no-pulse'
diff --git a/gnome2-libs/gnome-settings-daemon/DEPENDS
b/gnome2-libs/gnome-settings-daemon/DEPENDS
index ce32eef..97c061f 100755
--- a/gnome2-libs/gnome-settings-daemon/DEPENDS
+++ b/gnome2-libs/gnome-settings-daemon/DEPENDS
@@ -17,7 +17,10 @@ depends startup-notification &&
depends colord &&
depends upower &&

-optional_depends pulseaudio "" "" \
- "Enable PulseAudio support?" &&
+if [[ $PULSE == pulse ]]; then
+ depends -sub GLIB pulseaudio
+fi &&
+#optional_depends pulseaudio -sub "GLIB" "" "" \
+# "Enable PulseAudio support?" &&
optional_depends cups '--enable-cups' '--disable-cups' \
'Enable CUPS print support?'
diff --git a/gnome2-libs/gnome-settings-daemon/HISTORY
b/gnome2-libs/gnome-settings-daemon/HISTORY
index e96c550..610d985 100644
--- a/gnome2-libs/gnome-settings-daemon/HISTORY
+++ b/gnome2-libs/gnome-settings-daemon/HISTORY
@@ -1,3 +1,9 @@
+2012-08-30 Tommy Boatman <tboatman AT sourcemage.org>
+ * CONFIGURE: added config option for PulseAudio
+ * DEPENDS: key PulseAudio -sub GLIB on config option
+ since optional_depends -sub doesn't seem to work
+ Fixes issue #400
+
2012-05-17 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 3.4.2




  • [SM-Commit] GIT changes to master grimoire by Tommy Boatman (ef75d4db756e6cbae36254269e37632cc4e6a252), Tommy Boatman, 08/30/2012

Archive powered by MHonArc 2.6.24.

Top of Page