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

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

5 files changed, 41 insertions, 20 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/Manifest b/media-sound/moodbar/Manifest
index 3af177c59d6d..d1fbdf642c43 100644
--- a/media-sound/moodbar/Manifest
+++ b/media-sound/moodbar/Manifest
@@ -1,4 +1,5 @@
+AUX moodbar-0.1.2-gthread_init.patch 597 RMD160 f87438d5081c735f8083be01fbaf0a662dcc3a6b SHA1 536a55ae6139d8595f3dfe68b916e8a5a05ef0f9 SHA256 b5f73f4cf26e97d33ce38fa4457c5021d6463d4bcfaed0826f9ac09b85c042a6
 DIST moodbar-0.1.2.tar.gz 327715 RMD160 240d9ad764bbcd95e886fd1de3169d3a0395a674 SHA1 cd7bd8243aa432100694c5d09ab67b78bbfe1d74 SHA256 3d53627c3d979636e98bbe1e745ed79e98f1238148ba4f8379819f9083b3d9c4
-EBUILD moodbar-0.1.2.ebuild 900 RMD160 d678e9bf5552abf0105bd348e8e6a343023a44cd SHA1 f7c11ff2fc3503228ed5f03eaf60eaefff9ffb36 SHA256 dc42c39202c19c35c15b51e14b47e2a9921fdcf27f68a82088a6b7313e477805
-MISC ChangeLog 1157 RMD160 f26ee9a5a66f825f485c29cf9180c1e77acdca66 SHA1 8106e3dab6a7dd7c98d8720c30a7fda6154df747 SHA256 f025ad418c1f94451598fcb3bc9da2c0225301d600c83e31da1c4cb979be9f52
-MISC metadata.xml 215 RMD160 3c90f64bec54294d08fbffbc172ebc321c5245f1 SHA1 faf99b79c2a047877c7a548a12d9dba3a45b51de SHA256 258b7218817d5b106d0de87dff165d12f747ce78b9333ca5ab0b07129823849c
+EBUILD moodbar-0.1.2.ebuild 814 RMD160 7bd1b02a246ceb2ef83263a403b9adcd9148d60d SHA1 90fc21bbc39d5318c971a829bdc250cf38c41bcc SHA256 b867b3c8185445d50330348811680c9d2253051f74501fbd37eb78622c1609b3
+MISC ChangeLog 1354 RMD160 4968fdbeccdc65d3e411935b94163547d359c7d2 SHA1 8bda1677ce1bd58d1de4d1d76813f413c102377c SHA256 12d716a998fa0b2fd6aae5dab82b15a6342fe975d4499f821c58a2eff5587572
+MISC metadata.xml 222 RMD160 f0a6a0715079fad899db166101e67b8af3b4c8ca SHA1 7ff6063ad57d5353aaaf47edff0bc8fcbb157cf6 SHA256 8eeab2d78cdef453f5e2df263006293737114101c3e2f8bef7ec7c142aeab91d
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"
 }