Bump to 2.26.0. This now includes the volume control applet that sits in the systray to replace the old one, adds sound theme support using libcanberra, and uses pulseaudio/GStreamer, depending on the USE flag.

(Portage version: 2.2_rc33/cvs/Linux i686)

5 files changed, 274 insertions, 3 deletions

diff --git a/gnome-extra/gnome-media/ChangeLog b/gnome-extra/gnome-media/ChangeLog
index f835cd311faf..ba5225205f9b 100644
--- a/gnome-extra/gnome-media/ChangeLog
+++ b/gnome-extra/gnome-media/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-extra/gnome-media
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/ChangeLog,v 1.193 2009/04/28 17:56:33 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/ChangeLog,v 1.194 2009/05/10 20:58:09 ford_prefect Exp $
+
+*gnome-media-2.26.0 (10 May 2009)
+
+  10 May 2009; Arun Raghavan <ford_prefect@gentoo.org>
+  +gnome-media-2.26.0.ebuild,
+  +files/gnome-media-2.26.0-automagic-canberra.patch,
+  +files/gnome-media-2.26.0-missing-cddbslave-cflags.patch, metadata.xml:
+  Bump to 2.26.0. This now includes the volume control applet that sits in
+  the systray to replace the old one, adds sound theme support using
+  libcanberra, and uses pulseaudio/GStreamer, depending on the USE flag.
 
   28 Apr 2009; Raúl Porcel <armin76@gentoo.org>
   gnome-media-2.24.0.1-r1.ebuild:
diff --git a/gnome-extra/gnome-media/files/gnome-media-2.26.0-automagic-canberra.patch b/gnome-extra/gnome-media/files/gnome-media-2.26.0-automagic-canberra.patch
new file mode 100644
index 000000000000..891f1223ebd8
--- /dev/null
+++ b/gnome-extra/gnome-media/files/gnome-media-2.26.0-automagic-canberra.patch
@@ -0,0 +1,145 @@
+diff --git a/configure.ac b/configure.ac
+index 229ab88..c2c5031 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -63,7 +63,7 @@ GLIB_REQUIRED_VERSION=2.18.2
+ GTK_REQUIRED_VERSION=2.10.0
+ LIBGLADE_REQUIRED_VERSION=1.99.2
+ GCONF_REQUIRED_VERSION=2.6.1
+-PA_REQUIRED_VERSION=0.9.12 # FIXME remove extra checks below when we have PA 0.9.15
++PA_REQUIRED_VERSION=0.9.12
+ CANBERRA_REQUIRED_VERSION=0.4
+ 
+ PKG_CHECK_MODULES(MEDIA, [
+@@ -86,23 +86,32 @@ dnl=======================================================================
+ dnl Check for libcanberra
+ dnl=======================================================================
+ 
+-PKG_CHECK_MODULES(SOUND_THEME,
+-        gobject-2.0 >= $GLIB_REQUIRED_VERSION
+-        gtk+-2.0 >= $GTK_REQUIRED_VERSION
+-        gio-2.0
+-        gconf-2.0 >= $GCONF_REQUIRED_VERSION
+-        libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION
+-        libxml-2.0,
+-        have_soundtheme=yes,
+-        have_soundtheme=no)
+-
+-if test "x$have_soundtheme" = "xyes" ; then
+-  AC_DEFINE(HAVE_SOUND_THEME, [], [Define if we can build sound theme])
++AC_ARG_ENABLE([canberra],
++	AC_HELP_STRING([--disable-canberra], [Disable canberra support @<:@default=yes@:>@]),
++	[enable_canberra="$enableval"], [enable_canberra="yes"])
++
++have_soundtheme="no"
++if test "x$enable_canberra" = "xyes"; then
++
++   	PKG_CHECK_MODULES(SOUND_THEME,
++		gobject-2.0 >= $GLIB_REQUIRED_VERSION
++        	gtk+-2.0 >= $GTK_REQUIRED_VERSION
++        	gio-2.0
++        	gconf-2.0 >= $GCONF_REQUIRED_VERSION
++        	libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION
++        	libxml-2.0,
++        	have_soundtheme=yes,
++        	have_soundtheme=no)
++
++	if test "x$have_soundtheme" = "xyes" ; then
++  	   AC_DEFINE(HAVE_SOUND_THEME, [], [Define if we can build sound theme])
++	fi
++
++	AC_SUBST(HAVE_SOUND_THEME)
++	AC_SUBST(SOUNDTHEME_CFLAGS)
++	AC_SUBST(SOUNDTHEME_LIBS)
+ fi
+ AM_CONDITIONAL(HAVE_SOUND_THEME, test x$have_soundtheme = xyes)
+-AC_SUBST(HAVE_SOUND_THEME)
+-AC_SUBST(SOUNDTHEME_CFLAGS)
+-AC_SUBST(SOUNDTHEME_LIBS)
+ 
+ dnl=======================================================================
+ dnl Check for the new volume control modules
+@@ -761,6 +770,7 @@ echo "
+         GStreamer properties:   $have_gstprops
+         GStreamer profiles:     $have_profiles
+         Sound recorder:         $have_grecord$grecord_reason
++	Sound Theme		$have_soundtheme
+ 
+   *Deprecated*:
+ 
+diff --git a/gnome-volume-control/src/Makefile.am b/gnome-volume-control/src/Makefile.am
+index f55e714..40c3936 100644
+--- a/gnome-volume-control/src/Makefile.am
++++ b/gnome-volume-control/src/Makefile.am
+@@ -7,7 +7,6 @@ bin_PROGRAMS = 					\
+ 
+ AM_CPPFLAGS =					\
+ 	$(WARN_CFLAGS)				\
+-	-I$(top_srcdir)/sound-theme		\
+ 	$(VOLUME_CONTROL_CFLAGS)		\
+ 	$(PULSEAUDIO_CFLAGS)			\
+ 	-DLOCALE_DIR=\""$(datadir)/locale"\"	\
+@@ -16,6 +15,10 @@ AM_CPPFLAGS =					\
+ 	-DICON_DATA_DIR="\"$(pkgdatadir)/icons\"" \
+ 	$(NULL)
+ 
++if HAVE_SOUND_THEME
++AM_CPPFLAGS += -I$(top_srcdir)/sound-theme
++endif
++
+ gnome_volume_control_applet_LDADD =		\
+ 	$(VOLUME_CONTROL_LIBS)			\
+ 	$(PULSEAUDIO_LIBS)			\
+@@ -52,9 +55,13 @@ gnome_volume_control_applet_SOURCES =		\
+ gnome_volume_control_LDADD =				\
+ 	$(VOLUME_CONTROL_LIBS)				\
+ 	$(PULSEAUDIO_LIBS)				\
+-	$(top_builddir)/sound-theme/libsoundtheme.la	\
+ 	$(NULL)
+ 
++if HAVE_SOUND_THEME
++gnome_volume_control_LDADD +=		\
++	$(top_builddir)/sound-theme/libsoundtheme.la
++endif
++
+ gnome_volume_control_SOURCES =			\
+ 	gvc-mixer-stream.h			\
+ 	gvc-mixer-stream.c			\
+diff --git a/gnome-volume-control/src/gvc-mixer-dialog.c b/gnome-volume-control/src/gvc-mixer-dialog.c
+index 573a6c1..95906d2 100644
+--- a/gnome-volume-control/src/gvc-mixer-dialog.c
++++ b/gnome-volume-control/src/gvc-mixer-dialog.c
+@@ -37,7 +37,9 @@
+ #include "gvc-mixer-source.h"
+ #include "gvc-mixer-source-output.h"
+ #include "gvc-mixer-dialog.h"
++#ifdef HAVE_SOUND_THEME
+ #include "gvc-sound-theme-chooser.h"
++#endif /* HAVE_SOUND_THEME */
+ #include "gvc-level-bar.h"
+ 
+ #define SCALE_SIZE 128
+@@ -63,7 +65,9 @@ struct GvcMixerDialogPrivate
+         GtkWidget       *output_settings_box;
+         GtkWidget       *output_balance_bar;
+         GtkWidget       *input_treeview;
++#ifdef HAVE_SOUND_THEME
+         GtkWidget       *sound_theme_chooser;
++#endif
+         GtkWidget       *click_feedback_button;
+         GtkWidget       *audible_bell_button;
+         GtkSizeGroup    *size_group;
+@@ -1049,11 +1053,12 @@ gvc_mixer_dialog_constructor (GType                  type,
+         gtk_box_pack_start (GTK_BOX (self->priv->sound_effects_box),
+                             self->priv->effects_bar, FALSE, FALSE, 12);
+ 
++#ifdef HAVE_SOUND_THEME
+         self->priv->sound_theme_chooser = gvc_sound_theme_chooser_new ();
+         gtk_box_pack_start (GTK_BOX (self->priv->sound_effects_box),
+                             self->priv->sound_theme_chooser,
+                             TRUE, TRUE, 6);
+-
++#endif
+         /* Input page */
+         self->priv->input_box = gtk_vbox_new (FALSE, 12);
+         gtk_container_set_border_width (GTK_CONTAINER (self->priv->input_box), 12);
diff --git a/gnome-extra/gnome-media/files/gnome-media-2.26.0-missing-cddbslave-cflags.patch b/gnome-extra/gnome-media/files/gnome-media-2.26.0-missing-cddbslave-cflags.patch
new file mode 100644
index 000000000000..99067a0ea98f
--- /dev/null
+++ b/gnome-extra/gnome-media/files/gnome-media-2.26.0-missing-cddbslave-cflags.patch
@@ -0,0 +1,22 @@
+--- ../gnome-media-2.26.0_orig/gnome-cd/access/Makefile.am	2008-09-07 20:54:07.000000000 +0200
++++ gnome-cd/access/Makefile.am	2009-03-23 15:19:45.952339992 +0100
+@@ -3,7 +3,8 @@
+ 	$(MEDIA_CFLAGS)	\
+ 	-I$(top_srcdir)/cddb-slave2	\
+ 	$(GAILUTIL_CFLAGS) \
+-	$(LIBXML2_CFLAGS)
++	$(LIBXML2_CFLAGS)		\
++	$(CDDBSLAVE_CFLAGS)
+ 
+ noinst_LTLIBRARIES = libgnomecdaccess.la
+ 
+--- ../gnome-media-2.26.0_orig/gnome-cd/Makefile.am	2008-09-07 20:54:07.000000000 +0200
++++ gnome-cd/Makefile.am	2009-03-23 15:20:23.923000140 +0100
+@@ -15,6 +15,7 @@
+ 	$(GNOMECD_CFLAGS)			\
+ 	$(GAILUTIL_CFLAGS)			\
+ 	$(GST_CFLAGS)				\
++	$(CDDBSLAVE_CFLAGS)			\
+ 	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
+ 	-DDATADIR=\""$(datadir)"\"		\
+ 	-DGNOME_ICONDIR=\""$(datadir)/pixmaps"\"	\
diff --git a/gnome-extra/gnome-media/gnome-media-2.26.0.ebuild b/gnome-extra/gnome-media/gnome-media-2.26.0.ebuild
new file mode 100644
index 000000000000..d84412733b08
--- /dev/null
+++ b/gnome-extra/gnome-media/gnome-media-2.26.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-2.26.0.ebuild,v 1.1 2009/05/10 20:58:09 ford_prefect Exp $
+
+EAPI="2"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Multimedia related programs for the GNOME desktop"
+HOMEPAGE="http://ronald.bitfreak.net/gnome-media.php"
+
+LICENSE="LGPL-2 GPL-2 FDL-1.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~sparc ~x86 ~x86-fbsd"
+IUSE="canberra esd gnomecd ipv6 pulseaudio"
+
+RDEPEND=">=dev-libs/glib-2.18.2:2
+	>=x11-libs/gtk+-2.15.1:2
+	>=gnome-base/libglade-2
+	>=gnome-base/gconf-2.6.1
+	>=gnome-base/libgnomeui-2.13.2
+	esd? ( >=media-sound/esound-0.2.23 )
+	>=media-libs/gstreamer-0.10.3
+	>=media-libs/gst-plugins-base-0.10.3
+	>=media-libs/gst-plugins-good-0.10
+	>=gnome-base/orbit-2
+	canberra? ( >=media-libs/libcanberra-0.4[gtk] )
+	>=dev-libs/libunique-1
+	gnomecd? (
+		>=gnome-extra/nautilus-cd-burner-2.12
+		>=gnome-base/gail-0.0.3
+		>=gnome-base/libbonobo-2
+		|| (
+			>=media-plugins/gst-plugins-cdio-0.10
+			>=media-plugins/gst-plugins-cdparanoia-0.10 ) )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
+	dev-libs/libxml2
+	>=media-plugins/gst-plugins-meta-0.10-r2:0.10
+	>=media-plugins/gst-plugins-gconf-0.10.1"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	>=app-text/scrollkeeper-0.3.11
+	>=app-text/gnome-doc-utils-0.3.2
+	>=dev-util/intltool-0.35.0"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--enable-gstprops
+		--disable-esdtest
+		--disable-static
+		--disable-scrollkeeper
+		--disable-schemas-install
+		$(use_enable esd esound)
+		$(use_enable esd vumeter)
+		$(use_enable gnomecd cddbslave)
+		$(use_enable gnomecd)
+		$(use_enable ipv6)
+		$(use_enable pulseaudio)
+		$(use_enable !pulseaudio gstmix)
+		$(use_enable canberra)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	if use gnomecd; then
+		epatch "${FILESDIR}/${P}-missing-cddbslave-cflags.patch"
+	fi
+	# Fix automagic canberra support
+	epatch "${FILESDIR}/${P}-automagic-canberra.patch"
+	eautoreconf
+}
+
+src_compile() {
+	addpredict "$(unset HOME; echo ~)/.gconf"
+	addpredict "$(unset HOME; echo ~)/.gconfd"
+	gnome2_src_compile
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	ewarn
+	ewarn "If you cannot play some music format, please check your"
+	ewarn "USE flags on media-plugins/gst-plugins-meta"
+	ewarn
+	if use pulseaudio; then
+		ewarn "You have enabled pulseaudio support, gstmixer will not be built"
+		ewarn "If you do not use pulseaudio, you do not want this"
+	fi
+}
diff --git a/gnome-extra/gnome-media/metadata.xml b/gnome-extra/gnome-media/metadata.xml
index 6278248d6b7b..e3104eb95a7d 100644
--- a/gnome-extra/gnome-media/metadata.xml
+++ b/gnome-extra/gnome-media/metadata.xml
@@ -3,6 +3,8 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <use>
-	<flag name='gnomecd'>Builds the GNOME CD Player</flag>
+	<flag name="gnomecd">Builds the GNOME CD Player</flag>
+	<flag name="canberra">Adds support for sound notification themes using
+		<pkg>media-libs/libcanberra</pkg></flag>
 </use>
 </pkgmetadata>