cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to rhythmbox-0.12.7.

Browse Source 
Fix coherence UPnP support; we don't enforce dependency on it, but if it's
installed it can be used.

ok jasper@
This commit is contained in:
ajacoutot 2010-03-21 10:10:56 +00:00
parent 2806a1445c
commit c58fd1e27d
10 changed files with 111 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
audio/rhythmbox/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.48 2009/12/22 15:43:15 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.49 2010/03/21 10:10:56 ajacoutot Exp $
COMMENT= music management application for GNOME
GNOME_PROJECT= rhythmbox
GNOME_VERSION= 0.12.6
PKGNAME= ${DISTNAME}p1
GNOME_VERSION= 0.12.7
SHARED_LIBS += rhythmbox-core 0.0 # .0.0

10
audio/rhythmbox/distinfo
View File

@ -1,5 +1,5 @@
MD5 (rhythmbox-0.12.6.tar.bz2) = wi/0dslWr+t/aU5dGlnPuQ==
RMD160 (rhythmbox-0.12.6.tar.bz2) = z4YLGkKXXU3+oJtcJlvaKX0Yp7k=
SHA1 (rhythmbox-0.12.6.tar.bz2) = 8bo3UylHHsR0daSwzj6LukMKU3s=
SHA256 (rhythmbox-0.12.6.tar.bz2) = 3f+lt+Dg/oEEQ1SZj9kaWNT/UmdGsXprY44OjqGsloQ=
SIZE (rhythmbox-0.12.6.tar.bz2) = 5202025
MD5 (rhythmbox-0.12.7.tar.bz2) = 21NQM4OpiLHSAdG02mpQhw==
RMD160 (rhythmbox-0.12.7.tar.bz2) = AoFaNQPBlfoA9lwD5W4NaGol4Rg=
SHA1 (rhythmbox-0.12.7.tar.bz2) = p5MTLEn5okBT+50FUUs4DE3WL3w=
SHA256 (rhythmbox-0.12.7.tar.bz2) = SrKLk7Lp17yTOBlLpuAVSTYv3VsM8oBtoJH7+ywqg2I=
SIZE (rhythmbox-0.12.7.tar.bz2) = 5224160

8
audio/rhythmbox/patches/patch-plugins_audioscrobbler_rb-audioscrobbler_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-plugins_audioscrobbler_rb-audioscrobbler_c,v 1.7 2009/11/22 11:18:34 ajacoutot Exp $
--- plugins/audioscrobbler/rb-audioscrobbler.c.orig Sun Nov 15 01:54:44 2009
+++ plugins/audioscrobbler/rb-audioscrobbler.c Sun Nov 22 11:32:43 2009
@@ -731,7 +731,7 @@ rb_audioscrobbler_should_handshake (RBAudioscrobbler *
$OpenBSD: patch-plugins_audioscrobbler_rb-audioscrobbler_c,v 1.8 2010/03/21 10:10:56 ajacoutot Exp $
--- plugins/audioscrobbler/rb-audioscrobbler.c.orig Sun Feb 28 14:35:20 2010
+++ plugins/audioscrobbler/rb-audioscrobbler.c Wed Mar 3 11:24:33 2010
@@ -729,7 +729,7 @@ rb_audioscrobbler_should_handshake (RBAudioscrobbler *
}
if (time (NULL) < audioscrobbler->priv->handshake_next) {

15
audio/rhythmbox/patches/patch-plugins_coherence_upnp_coherence_MediaPlayer_py Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-plugins_coherence_upnp_coherence_MediaPlayer_py,v 1.1 2010/03/21 10:10:56 ajacoutot Exp $
The 'louie' module from coherence is not under MODPY_LIBDIR.
--- plugins/coherence/upnp_coherence/MediaPlayer.py.orig Tue Feb 9 10:45:09 2010
+++ plugins/coherence/upnp_coherence/MediaPlayer.py Tue Feb 9 10:45:18 2010
@@ -13,7 +13,7 @@ import rhythmdb
from coherence.upnp.core.soap_service import errorCode
from coherence.upnp.core import DIDLLite
-import louie
+import coherence.extern.louie as louie
from coherence.extern.simple_plugin import Plugin

15
audio/rhythmbox/patches/patch-plugins_coherence_upnp_coherence_MediaStore_py Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-plugins_coherence_upnp_coherence_MediaStore_py,v 1.1 2010/03/21 10:10:56 ajacoutot Exp $
The 'louie' module from coherence is not under MODPY_LIBDIR.
--- plugins/coherence/upnp_coherence/MediaStore.py.orig Tue Feb 9 10:45:24 2010
+++ plugins/coherence/upnp_coherence/MediaStore.py Tue Feb 9 10:45:32 2010
@@ -6,7 +6,7 @@
import os.path
import rhythmdb
-import louie
+import coherence.extern.louie as louie
import urllib
from coherence import __version_info__

15
audio/rhythmbox/patches/patch-plugins_coherence_upnp_coherence___init___py Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-plugins_coherence_upnp_coherence___init___py,v 1.1 2010/03/21 10:10:56 ajacoutot Exp $
The 'louie' module from coherence is not under MODPY_LIBDIR.
--- plugins/coherence/upnp_coherence/__init__.py.orig Tue Feb 9 10:44:50 2010
+++ plugins/coherence/upnp_coherence/__init__.py Tue Feb 9 10:45:02 2010
@@ -12,7 +12,7 @@ import gobject, gtk
import gconf
-import louie
+import coherence.extern.louie as louie
from coherence import log

48
audio/rhythmbox/patches/patch-plugins_daap_rb-daap-src_c
View File

@ -1,48 +0,0 @@
$OpenBSD: patch-plugins_daap_rb-daap-src_c,v 1.4 2009/07/12 20:05:23 ajacoutot Exp $
--- plugins/daap/rb-daap-src.c.orig Tue Jun 30 01:38:57 2009
+++ plugins/daap/rb-daap-src.c Mon Jul 6 08:36:00 2009
@@ -297,7 +297,7 @@ rb_daap_src_write (RBDAAPSrc *src, const guchar *buf,
bytes_written += wrote;
}
- GST_DEBUG_OBJECT (src, "wrote %d bytes succesfully", bytes_written);
+ GST_DEBUG_OBJECT (src, "wrote %zu bytes succesfully", bytes_written);
return bytes_written;
}
@@ -311,7 +311,7 @@ rb_daap_src_read (RBDAAPSrc *src, guchar *buf, size_t
if (bytes_read > src->buffer_size)
bytes_read = src->buffer_size;
- GST_DEBUG_OBJECT (src, "reading %d bytes from buffer", bytes_read);
+ GST_DEBUG_OBJECT (src, "reading %zu bytes from buffer", bytes_read);
memcpy (buf, src->buffer, bytes_read);
src->buffer += bytes_read;
src->buffer_size -= bytes_read;
@@ -335,7 +335,7 @@ rb_daap_src_read (RBDAAPSrc *src, guchar *buf, size_t
bytes_read += ret;
}
- GST_DEBUG_OBJECT (src, "read %d bytes succesfully", bytes_read);
+ GST_DEBUG_OBJECT (src, "read %zu bytes succesfully", bytes_read);
return bytes_read;
}
@@ -387,7 +387,7 @@ rb_daap_src_read_chunk_size (RBDAAPSrc *src, gboolean
return FALSE;
}
- GST_DEBUG_OBJECT (src, "got HTTP chunk size %lu", *chunk_size);
+ GST_DEBUG_OBJECT (src, "got HTTP chunk size %lu", (long int)*chunk_size);
return TRUE;
} else if (isxdigit (ch)) {
chunk_buf[i++] = ch;
@@ -693,7 +693,7 @@ rb_daap_src_create (GstPushSrc *psrc, GstBuffer **outb
buf = gst_buffer_new_and_alloc (readsize);
- GST_LOG_OBJECT (src, "Reading %d bytes", readsize);
+ GST_LOG_OBJECT (src, "Reading %zu bytes", readsize);
readsize = rb_daap_src_read (src, GST_BUFFER_DATA (buf), readsize);
if (readsize < 0) {
GST_ELEMENT_ERROR (src, RESOURCE, READ, (NULL), GST_ERROR_SYSTEM);

8
audio/rhythmbox/patches/patch-podcast_rb-podcast-parse_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-podcast_rb-podcast-parse_h,v 1.2 2009/03/19 13:50:28 ajacoutot Exp $
--- podcast/rb-podcast-parse.h.orig Thu Mar 12 03:26:18 2009
+++ podcast/rb-podcast-parse.h Thu Mar 19 13:09:49 2009
@@ -31,6 +31,7 @@
$OpenBSD: patch-podcast_rb-podcast-parse_h,v 1.3 2010/03/21 10:10:56 ajacoutot Exp $
--- podcast/rb-podcast-parse.h.orig Sun Feb 28 14:35:23 2010
+++ podcast/rb-podcast-parse.h Wed Mar 3 11:24:33 2010
@@ -29,6 +29,7 @@
#define RB_PODCAST_PARSE_H
#include <glib.h>

12
audio/rhythmbox/patches/patch-shell_rb-shell-player_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-shell_rb-shell-player_c,v 1.8 2009/11/22 11:18:34 ajacoutot Exp $
--- shell/rb-shell-player.c.orig Sat Nov 21 01:31:38 2009
+++ shell/rb-shell-player.c Sun Nov 22 11:32:43 2009
@@ -733,10 +733,8 @@ rb_shell_player_open_playlist_url (RBShellPlayer *play
$OpenBSD: patch-shell_rb-shell-player_c,v 1.9 2010/03/21 10:10:56 ajacoutot Exp $
--- shell/rb-shell-player.c.orig Sun Feb 28 14:35:24 2010
+++ shell/rb-shell-player.c Wed Mar 3 11:24:33 2010
@@ -729,10 +729,8 @@ rb_shell_player_open_playlist_url (RBShellPlayer *play
rb_player_play (player->priv->mmplayer, play_type, player->priv->track_transition_time, &error);
if (error) {
@ -12,7 +12,7 @@ $OpenBSD: patch-shell_rb-shell-player_c,v 1.8 2009/11/22 11:18:34 ajacoutot Exp
}
}
@@ -808,7 +806,9 @@ rb_shell_player_handle_eos_unlocked (RBShellPlayer *pl
@@ -804,7 +802,9 @@ rb_shell_player_handle_eos_unlocked (RBShellPlayer *pl
/* we're handling an unexpected EOS here, so crossfading isn't
* really possible anyway -> specify FALSE.
*/
@ -22,7 +22,7 @@ $OpenBSD: patch-shell_rb-shell-player_c,v 1.8 2009/11/22 11:18:34 ajacoutot Exp
g_free (location);
break;
}
@@ -1497,7 +1497,9 @@ open_location_thread (OpenLocationThreadData *data)
@@ -1493,7 +1493,9 @@ open_location_thread (OpenLocationThreadData *data)
} else {
/* if we can't parse it as a playlist, just try playing it */
rb_debug ("playlist parser failed, playing %s directly", data->location);

53
audio/rhythmbox/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.19 2009/12/22 15:43:15 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.20 2010/03/21 10:10:56 ajacoutot Exp $
@bin bin/rhythmbox
@bin bin/rhythmbox-client
lib/librhythmbox-core.la
@ -9,18 +9,12 @@ lib/rhythmbox/plugins/artdisplay/
lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.py
lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.pyc
lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.pyo
lib/rhythmbox/plugins/artdisplay/DiscogsCoverArtSearch.py
lib/rhythmbox/plugins/artdisplay/DiscogsCoverArtSearch.pyc
lib/rhythmbox/plugins/artdisplay/DiscogsCoverArtSearch.pyo
lib/rhythmbox/plugins/artdisplay/EmbeddedCoverArtSearch.py
lib/rhythmbox/plugins/artdisplay/EmbeddedCoverArtSearch.pyc
lib/rhythmbox/plugins/artdisplay/EmbeddedCoverArtSearch.pyo
lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.py
lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.pyc
lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.pyo
lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearchGIO.py
lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearchGIO.pyc
lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearchGIO.pyo
lib/rhythmbox/plugins/artdisplay/MusicBrainzCoverArtSearch.py
lib/rhythmbox/plugins/artdisplay/MusicBrainzCoverArtSearch.pyc
lib/rhythmbox/plugins/artdisplay/MusicBrainzCoverArtSearch.pyo
@ -83,6 +77,7 @@ lib/rhythmbox/plugins/daap/libdaap.la
lib/rhythmbox/plugins/daap/libdaap.so
lib/rhythmbox/plugins/daap/rb-daap-glue.h
lib/rhythmbox/plugins/generic-player/
lib/rhythmbox/plugins/generic-player/generic-player-info.ui
lib/rhythmbox/plugins/generic-player/generic-player-ui.xml
lib/rhythmbox/plugins/generic-player/generic-player.rb-plugin
lib/rhythmbox/plugins/generic-player/libgeneric-player.la
@ -136,6 +131,12 @@ lib/rhythmbox/plugins/lyrics/LyricsConfigureDialog.pyo
lib/rhythmbox/plugins/lyrics/LyricsParse.py
lib/rhythmbox/plugins/lyrics/LyricsParse.pyc
lib/rhythmbox/plugins/lyrics/LyricsParse.pyo
lib/rhythmbox/plugins/lyrics/LyricsSites.py
lib/rhythmbox/plugins/lyrics/LyricsSites.pyc
lib/rhythmbox/plugins/lyrics/LyricsSites.pyo
lib/rhythmbox/plugins/lyrics/TerraParser.py
lib/rhythmbox/plugins/lyrics/TerraParser.pyc
lib/rhythmbox/plugins/lyrics/TerraParser.pyo
lib/rhythmbox/plugins/lyrics/WinampcnParser.py
lib/rhythmbox/plugins/lyrics/WinampcnParser.pyc
lib/rhythmbox/plugins/lyrics/WinampcnParser.pyo
@ -159,7 +160,6 @@ lib/rhythmbox/plugins/magnatune/__init__.pyc
lib/rhythmbox/plugins/magnatune/__init__.pyo
lib/rhythmbox/plugins/magnatune/magnatune-loading.ui
lib/rhythmbox/plugins/magnatune/magnatune-prefs.ui
lib/rhythmbox/plugins/magnatune/magnatune-purchase.ui
lib/rhythmbox/plugins/magnatune/magnatune.rb-plugin
lib/rhythmbox/plugins/magnatune/magnatune_logo_color_small.png
lib/rhythmbox/plugins/magnatune/magnatune_logo_color_tiny.png
@ -192,6 +192,23 @@ lib/rhythmbox/plugins/rb/__init__.pyo
lib/rhythmbox/plugins/rb/stringmatch.py
lib/rhythmbox/plugins/rb/stringmatch.pyc
lib/rhythmbox/plugins/rb/stringmatch.pyo
lib/rhythmbox/plugins/replaygain/
lib/rhythmbox/plugins/replaygain/__init__.py
lib/rhythmbox/plugins/replaygain/__init__.pyc
lib/rhythmbox/plugins/replaygain/__init__.pyo
lib/rhythmbox/plugins/replaygain/config.py
lib/rhythmbox/plugins/replaygain/config.pyc
lib/rhythmbox/plugins/replaygain/config.pyo
lib/rhythmbox/plugins/replaygain/player.py
lib/rhythmbox/plugins/replaygain/player.pyc
lib/rhythmbox/plugins/replaygain/player.pyo
lib/rhythmbox/plugins/replaygain/replaygain-prefs.ui
lib/rhythmbox/plugins/replaygain/replaygain.rb-plugin
lib/rhythmbox/plugins/sendto/
lib/rhythmbox/plugins/sendto/__init__.py
lib/rhythmbox/plugins/sendto/__init__.pyc
lib/rhythmbox/plugins/sendto/__init__.pyo
lib/rhythmbox/plugins/sendto/sendto.rb-plugin
lib/rhythmbox/plugins/status-icon/
lib/rhythmbox/plugins/status-icon/libstatus-icon.la
lib/rhythmbox/plugins/status-icon/libstatus-icon.so
@ -220,6 +237,8 @@ lib/rhythmbox/plugins/visualizer/visualizer-controls.ui
lib/rhythmbox/plugins/visualizer/visualizer-ui.xml
lib/rhythmbox/plugins/visualizer/visualizer.rb-plugin
@bin libexec/rhythmbox-metadata
@man man/man1/rhythmbox-client.1
@man man/man1/rhythmbox.1
share/applications/rhythmbox.desktop
share/dbus-1/services/org.gnome.Rhythmbox.service
share/gnome/help/rhythmbox/
@ -401,6 +420,22 @@ share/gnome/help/rhythmbox/sv/figures/rb-volume-changer.png
share/gnome/help/rhythmbox/sv/figures/rb-window-small.png
share/gnome/help/rhythmbox/sv/figures/rb-window.png
share/gnome/help/rhythmbox/sv/rhythmbox.xml
share/gnome/help/rhythmbox/uk/
share/gnome/help/rhythmbox/uk/figures/
share/gnome/help/rhythmbox/uk/figures/rb-iradio-main.png
share/gnome/help/rhythmbox/uk/figures/rb-notification-area-menu.png
share/gnome/help/rhythmbox/uk/figures/rb-notification-window.png
share/gnome/help/rhythmbox/uk/figures/rb-notification-zone.png
share/gnome/help/rhythmbox/uk/figures/rb-podcast-main.png
share/gnome/help/rhythmbox/uk/figures/rb-statusbar.png
share/gnome/help/rhythmbox/uk/figures/rb-toolbar-prevplaynext.png
share/gnome/help/rhythmbox/uk/figures/rb-toolbar-repeat.png
share/gnome/help/rhythmbox/uk/figures/rb-toolbar-shuffle.png
share/gnome/help/rhythmbox/uk/figures/rb-toolbar.png
share/gnome/help/rhythmbox/uk/figures/rb-volume-changer.png
share/gnome/help/rhythmbox/uk/figures/rb-window-small.png
share/gnome/help/rhythmbox/uk/figures/rb-window.png
share/gnome/help/rhythmbox/uk/rhythmbox.xml
share/gnome/help/rhythmbox/zh_CN/
share/gnome/help/rhythmbox/zh_CN/figures/
share/gnome/help/rhythmbox/zh_CN/figures/rb-iradio-main.png
@ -583,6 +618,7 @@ share/omf/rhythmbox/rhythmbox-it.omf
share/omf/rhythmbox/rhythmbox-oc.omf
share/omf/rhythmbox/rhythmbox-ru.omf
share/omf/rhythmbox/rhythmbox-sv.omf
share/omf/rhythmbox/rhythmbox-uk.omf
share/omf/rhythmbox/rhythmbox-zh_CN.omf
share/rhythmbox/
share/rhythmbox/create-playlist.ui
@ -661,6 +697,7 @@ share/rhythmbox/icons/hicolor/scalable/places/playlist.svg
share/rhythmbox/icons/hicolor/scalable/status/
share/rhythmbox/icons/hicolor/scalable/status/rhythmbox-notplaying.svg
share/rhythmbox/library-prefs.ui
share/rhythmbox/media-player-properties.ui
share/rhythmbox/playback-prefs.ui
share/rhythmbox/playlist-save.ui
share/rhythmbox/playlists.xml