Version bump with libxspf patch wrt #261928, thanks to Sebastian Pipping.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 204 insertions, 2 deletions

diff --git a/media-sound/herrie/ChangeLog b/media-sound/herrie/ChangeLog
index 3d8b8b8f40ac..7d9ab2552a6e 100644
--- a/media-sound/herrie/ChangeLog
+++ b/media-sound/herrie/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/herrie
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/ChangeLog,v 1.31 2008/10/14 16:13:17 flameeyes Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/ChangeLog,v 1.32 2009/05/10 20:18:27 ssuominen Exp $
+
+*herrie-2.2 (10 May 2009)
+
+  10 May 2009; Samuli Suominen <ssuominen@gentoo.org> +herrie-2.2.ebuild,
+  +files/herrie-2.2-libxspf.patch:
+  Version bump with libxspf patch wrt #261928, thanks to Sebastian Pipping.
 
   14 Oct 2008; Diego Pettenò <flameeyes@gentoo.org> herrie-2.1.ebuild:
   Fix build dependencies.
diff --git a/media-sound/herrie/files/herrie-2.2-libxspf.patch b/media-sound/herrie/files/herrie-2.2-libxspf.patch
new file mode 100644
index 000000000000..00dc3057b205
--- /dev/null
+++ b/media-sound/herrie/files/herrie-2.2-libxspf.patch
@@ -0,0 +1,122 @@
+--- configure
++++ configure
+@@ -301,7 +301,7 @@ fi
+ if [ "$CFG_XSPF" != "" ]
+ then
+ 	CFLAGS="$CFLAGS -DBUILD_XSPF"
+-	LDFLAGS="$LDFLAGS -lspiff"
++	test_pkgconfig "libxspf" "xspf" "_vfs_xspf"
+ 	SRCS="$SRCS util vfs_xspf"
+ 	PLAYQ_DUMPFILE="autosave.xspf"
+ else
+--- src/conftest.c
++++ src/conftest.c
+@@ -56,16 +56,10 @@
+ #include <vorbis/codec.h>
+ #include <vorbis/vorbisfile.h>
+ #endif /* BUILD_VORBIS */
+-#ifdef BUILD_XSPF
+-#include <spiff/spiff_c.h>
+-#endif /* BUILD_XSPF */
+ 
+ int
+ main(int argc, char *argv[])
+ {
+-#ifdef BUILD_XSPF
+-	spiff_write(NULL, NULL, NULL);
+-#endif /* BUILD_XSPF */
+ 
+ 	return (0);
+ }
+--- src/vfs_xspf.c
++++ src/vfs_xspf.c
+@@ -30,7 +30,7 @@
+ 
+ #include "stdinc.h"
+ 
+-#include <spiff/spiff_c.h>
++#include <xspf_c.h>
+ 
+ #include "util.h"
+ #include "vfs.h"
+@@ -50,22 +50,22 @@ vfs_xspf_match(struct vfsent *ve, int isdir)
+ int
+ vfs_xspf_populate(struct vfsent *ve)
+ {
+-	struct spiff_list *slist;
+-	struct spiff_track *strack;
+-	struct spiff_mvalue *sloc;
++	struct xspf_list *slist;
++	struct xspf_track *strack;
++	struct xspf_mvalue *sloc;
+ 	char *dirname, *baseuri, *filename;
+ 	struct vfsref *vr;
+ 
+ 	baseuri = url_escape(ve->filename);
+-	slist = spiff_parse(ve->filename, baseuri);
++	slist = xspf_parse(ve->filename, baseuri);
+ 	g_free(baseuri);
+ 	if (slist == NULL)
+ 		return (-1);
+ 
+ 	dirname = g_path_get_dirname(ve->filename);
+ 
+-	SPIFF_LIST_FOREACH_TRACK(slist, strack) {
+-		SPIFF_TRACK_FOREACH_LOCATION(strack, sloc) {
++	XSPF_LIST_FOREACH_TRACK(slist, strack) {
++		XSPF_TRACK_FOREACH_LOCATION(strack, sloc) {
+ 			/* Skip file:// part */
+ 			filename = url_unescape(sloc->value);
+ 
+@@ -77,40 +77,40 @@ vfs_xspf_populate(struct vfsent *ve)
+ 	}
+ 	
+ 	g_free(dirname);
+-	spiff_free(slist);
++	xspf_free(slist);
+ 	return (0);
+ }
+ 
+ int
+ vfs_xspf_write(const struct vfslist *vl, const char *filename)
+ {
+-	struct spiff_list *list;
+-	struct spiff_track *track;
+-	struct spiff_mvalue *location;
++	struct xspf_list *list;
++	struct xspf_track *track;
++	struct xspf_mvalue *location;
+ 	char *fn, *baseuri;
+ 	struct vfsref *vr;
+ 	int ret;
+ 
+-	list = spiff_new();
++	list = xspf_new();
+ 
+ 	VFS_LIST_FOREACH_REVERSE(vl, vr) {
+ 		/* Add a new track to the beginning of the list */
+-		track = spiff_new_track_before(&list->tracks);
++		track = xspf_new_track_before(&list->tracks);
+ 
+ 		/* Make sure we don't write non-UTF-8 titles to disk */
+ 		if (g_utf8_validate(vfs_name(vr), -1, NULL))
+-			spiff_setvalue(&track->title, vfs_name(vr));
++			xspf_setvalue(&track->title, vfs_name(vr));
+ 
+-		location = spiff_new_mvalue_before(&track->locations);
++		location = xspf_new_mvalue_before(&track->locations);
+ 		fn = url_escape(vfs_filename(vr));
+-		spiff_setvalue(&location->value, fn);
++		xspf_setvalue(&location->value, fn);
+ 		g_free(fn);
+ 	}
+ 
+ 	baseuri = url_escape(filename);
+-	ret = spiff_write(list, filename, baseuri);
++	ret = xspf_write(list, filename, baseuri);
+ 	g_free(baseuri);
+-	spiff_free(list);
++	xspf_free(list);
+ 
+ 	return (ret);
+ }
diff --git a/media-sound/herrie/herrie-2.2.ebuild b/media-sound/herrie/herrie-2.2.ebuild
new file mode 100644
index 000000000000..d3a19b5234dc
--- /dev/null
+++ b/media-sound/herrie/herrie-2.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/herrie-2.2.ebuild,v 1.1 2009/05/10 20:18:27 ssuominen Exp $
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Herrie is a command line music player."
+HOMEPAGE="http://herrie.info/"
+SRC_URI="http://herrie.info/distfiles/${P}.tar.bz2"
+
+LICENSE="BSD-2 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="ao alsa pulseaudio oss http modplug mp3 sndfile vorbis xspf unicode nls"
+
+# Supported languages
+APP_LINGUAS="ca da de es fi ga nl pl pt_BR ru sv tr vi zh_CN"
+for X in ${APP_LINGUAS}; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+RDEPEND="sys-libs/ncurses
+	unicode? ( sys-libs/ncurses[unicode] )
+	>=dev-libs/glib-2:2
+	ao? ( media-libs/libao )
+	alsa? ( media-libs/alsa-lib )
+	http? ( net-misc/curl )
+	modplug? ( media-libs/libmodplug )
+	mp3? ( media-libs/libmad
+		media-libs/libid3tag )
+	pulseaudio? ( media-sound/pulseaudio )
+	sndfile? ( media-libs/libsndfile )
+	vorbis? ( media-libs/libvorbis )
+	xspf? ( >=media-libs/libxspf-1.2 )
+	!ao? ( !alsa? ( !pulseaudio? ( !oss? ( media-libs/alsa-lib ) ) ) )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.8-chost.patch \
+		"${FILESDIR}"/${P}-libxspf.patch
+}
+
+src_configure() {
+	if ! use ao && ! use alsa && ! use pulseaudio && ! use oss; then
+		ewarn "No audio output selected (ao, alsa, pulseaudio, oss), defaulting to alsa."
+	fi
+
+	# We could add coreaudio here if on osx
+	local EXTRA_CONF="verbose no_strip"
+	use ao && EXTRA_CONF="${EXTRA_CONF} ao"
+	use alsa && EXTRA_CONF="${EXTRA_CONF} alsa"
+	use http || EXTRA_CONF="${EXTRA_CONF} no_http no_scrobbler"
+	use mp3 || EXTRA_CONF="${EXTRA_CONF} no_mp3"
+	use modplug || EXTRA_CONF="${EXTRA_CONF} no_modplug"
+	use nls || EXTRA_CONF="${EXTRA_CONF} no_nls"
+	use oss && EXTRA_CONF="${EXTRA_CONF} oss"
+	use pulseaudio && EXTRA_CONF="${EXTRA_CONF} pulse"
+	use sndfile || EXTRA_CONF="${EXTRA_CONF} no_sndfile"
+	use unicode || EXTRA_CONF="${EXTRA_CONF} ncurses"
+	use vorbis || EXTRA_CONF="${EXTRA_CONF} no_vorbis"
+	use xspf || EXTRA_CONF="${EXTRA_CONF} no_xspf"
+
+	einfo "./configure ${EXTRA_CONF}"
+	CC="$(tc-getCC)" PREFIX=/usr MANDIR=/usr/share/man \
+		./configure ${EXTRA_CONF} || die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc ChangeLog README
+}