diff options
3 files changed, 102 insertions, 1 deletions
diff --git a/media-sound/sound-juicer/ChangeLog b/media-sound/sound-juicer/ChangeLog index 0d4a6fcc5f5a..696da49f1530 100644 --- a/media-sound/sound-juicer/ChangeLog +++ b/media-sound/sound-juicer/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-sound/sound-juicer # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/ChangeLog,v 1.193 2010/09/11 18:53:18 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/ChangeLog,v 1.194 2010/09/26 22:09:40 nirbheek Exp $ + +*sound-juicer-2.28.2-r2 (26 Sep 2010) + + 26 Sep 2010; <nirbheek@gentoo.org> +sound-juicer-2.28.2-r2.ebuild, + +files/sound-juicer-2.28.2-fix-pause-conflict.patch: + Fix build failure due to namespace collision of pause() with unistd.h 11 Sep 2010; Joseph Jezak <josejx@gentoo.org> sound-juicer-2.28.2-r1.ebuild: diff --git a/media-sound/sound-juicer/files/sound-juicer-2.28.2-fix-pause-conflict.patch b/media-sound/sound-juicer/files/sound-juicer-2.28.2-fix-pause-conflict.patch new file mode 100644 index 000000000000..56438871eb30 --- /dev/null +++ b/media-sound/sound-juicer/files/sound-juicer-2.28.2-fix-pause-conflict.patch @@ -0,0 +1,20 @@ +--- src/sj-play.c ++++ src/sj-play.c +@@ -96,7 +96,7 @@ + * Pause + */ + static void +-pause (void) ++do_pause (void) + { + gst_element_set_state (pipeline, GST_STATE_PAUSED); + } +@@ -440,7 +440,7 @@ + GError *err = NULL; + + if (is_playing ()) { +- pause (); ++ do_pause (); + gtk_list_store_set (track_store, ¤t_iter, + COLUMN_STATE, STATE_PAUSED, -1); + } else if (pipeline && GST_STATE (pipeline) == GST_STATE_PAUSED && diff --git a/media-sound/sound-juicer/sound-juicer-2.28.2-r2.ebuild b/media-sound/sound-juicer/sound-juicer-2.28.2-r2.ebuild new file mode 100644 index 000000000000..57be97ba5805 --- /dev/null +++ b/media-sound/sound-juicer/sound-juicer-2.28.2-r2.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/sound-juicer-2.28.2-r2.ebuild,v 1.1 2010/09/26 22:09:40 nirbheek Exp $ + +EAPI="2" + +inherit eutils gnome2 + +DESCRIPTION="CD ripper for GNOME 2" +HOMEPAGE="http://www.burtonini.com/blog/computers/sound-juicer/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="test" + +# FIXME: possibly automagic dual slot dep on musicbrainz, bug #275798 +COMMON_DEPEND=">=dev-libs/glib-2.18 + >=x11-libs/gtk+-2.14 + + >=gnome-base/libglade-2 + >=gnome-base/gconf-2 + media-libs/libcanberra[gtk] + dev-libs/dbus-glib + + >=media-libs/musicbrainz-2.1.3:1 + >=media-libs/musicbrainz-3.0.2:3 + >=dev-libs/libcdio-0.70[-minimal] + >=gnome-extra/gnome-media-2.11.91 + >=app-cdr/brasero-0.9.1 + + >=media-libs/gstreamer-0.10.15:0.10 + >=media-libs/gst-plugins-base-0.10:0.10" + +RDEPEND="${COMMON_DEPEND} + >=media-plugins/gst-plugins-gconf-0.10:0.10 + >=media-plugins/gst-plugins-gio-0.10:0.10 + || ( + >=media-plugins/gst-plugins-cdparanoia-0.10:0.10 + >=media-plugins/gst-plugins-cdio-0.10:0.10 ) + >=media-plugins/gst-plugins-meta-0.10-r2:0.10" + +DEPEND="${COMMON_DEPEND} + >=dev-util/pkgconfig-0.9 + >=dev-util/intltool-0.40 + >=app-text/scrollkeeper-0.3.5 + app-text/gnome-doc-utils + test? ( ~app-text/docbook-xml-dtd-4.3 )" + +DOCS="AUTHORS ChangeLog NEWS README TODO" + +pkg_setup() { + G2CONF="${G2CONF} --disable-scrollkeeper" + + # needed to get around some sandboxing checks + export GST_INSPECT=/bin/true +} + +src_prepare() { + gnome2_src_prepare + + # Fix namespace collision with pause() from unistd.h + epatch "${FILESDIR}/${P}-fix-pause-conflict.patch" + + # Fix intltoolize broken file, see upstream #577133 + sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \ + || die "sed failed" +} + +pkg_postinst() { + gnome2_pkg_postinst + echo + ewarn "If ${PN} does not rip to some music format, please check your" + ewarn "USE flags on media-plugins/gst-plugins-meta" +} |