Fix compability with new glib wrt #263197, thanks to Wolfgang Draxinger

(Portage version: 2.1.6.13/cvs/Linux x86_64)

4 files changed, 37 insertions, 17 deletions

diff --git a/media-sound/moodbar/ChangeLog b/media-sound/moodbar/ChangeLog
index 0fe312f8dd03..9df4d912b3d2 100644
--- a/media-sound/moodbar/ChangeLog
+++ b/media-sound/moodbar/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/moodbar
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/moodbar/ChangeLog,v 1.9 2008/04/22 19:55:40 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moodbar/ChangeLog,v 1.10 2009/05/09 11:20:10 ssuominen Exp $
+
+  09 May 2009; Samuli Suominen <ssuominen@gentoo.org> moodbar-0.1.2.ebuild,
+  +files/moodbar-0.1.2-gthread_init.patch:
+  Fix compability with new glib wrt #263197, thanks to Wolfgang Draxinger
 
   22 Apr 2008; Raúl Porcel <armin76@gentoo.org> moodbar-0.1.2.ebuild:
   Add ~sparc
diff --git a/media-sound/moodbar/files/moodbar-0.1.2-gthread_init.patch b/media-sound/moodbar/files/moodbar-0.1.2-gthread_init.patch
new file mode 100644
index 000000000000..028be99dc502
--- /dev/null
+++ b/media-sound/moodbar/files/moodbar-0.1.2-gthread_init.patch
@@ -0,0 +1,13 @@
+diff -ur moodbar-0.1.2.orig/analyzer/main.c moodbar-0.1.2/analyzer/main.c
+--- moodbar-0.1.2.orig/analyzer/main.c	2006-10-12 08:43:30.000000000 +0300
++++ moodbar-0.1.2/analyzer/main.c	2009-05-09 14:14:08.000000000 +0300
+@@ -262,6 +262,9 @@
+   GOptionContext *ctx;
+   GError *err = NULL;
+ 
++  // must be called before any other glib function is called
++  if (!g_thread_supported ()) g_thread_init(NULL);
++
+   ctx = g_option_context_new ("[INFILE] - Run moodbar analyzer");
+   g_option_context_add_group (ctx, gst_init_get_option_group ());
+   g_option_context_add_main_entries (ctx, entries, NULL);
diff --git a/media-sound/moodbar/metadata.xml b/media-sound/moodbar/metadata.xml
index 59d804220ea8..aacc7241e2e5 100644
--- a/media-sound/moodbar/metadata.xml
+++ b/media-sound/moodbar/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
-<maintainer><email>hanno@gentoo.org</email></maintainer>
+	<herd>sound</herd>
+	<maintainer>
+		<email>hanno@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-sound/moodbar/moodbar-0.1.2.ebuild b/media-sound/moodbar/moodbar-0.1.2.ebuild
index a88e74f6530d..8b7f9db67869 100644
--- a/media-sound/moodbar/moodbar-0.1.2.ebuild
+++ b/media-sound/moodbar/moodbar-0.1.2.ebuild
@@ -1,29 +1,30 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/moodbar/moodbar-0.1.2.ebuild,v 1.7 2008/04/22 19:55:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moodbar/moodbar-0.1.2.ebuild,v 1.8 2009/05/09 11:20:10 ssuominen Exp $
+
+EAPI=2
+inherit eutils
 
 DESCRIPTION="The moodbar tool and gstreamer plugin for Amarok"
 HOMEPAGE="http://amarok.kde.org/wiki/Moodbar"
 SRC_URI="http://pwsp.net/~qbob/moodbar-${PV}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="mp3 ogg vorbis flac"
 
-DEPEND=">=media-libs/gst-plugins-base-0.10
+RDEPEND="media-libs/gst-plugins-base:0.10
+	media-libs/gst-plugins-good:0.10
+	media-plugins/gst-plugins-meta:0.10
+	sci-libs/fftw:3.0"
+DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
-RDEPEND=">=sci-libs/fftw-3.0
-	>=media-libs/gst-plugins-good-0.10
-	mp3? ( >=media-plugins/gst-plugins-mad-0.10 )
-	ogg? ( >=media-plugins/gst-plugins-ogg-0.10 )
-	vorbis? ( >=media-plugins/gst-plugins-vorbis-0.10 )
-	flac? ( >=media-plugins/gst-plugins-flac-0.10 )"
 
-src_compile() {
-	econf || die
-	emake || die
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gthread_init.patch
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die "emake install failed"
 }