Adding patch to fix playback from daap shares. See bug 162956 for more info. Also...
authorJoe McCann <joem@gentoo.org>
Fri, 2 Feb 2007 21:50:32 +0000 (21:50 +0000)
committerJoe McCann <joem@gentoo.org>
Fri, 2 Feb 2007 21:50:32 +0000 (21:50 +0000)
Package-Manager: portage-2.1.2-r6

media-sound/rhythmbox/ChangeLog
media-sound/rhythmbox/Manifest
media-sound/rhythmbox/files/digest-rhythmbox-0.9.7-r1 [new file with mode: 0644]
media-sound/rhythmbox/files/rhythmbox-0.9.7-daap_fix.patch [new file with mode: 0644]
media-sound/rhythmbox/rhythmbox-0.9.7-r1.ebuild [new file with mode: 0644]

index 1d1386575c7cc042bfb4c3e8dd4ff34175f8c7aa..dad8833377935f3e3e8ea885634f9bb0542e651b 100644 (file)
@@ -1,6 +1,13 @@
 # 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.85 2007/01/23 03:57:21 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.86 2007/02/02 21:50:32 joem Exp $
+
+*rhythmbox-0.9.7-r1 (02 Feb 2007)
+
+  02 Feb 2007; Joe McCann <joem@gentoo.org>
+  +files/rhythmbox-0.9.7-daap_fix.patch, +rhythmbox-0.9.7-r1.ebuild:
+  Adding patch to fix playback from daap shares. See bug 162956 for more info.
+  Also added gst-plugins-cdparanoia dep as per bug 164983
 
   23 Jan 2007; Joe McCann <joem@gentoo.org> rhythmbox-0.9.6.ebuild,
   rhythmbox-0.9.7.ebuild:
index 1b16ca706407a35ea026326105c167386828706f..0605492ed2ea1752cff1468273e2f4fb86daea94 100644 (file)
@@ -22,6 +22,10 @@ AUX rhythmbox-0.9.5-dbus-0.90.patch 1660 RMD160 c4d23168de50dfcc631a14c554ba09bc
 MD5 27d9546852f5c88015ad298a25f168da files/rhythmbox-0.9.5-dbus-0.90.patch 1660
 RMD160 c4d23168de50dfcc631a14c554ba09bc1c088263 files/rhythmbox-0.9.5-dbus-0.90.patch 1660
 SHA256 c3ab9e6b6258fed934d3a7a7c47bc246e652f73db5b068107a51a6f3d8caa732 files/rhythmbox-0.9.5-dbus-0.90.patch 1660
+AUX rhythmbox-0.9.7-daap_fix.patch 1185 RMD160 5529b848990e410ca090c778d05d45e8bbea1501 SHA1 8663ed05c2c08630b5f5d3b63b7229f9d41eeaf6 SHA256 56c0af8afa900c267bc7eb2d17dbce216b080c837cefc7524d557b1eb2f3dd5c
+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
 DIST rhythmbox-0.8.8.tar.bz2 2435338 RMD160 7c436dd556c330ea98d87bad5cb304ab4a236020 SHA1 a48713cc191ce6df44f5466638dda39d56280243 SHA256 7faf1c10aaa198a1acacd3eb12979a2ea0730a0aa98d28f3c673a7f78b8dbda1
 DIST rhythmbox-0.9.4.1.tar.bz2 2155482 RMD160 5ce11aeae6631650cc4edfdbf46a7a13162d246f SHA1 dc59634de9471a14f62528c5a8453a284c74f7b0 SHA256 2d2305d575c7cc3a366ea9075efcb23b215da49b82b5b81ad3f8649a6cca80f6
 DIST rhythmbox-0.9.5.tar.bz2 2429543 RMD160 b51fd8800d00fd8a8ad16e1ab511cb40630fd4f1 SHA1 94b35f20c9fa45b105d4a068d83e150f4380e921 SHA256 63607430da44df029b9b82d43cea887b0217c2e058432be65e5a3b5fa8baba43
@@ -43,14 +47,18 @@ EBUILD rhythmbox-0.9.6.ebuild 3211 RMD160 380d4502bebd1e9dfcf8a174223e3ea2eb9044
 MD5 f935457cef4601b3a1821ad6a1e7afba rhythmbox-0.9.6.ebuild 3211
 RMD160 380d4502bebd1e9dfcf8a174223e3ea2eb904446 rhythmbox-0.9.6.ebuild 3211
 SHA256 bc1a2a9bc160df32291544574f361689b33bf114c4a6a24cd784f2728d03dc6f rhythmbox-0.9.6.ebuild 3211
+EBUILD rhythmbox-0.9.7-r1.ebuild 3487 RMD160 211bfcaca169b36f50292bc069685b20ee0312a7 SHA1 17ea5f71073e06c8bc2f8f23796368c227529f43 SHA256 f92694c7ca53efb12d59ac3b7688f95e9ddd70794f24e7627d702cf6e6d8a808
+MD5 d95b1d728c56b34373a91d40eefec1be rhythmbox-0.9.7-r1.ebuild 3487
+RMD160 211bfcaca169b36f50292bc069685b20ee0312a7 rhythmbox-0.9.7-r1.ebuild 3487
+SHA256 f92694c7ca53efb12d59ac3b7688f95e9ddd70794f24e7627d702cf6e6d8a808 rhythmbox-0.9.7-r1.ebuild 3487
 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 11379 RMD160 db5570049052c1b894d6431cf555c289459ef7f2 SHA1 f7f278f619da929daff07e39ccd1da8da6343854 SHA256 fab82d4f297f54aed9b92f1e06dafe7d26583fdc2ca3dc16e652331e8dc6e87a
-MD5 c3e0b8a90f69f9e5b390fbc4a6223840 ChangeLog 11379
-RMD160 db5570049052c1b894d6431cf555c289459ef7f2 ChangeLog 11379
-SHA256 fab82d4f297f54aed9b92f1e06dafe7d26583fdc2ca3dc16e652331e8dc6e87a ChangeLog 11379
+MISC ChangeLog 11665 RMD160 81657fb5f73d9f4ba90cd567ed9f2d6032bf152f SHA1 1fc8c7db835cc3736ed50fa4b3bbab6a15c3c230 SHA256 c01b55c24a4600a59e458fcd0587c7be91ddaaead522f1a76674311287424662
+MD5 2c109d02cfc4dfbef2d566d3f97d3d3c ChangeLog 11665
+RMD160 81657fb5f73d9f4ba90cd567ed9f2d6032bf152f ChangeLog 11665
+SHA256 c01b55c24a4600a59e458fcd0587c7be91ddaaead522f1a76674311287424662 ChangeLog 11665
 MISC metadata.xml 200 RMD160 bca17f66c909b846452eb76b2d2c9a2eec429db0 SHA1 9d3b582b967a1030b95428758f25fe33cb5a25fd SHA256 2e1eafdbf68047687a24f6a4ad8d519ec193805e347bf17d1d00f7771353e39b
 MD5 e854b7f54a4de6256186cbdcaabbc1ec metadata.xml 200
 RMD160 bca17f66c909b846452eb76b2d2c9a2eec429db0 metadata.xml 200
@@ -70,3 +78,6 @@ SHA256 f95c6f20ac2975c5a52d6bcfa2943b5f66e6153dc94bb547f38849bb192ccb09 files/di
 MD5 a25f279ade6a38fa5491711846736bf0 files/digest-rhythmbox-0.9.7 253
 RMD160 7ad58e52c516b9a01adcc901ddc6b6795306f307 files/digest-rhythmbox-0.9.7 253
 SHA256 4bfa3d9f98c32f139761486bbe64393a6bd9cd64a65416cbd3141a1a493e7807 files/digest-rhythmbox-0.9.7 253
+MD5 a25f279ade6a38fa5491711846736bf0 files/digest-rhythmbox-0.9.7-r1 253
+RMD160 7ad58e52c516b9a01adcc901ddc6b6795306f307 files/digest-rhythmbox-0.9.7-r1 253
+SHA256 4bfa3d9f98c32f139761486bbe64393a6bd9cd64a65416cbd3141a1a493e7807 files/digest-rhythmbox-0.9.7-r1 253
diff --git a/media-sound/rhythmbox/files/digest-rhythmbox-0.9.7-r1 b/media-sound/rhythmbox/files/digest-rhythmbox-0.9.7-r1
new file mode 100644 (file)
index 0000000..9b731a1
--- /dev/null
@@ -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-daap_fix.patch b/media-sound/rhythmbox/files/rhythmbox-0.9.7-daap_fix.patch
new file mode 100644 (file)
index 0000000..817add8
--- /dev/null
@@ -0,0 +1,38 @@
+--- daapsharing/rb-daap-src.c  2007/01/07 12:16:12     4725
++++ daapsharing/rb-daap-src.c  2007/01/27 02:34:51     4760
+@@ -601,6 +601,7 @@
+       gchar *request;
+       gchar *response;
+       gchar *end_headers;
++      gchar first_byte;
+       size_t readsize;
+       gboolean ok = TRUE;
+       guint http_status;
+@@ -704,10 +705,13 @@
+       }
+       /* libsoup wants the headers null-terminated, despite taking a parameter
+-       * specifying how long they are.
++       * specifying how long they are.  since the byte we overwrite to null-
++       * terminate the headers is the first byte of the response body, we need
++       * to restore it once we've parsed the response headers.
+        */
+-      end_headers[2] = '\0';
+-      end_headers += 4;
++      first_byte = end_headers[4];
++      end_headers[4] = '\0';
++      end_headers += 2;
+       header_table = g_hash_table_new (soup_str_case_hash, soup_str_case_equal);
+       if (soup_headers_parse_response (response,
+@@ -758,6 +762,10 @@
+       g_free (http_status_phrase);
+       g_hash_table_destroy (header_table);
++      /* restore the first response body byte and move on */
++      end_headers += 2;
++      *end_headers = first_byte;
++
+       /* copy remaining data into a new buffer */
+       if (ok) {
+               src->buffer_size = readsize - (end_headers - response);
diff --git a/media-sound/rhythmbox/rhythmbox-0.9.7-r1.ebuild b/media-sound/rhythmbox/rhythmbox-0.9.7-r1.ebuild
new file mode 100644 (file)
index 0000000..ca7e28c
--- /dev/null
@@ -0,0 +1,121 @@
+# 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-r1.ebuild,v 1.1 2007/02/02 21:50:32 joem Exp $
+
+inherit gnome2 eutils
+
+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.90 >=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() {
+       unpack ${A}
+       cd ${S}
+       epatch ${FILESDIR}/${P}-daap_fix.patch
+       gnome2_omf_fix
+}
+
+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"
+}