[gentoo-commits] gentoo-x86 commit in media-libs/FusionSound: metadata.xml ChangeLog FusionSound-1.1.1.ebuild

[Samuli Suominen (ssuominen)]

ssuominen    09/06/05 21:27:06

  Modified:             metadata.xml ChangeLog FusionSound-1.1.1.ebuild
  Log:
  Fix automagic deps like alsa, cddb, ffmpeg, mad, timidity and vorbis. Fix ffmpeg compability wrt #238718, thanks to Victor Ostorga. Fix building with GCC 4.3 wrt #238718, thanks to Tupone Alfredo.
  (Portage version: 2.1.6.13/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  media-libs/FusionSound/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/FusionSound/metadata.xml?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/FusionSound/metadata.xml?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/FusionSound/metadata.xml?r1=1.1&r2=1.2

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/FusionSound/metadata.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- metadata.xml	24 Aug 2007 15:36:05 -0000	1.1
+++ metadata.xml	5 Jun 2009 21:27:06 -0000	1.2
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
-<maintainer>
-<email>hd_brummy@g.o</email>
-<name>Joerg Bornkessel</name>
-</maintainer>
+	<herd>sound</herd>
+	<maintainer>
+		<email>hd_brummy@g.o</email>
+		<name>Joerg Bornkessel</name>
+	</maintainer>
 </pkgmetadata>
-



1.4                  media-libs/FusionSound/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/FusionSound/ChangeLog?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/FusionSound/ChangeLog?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/FusionSound/ChangeLog?r1=1.3&r2=1.4

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/FusionSound/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ChangeLog	15 Apr 2008 14:51:43 -0000	1.3
+++ ChangeLog	5 Jun 2009 21:27:06 -0000	1.4
@@ -1,20 +1,23 @@
 # ChangeLog for media-libs/FusionSound
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/FusionSound/ChangeLog,v 1.3 2008/04/15 14:51:43 drac Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/FusionSound/ChangeLog,v 1.4 2009/06/05 21:27:06 ssuominen Exp $
 
-  15 Apr 2008; Samuli Suominen <drac@g.o> -FusionSound-1.0.0.ebuild,
-  FusionSound-1.1.1.ebuild:
-  Remove old. QAbaddep fix for current.
+  05 Jun 2009; Samuli Suominen <ssuominen@g.o>
+  FusionSound-1.1.1.ebuild, +files/FusionSound-1.1.1-ffmpeg.patch,
+  +files/FusionSound-1.1.1-gcc43.patch:
+  Fix automagic deps like alsa, cddb, ffmpeg, mad, timidity and vorbis. Fix
+  ffmpeg compability wrt #238718, thanks to Victor Ostorga. Fix building
+  with GCC 4.3 wrt #238718, thanks to Tupone Alfredo.
 
 *FusionSound-1.1.1 (19 Mar 2008)
 
   19 Mar 2008; Joerg Bornkessel <hd_brummy@g.o>
   +FusionSound-1.1.1.ebuild:
-  version bump; bug 205833
+  Version bump wrt #205833.
 
 *FusionSound-1.0.0 (24 Aug 2007)
 
   24 Aug 2007; Joerg Bornkessel <hd_brummy@g.o> +metadata.xml,
   +FusionSound-1.0.0.ebuild:
-  initial ebuild
+  Initial ebuild.
 



1.3                  media-libs/FusionSound/FusionSound-1.1.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/FusionSound/FusionSound-1.1.1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/FusionSound/FusionSound-1.1.1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/FusionSound/FusionSound-1.1.1.ebuild?r1=1.2&r2=1.3

Index: FusionSound-1.1.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/FusionSound/FusionSound-1.1.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FusionSound-1.1.1.ebuild	15 Apr 2008 14:51:43 -0000	1.2
+++ FusionSound-1.1.1.ebuild	5 Jun 2009 21:27:06 -0000	1.3
@@ -1,6 +1,9 @@
-# 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-libs/FusionSound/FusionSound-1.1.1.ebuild,v 1.2 2008/04/15 14:51:43 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/FusionSound/FusionSound-1.1.1.ebuild,v 1.3 2009/06/05 21:27:06 ssuominen Exp $
+
+EAPI=2
+inherit autotools eutils
 
 DESCRIPTION="Audio sub system for multiple applications"
 HOMEPAGE="http://www.directfb.org/"
@@ -9,14 +12,53 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="vorbis mp3"
+IUSE="alsa cddb ffmpeg mad oss timidity vorbis"
 
 RDEPEND=">=dev-libs/DirectFB-${PV}
+	alsa? ( media-libs/alsa-lib )
+	timidity? ( media-libs/libtimidity
+		media-sound/timidity++ )
 	vorbis? ( media-libs/libvorbis )
-	mp3? ( media-libs/libmad )"
+	mad? ( media-libs/libmad )
+	cddb? ( media-libs/libcddb )
+	ffmpeg? ( >=media-video/ffmpeg-0.5 )"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	sys-apps/sed"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-ffmpeg.patch
+	sed -i -e 's:-O3 -ffast-math -pipe::' configure.in \
+		|| die "sed failed"
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+	local myaudio="wave"
+
+	use alsa && myaudio="${myaudio} alsa"
+	use oss && myaudio="${myaudio} oss"
+
+	# Lite is used only for tests or examples.
+	# Tremor isn't there with latest libvorbis.
+	econf \
+		--disable-dependency-tracking \
+		--without-lite \
+		--with-drivers="${myaudio}" \
+		--without-examples \
+		$(use_with timidity) \
+		--with-wave \
+		$(use_with vorbis) \
+		--without-tremor \
+		$(use_with mad) \
+		$(use_with cddb cdda) \
+		$(use_with ffmpeg) \
+		--with-playlist
+}
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	emake DESTDIR="${D}" htmldir=/usr/share/doc/${PF}/html \
+		install || die "emake install failed"
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }