From: Daniel Gryniewicz Date: Wed, 14 Feb 2007 15:46:41 +0000 (+0000) Subject: Fix daap plugin; bug #166778 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3346610bbfbf714d5b191e4ccdcfa11970aaca67;p=gentoo.git Fix daap plugin; bug #166778 Package-Manager: portage-2.1.2-r9 --- diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog index 1a2f05144664..d85d9f8ae8ee 100644 --- a/media-sound/rhythmbox/ChangeLog +++ b/media-sound/rhythmbox/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-sound/rhythmbox # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.87 2007/02/13 21:04:12 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.88 2007/02/14 15:46:41 dang Exp $ + +*rhythmbox-0.9.7-r3 (14 Feb 2007) + + 14 Feb 2007; Daniel Gryniewicz + +files/rhythmbox-0.9.7-daapsharing-fix.patch, +rhythmbox-0.9.7-r3.ebuild: + Fix daap plugin; bug #166778 *rhythmbox-0.9.7-r2 (13 Feb 2007) diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest index bb5fde30bd97..b8fcc988403b 100644 --- a/media-sound/rhythmbox/Manifest +++ b/media-sound/rhythmbox/Manifest @@ -29,6 +29,10 @@ AUX rhythmbox-0.9.7-daap_fix.patch 1185 RMD160 5529b848990e410ca090c778d05d45e8b MD5 8411cab9f1d3894aee9c56d8ed4c4eaf files/rhythmbox-0.9.7-daap_fix.patch 1185 RMD160 5529b848990e410ca090c778d05d45e8bbea1501 files/rhythmbox-0.9.7-daap_fix.patch 1185 SHA256 56c0af8afa900c267bc7eb2d17dbce216b080c837cefc7524d557b1eb2f3dd5c files/rhythmbox-0.9.7-daap_fix.patch 1185 +AUX rhythmbox-0.9.7-daapsharing-fix.patch 287 RMD160 5510eea31532ea732c3b00f9dc4680684f1fa034 SHA1 cad20f67d7f55c1ecacb781a68dec67f59bd0e41 SHA256 e486f6817787187a24908606afc3afc177f6a458f9c2f0dd5aef9d6e933f099f +MD5 187ce3a93f0632fe3fc554c141c4c43a files/rhythmbox-0.9.7-daapsharing-fix.patch 287 +RMD160 5510eea31532ea732c3b00f9dc4680684f1fa034 files/rhythmbox-0.9.7-daapsharing-fix.patch 287 +SHA256 e486f6817787187a24908606afc3afc177f6a458f9c2f0dd5aef9d6e933f099f files/rhythmbox-0.9.7-daapsharing-fix.patch 287 AUX rhythmbox-0.9.7-excessive-notification.patch 618 RMD160 b1d5f2550b672b2d64c131cbc7e4ff65062ace29 SHA1 213b269fd8aa55ac7fd837e619c959d90c0fb9ce SHA256 32cbaec58b7f82abaf34b7f2b21cab216523d005c16ed96607495159e59917e8 MD5 32b9b46d3c52cecf7fdb56c21e57cd78 files/rhythmbox-0.9.7-excessive-notification.patch 618 RMD160 b1d5f2550b672b2d64c131cbc7e4ff65062ace29 files/rhythmbox-0.9.7-excessive-notification.patch 618 @@ -62,14 +66,18 @@ EBUILD rhythmbox-0.9.7-r2.ebuild 3545 RMD160 491dbc18da3eb5097df3dafd755129b786f MD5 8c83f62d4484b85b654fe18a1808ce9d rhythmbox-0.9.7-r2.ebuild 3545 RMD160 491dbc18da3eb5097df3dafd755129b786f45250 rhythmbox-0.9.7-r2.ebuild 3545 SHA256 e8c944d09105ad1ee71d41ca5d7f5688334862afde7fe20dba545c4d2b56c55b rhythmbox-0.9.7-r2.ebuild 3545 +EBUILD rhythmbox-0.9.7-r3.ebuild 3686 RMD160 649719fa4ea8c9ffca02ea6225e16e834f1982d1 SHA1 9726175bd8d7963651278cbd447a7324117db8d6 SHA256 a86885816a3ae69b1601af79d4acfcdd4a2629c6b4ba57bf2a1d66ea83fcd0cd +MD5 c6f3d499ed7f542a6a32e774400e99ec rhythmbox-0.9.7-r3.ebuild 3686 +RMD160 649719fa4ea8c9ffca02ea6225e16e834f1982d1 rhythmbox-0.9.7-r3.ebuild 3686 +SHA256 a86885816a3ae69b1601af79d4acfcdd4a2629c6b4ba57bf2a1d66ea83fcd0cd rhythmbox-0.9.7-r3.ebuild 3686 EBUILD rhythmbox-0.9.7.ebuild 3340 RMD160 2ef4214092a10acdb6777a32a2954ec1e17d67ff SHA1 1f6df125128d2a8ce8188f93b927f7309616764b SHA256 35b23740ec6121c7e766b632ff6ae0a883a6e0d9144f3ee282580e18e4590ee4 MD5 9955e32da057f39a419d2c1d06b48839 rhythmbox-0.9.7.ebuild 3340 RMD160 2ef4214092a10acdb6777a32a2954ec1e17d67ff rhythmbox-0.9.7.ebuild 3340 SHA256 35b23740ec6121c7e766b632ff6ae0a883a6e0d9144f3ee282580e18e4590ee4 rhythmbox-0.9.7.ebuild 3340 -MISC ChangeLog 11898 RMD160 77b0c25dc490f02e924dc6df04a36224ab779edf SHA1 5f816b671abc6eafcd6d6bd76fa4d759d70e7e92 SHA256 e8e340228edffdafbd759397e870874dd504ac2e94c2964928bd52aff6f0ce8f -MD5 7e7217edb33eac84ba7f397f9083abc6 ChangeLog 11898 -RMD160 77b0c25dc490f02e924dc6df04a36224ab779edf ChangeLog 11898 -SHA256 e8e340228edffdafbd759397e870874dd504ac2e94c2964928bd52aff6f0ce8f ChangeLog 11898 +MISC ChangeLog 12092 RMD160 b30f9a214db77f22c23816b4d2da10b725ae57ac SHA1 95ee7f1893f3320097b407ed1170474d928f8340 SHA256 d81b6d58983f40bc1122b37c9ea86ac54b0cae2b8074b506b9d04f83054fb283 +MD5 eda761f2e4896caa2694c2c27cb88948 ChangeLog 12092 +RMD160 b30f9a214db77f22c23816b4d2da10b725ae57ac ChangeLog 12092 +SHA256 d81b6d58983f40bc1122b37c9ea86ac54b0cae2b8074b506b9d04f83054fb283 ChangeLog 12092 MISC metadata.xml 200 RMD160 bca17f66c909b846452eb76b2d2c9a2eec429db0 SHA1 9d3b582b967a1030b95428758f25fe33cb5a25fd SHA256 2e1eafdbf68047687a24f6a4ad8d519ec193805e347bf17d1d00f7771353e39b MD5 e854b7f54a4de6256186cbdcaabbc1ec metadata.xml 200 RMD160 bca17f66c909b846452eb76b2d2c9a2eec429db0 metadata.xml 200 @@ -95,10 +103,13 @@ SHA256 4bfa3d9f98c32f139761486bbe64393a6bd9cd64a65416cbd3141a1a493e7807 files/di MD5 a25f279ade6a38fa5491711846736bf0 files/digest-rhythmbox-0.9.7-r2 253 RMD160 7ad58e52c516b9a01adcc901ddc6b6795306f307 files/digest-rhythmbox-0.9.7-r2 253 SHA256 4bfa3d9f98c32f139761486bbe64393a6bd9cd64a65416cbd3141a1a493e7807 files/digest-rhythmbox-0.9.7-r2 253 +MD5 a25f279ade6a38fa5491711846736bf0 files/digest-rhythmbox-0.9.7-r3 253 +RMD160 7ad58e52c516b9a01adcc901ddc6b6795306f307 files/digest-rhythmbox-0.9.7-r3 253 +SHA256 4bfa3d9f98c32f139761486bbe64393a6bd9cd64a65416cbd3141a1a493e7807 files/digest-rhythmbox-0.9.7-r3 253 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFF0ifAomPajV0RnrERAgpFAJ9C5QekSmNm8Rz6bpmpmHQhW8fXwQCfQV5H -S3zstp+poUe1DBl8vH4laIQ= -=Nsin +iD8DBQFF0y7MomPajV0RnrERAul3AJ9jyoC6aWxdl3OY+C6uL3Qu10ZaxwCfU10H +JouWrUyzugiLWKQ0h3vxzAw= +=WCLO -----END PGP SIGNATURE----- diff --git a/media-sound/rhythmbox/files/digest-rhythmbox-0.9.7-r3 b/media-sound/rhythmbox/files/digest-rhythmbox-0.9.7-r3 new file mode 100644 index 000000000000..9b731a17d661 --- /dev/null +++ b/media-sound/rhythmbox/files/digest-rhythmbox-0.9.7-r3 @@ -0,0 +1,3 @@ +MD5 3ca989c655c5931ce056af7ff311885b rhythmbox-0.9.7.tar.bz2 3231718 +RMD160 547643b40b36e4e0c18b6d817c37426ce585119f rhythmbox-0.9.7.tar.bz2 3231718 +SHA256 2fac1912a15c19841d4ca3188df7aa8c7aaa37dbbffb279b24259cc1281ff995 rhythmbox-0.9.7.tar.bz2 3231718 diff --git a/media-sound/rhythmbox/files/rhythmbox-0.9.7-daapsharing-fix.patch b/media-sound/rhythmbox/files/rhythmbox-0.9.7-daapsharing-fix.patch new file mode 100644 index 000000000000..8751aa65744b --- /dev/null +++ b/media-sound/rhythmbox/files/rhythmbox-0.9.7-daapsharing-fix.patch @@ -0,0 +1,9 @@ +--- rhythmbox-0.9.7/daapsharing/Makefile.am.old 2007-01-07 19:28:04.000000000 +0100 ++++ rhythmbox-0.9.7/daapsharing/Makefile.am 2007-01-07 19:32:24.000000000 +0100 +@@ -63,3 +63,6 @@ + + libdaapsharing_la_LDFLAGS = -export-dynamic + ++libdaapsharing_la_LIBADD = \ ++ $(RHYTHMBOX_LIBS) ++ diff --git a/media-sound/rhythmbox/rhythmbox-0.9.7-r3.ebuild b/media-sound/rhythmbox/rhythmbox-0.9.7-r3.ebuild new file mode 100644 index 000000000000..3d87d4ecbe4a --- /dev/null +++ b/media-sound/rhythmbox/rhythmbox-0.9.7-r3.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.9.7-r3.ebuild,v 1.1 2007/02/14 15:46:41 dang Exp $ + +WANT_AUTOMAKE="1.9" +inherit gnome2 eutils autotools + +DESCRIPTION="Music management and playback software for GNOME" +HOMEPAGE="http://www.rhythmbox.org/" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="vorbis flac mad ipod avahi hal howl daap dbus libnotify lirc musicbrainz +tagwriting python keyring" +#I want tagwriting to be on by default in the future. It is just a local flag +#now because it is still considered experimental by upstream and doesn't work +#well with all formats due to gstreamer limitation. + +SLOT="0" + +RDEPEND=">=x11-libs/gtk+-2.6 + >=gnome-base/libgnomeui-2 + >=gnome-base/libglade-2 + >=gnome-base/gnome-vfs-2.7.4 + >=gnome-base/libbonobo-2 + >=gnome-extra/nautilus-cd-burner-2.11.3 + >=media-video/totem-1.1.5 + >=x11-libs/libsexy-0.1.5 + >=gnome-extra/gnome-media-2.14.0 + >=media-plugins/gst-plugins-cdparanoia-0.10 + keyring? ( >=gnome-base/gnome-keyring-0.4.9 ) + musicbrainz? ( >=media-libs/musicbrainz-2.1 ) + >=net-libs/libsoup-2.2.99 + hal? ( ipod? ( >=media-libs/libgpod-0.4 ) + >=sys-apps/hal-0.5 ) + avahi? ( >=net-dns/avahi-0.6 ) + !avahi? ( howl? ( >=net-misc/howl-0.9.8 ) ) + dbus? ( || ( >=dev-libs/dbus-glib-0.71 + ( =sys-apps/dbus-0.35 ) ) ) + >=media-libs/gst-plugins-base-0.10 + >=media-plugins/gst-plugins-gnomevfs-0.10 + vorbis? ( >=media-plugins/gst-plugins-vorbis-0.10 + >=media-plugins/gst-plugins-ogg-0.10 ) + mad? ( >=media-plugins/gst-plugins-mad-0.10 ) + flac? ( >=media-plugins/gst-plugins-flac-0.10 ) + libnotify? ( >=x11-libs/libnotify-0.3.2 ) + python? ( >=dev-lang/python-2.4.2 + >=dev-python/pygtk-2.8 + >=dev-python/gnome-python-2.12 )" + +DEPEND="${RDEPEND} + dev-util/pkgconfig + >=dev-util/intltool-0.29 + app-text/scrollkeeper" + +MAKEOPTS="${MAKEOPTS} -j1" + +pkg_setup() { + + if ! use avahi && ! use howl; then + if use daap ; then + ewarn "Daap support requires either howl or avahi" + ewarn "to be installed. Please remerge with either" + ewarn "USE=avahi or USE=howl" + fi + fi + if use howl || use avahi ; then + G2CONF="${G2CONF} $(use_enable daap)" + fi + + if use howl ; then + G2CONF="${G2CONF} --with-mdns=howl" + fi + + if use avahi ; then + G2CONF="${G2CONF} --with-mdns=avahi" + fi + + G2CONF="${G2CONF} \ + $(use_enable tagwriting tag-writing) \ + $(use_with ipod) \ + $(use_enable ipod ipod-writing) \ + $(use_enable musicbrainz) \ + $(use_with dbus) \ + $(use_enable python) \ + $(use_enable libnotify) \ + $(use_enable lirc) \ + $(use_with keyring gnome-keyring) + --with-playback=gstreamer-0-10 \ + --with-cd-burning + --enable-mmkeys \ + --enable-audioscrobbler \ + --enable-track-transfer \ + --with-metadata-helper \ + --disable-schemas-install" + +DOCS="AUTHORS COPYING ChangeLog DOCUMENTERS INSTALL INTERNALS \ + MAINTAINERS NEWS README README.iPod THANKS TODO" + +export GST_INSPECT=/bin/true +USE_DESTDIR=1 +} + +src_unpack() { + gnome2_src_unpack + epatch "${FILESDIR}"/${P}-daap_fix.patch + epatch "${FILESDIR}"/${P}-excessive-notification.patch + if use daap; then + epatch "${FILESDIR}"/${P}-daapsharing-fix.patch + cp aclocal.m4 old_macros.m4 + AT_M4DIR="." eautoreconf + fi +} + +src_compile() { + addpredict "$(unset HOME; echo ~)/.gconf" + addpredict "$(unset HOME; echo ~)/.gconfd" + gnome2_src_compile +} + +pkg_postinst() { + gnome2_pkg_postinst + elog "The aac flag has been removed from rhythmbox." + elog "This is due to stabilization issues with any gst-bad plugins." + elog "Please emerge gst-plugins-bad and gst-plugins-faad to be able to play m4a files" + elog "See bug #159538 for more information" +}