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

Update to rhythmbox-2.98.

Browse Source
This commit is contained in:
ajacoutot 2012-09-30 14:58:38 +00:00
parent 796f3fa66a
commit 6c0e6184fb
9 changed files with 39 additions and 404 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
audio/rhythmbox/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.106 2012/09/29 12:20:14 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.107 2012/09/30 14:58:38 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= integrated music management application for GNOME
GNOME_PROJECT= rhythmbox
GNOME_VERSION= 2.97
REVISION= 4
GNOME_VERSION= 2.98
SHARED_LIBS += rhythmbox-core 0.0 # .0.0
@ -42,7 +43,6 @@ MODULES= devel/gettext \
devel/dconf
BUILD_DEPENDS= audio/libmusicbrainz \
devel/gobject-introspection \
devel/py-gobject3
# needed for the tests
@ -67,22 +67,21 @@ RUN_DEPENDS+= multimedia/gstreamer-0.10/plugins-good
MODGNOME_DESKTOP_FILE= Yes
MODGNOME_ICON_CACHE= Yes
MODGNOME_TOOLS= yelp
MODGNOME_TOOLS= goi vala yelp
MODGNOME_LDFLAGS= -L${X11BASE}/lib
MODGNOME_CPPFLAGS= -I${X11BASE}/include
LIBTOOL_FLAGS= --tag=disable-static
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --without-brasero \
CONFIGURE_ARGS= --disable-static \
--without-brasero \
--without-hal \
--without-gudev \
--without-webkit \
--disable-fm-radio \
--disable-lirc
# Don't compile the vala (useless) sample plugin.
CONFIGURE_ARGS += --disable-vala
# XXX requires libdmapsharing
CONFIGURE_ARGS += --disable-daap --without-mdns
@ -100,6 +99,6 @@ CONFIGURE_ENV += MOZILLA_PLUGINDIR=${PREFIX}/lib/mozilla-plugins
REGRESS_IS_INTERACTIVE= x11
post-install:
rm ${PREFIX}/lib/rhythmbox/plugins/*/*.la
rm ${PREFIX}/lib/rhythmbox/{,sample-}plugins/*/*.la
.include <bsd.port.mk>

7
audio/rhythmbox/distinfo
View File

@ -1,5 +1,2 @@
MD5 (rhythmbox-2.97.tar.xz) = Ju14ycRpXF8orbNMqdTZQw==
RMD160 (rhythmbox-2.97.tar.xz) = 6Z2hOw/9UYBc4z2GOBd+ggMj4Wo=
SHA1 (rhythmbox-2.97.tar.xz) = MH0Dh5Xylv2XqslXnuD50TYvCic=
SHA256 (rhythmbox-2.97.tar.xz) = tSVnz0W/E8BFJZPaf5B5IL1M8xkWyo3NFdVVM2tJR+Q=
SIZE (rhythmbox-2.97.tar.xz) = 6027128
SHA256 (rhythmbox-2.98.tar.xz) = pcChinx2Ez02x9y9w34wTq6CcnA5hbF7VA1oYDsMdtU=
SIZE (rhythmbox-2.98.tar.xz) = 5945988

165
audio/rhythmbox/patches/patch-configure
View File

@ -1,165 +0,0 @@
$OpenBSD: patch-configure,v 1.15 2012/09/29 12:20:14 ajacoutot Exp $
From 86eb47f705b2f0e6e8ba8d90073c961d47dbfb95 Mon Sep 17 00:00:00 2001
From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
Date: Fri, 17 Aug 2012 13:28:05 +0000
Subject: grilo: Port to the grilo 0.2 API
audiocd plugin requires cdda support in gvfs which we do not provide as
this would require HAL or gudev.
--- configure.orig Sun Jun 3 11:07:09 2012
+++ configure Sat Sep 29 14:06:22 2012
@@ -15085,7 +15085,7 @@ LIBSOUP_REQS=2.26.0
GUDEV_REQS=143
LIBMTP_REQS=0.3.0
LIBPEAS_REQS=0.7.3
-GRILO_REQS=0.1.17
+GRILO_REQS=0.2.0
LIBXML2_REQS=2.7.8
LIBNOTIFY_REQS=0.7.0
@@ -16851,99 +16851,6 @@ fi
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTCDDA" >&5
-$as_echo_n "checking for GSTCDDA... " >&6; }
-
-if test -n "$GSTCDDA_CFLAGS"; then
- pkg_cv_GSTCDDA_CFLAGS="$GSTCDDA_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-cdda-0.10\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gstreamer-cdda-0.10") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_GSTCDDA_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-cdda-0.10" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$GSTCDDA_LIBS"; then
- pkg_cv_GSTCDDA_LIBS="$GSTCDDA_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-cdda-0.10\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gstreamer-cdda-0.10") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_GSTCDDA_LIBS=`$PKG_CONFIG --libs "gstreamer-cdda-0.10" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- GSTCDDA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gstreamer-cdda-0.10" 2>&1`
- else
- GSTCDDA_PKG_ERRORS=`$PKG_CONFIG --print-errors "gstreamer-cdda-0.10" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$GSTCDDA_PKG_ERRORS" >&5
-
- as_fn_error $? "Package requirements (gstreamer-cdda-0.10) were not met:
-
-$GSTCDDA_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GSTCDDA_CFLAGS
-and GSTCDDA_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GSTCDDA_CFLAGS
-and GSTCDDA_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-
-else
- GSTCDDA_CFLAGS=$pkg_cv_GSTCDDA_CFLAGS
- GSTCDDA_LIBS=$pkg_cv_GSTCDDA_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-
-
have_sj_metadata_getter=no
# Check whether --enable-musicbrainz was given.
if test "${enable_musicbrainz+set}" = set; then :
@@ -20437,12 +20344,12 @@ if test -n "$GRILO_CFLAGS"; then
pkg_cv_GRILO_CFLAGS="$GRILO_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"grilo-0.1 >= \$GRILO_REQS\""; } >&5
- ($PKG_CONFIG --exists --print-errors "grilo-0.1 >= $GRILO_REQS") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"grilo-0.2 >= \$GRILO_REQS\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "grilo-0.2 >= $GRILO_REQS") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GRILO_CFLAGS=`$PKG_CONFIG --cflags "grilo-0.1 >= $GRILO_REQS" 2>/dev/null`
+ pkg_cv_GRILO_CFLAGS=`$PKG_CONFIG --cflags "grilo-0.2 >= $GRILO_REQS" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -20453,12 +20360,12 @@ if test -n "$GRILO_LIBS"; then
pkg_cv_GRILO_LIBS="$GRILO_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"grilo-0.1 >= \$GRILO_REQS\""; } >&5
- ($PKG_CONFIG --exists --print-errors "grilo-0.1 >= $GRILO_REQS") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"grilo-0.2 >= \$GRILO_REQS\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "grilo-0.2 >= $GRILO_REQS") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GRILO_LIBS=`$PKG_CONFIG --libs "grilo-0.1 >= $GRILO_REQS" 2>/dev/null`
+ pkg_cv_GRILO_LIBS=`$PKG_CONFIG --libs "grilo-0.2 >= $GRILO_REQS" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -20478,9 +20385,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GRILO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "grilo-0.1 >= $GRILO_REQS" 2>&1`
+ GRILO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "grilo-0.2 >= $GRILO_REQS" 2>&1`
else
- GRILO_PKG_ERRORS=`$PKG_CONFIG --print-errors "grilo-0.1 >= $GRILO_REQS" 2>&1`
+ GRILO_PKG_ERRORS=`$PKG_CONFIG --print-errors "grilo-0.2 >= $GRILO_REQS" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GRILO_PKG_ERRORS" >&5

12
audio/rhythmbox/patches/patch-data_ui_rhythmbox-ui_xml
View File

@ -1,13 +1,13 @@
$OpenBSD: patch-data_ui_rhythmbox-ui_xml,v 1.2 2011/09/12 07:26:18 ajacoutot Exp $
$OpenBSD: patch-data_ui_rhythmbox-ui_xml,v 1.3 2012/09/30 14:58:39 ajacoutot Exp $
audiocd plugin requires cdda support in gvfs which we do not provide as
this would require HAL or gudev.
--- data/ui/rhythmbox-ui.xml.orig Sat Jul 23 09:20:55 2011
+++ data/ui/rhythmbox-ui.xml Sat Jul 23 09:21:27 2011
@@ -4,8 +4,6 @@
<menuitem name="MusicImportFileMenu" action="MusicImportFile"/>
<menuitem name="MusicImportFolderMenu" action="MusicImportFolder"/>
--- data/ui/rhythmbox-ui.xml.orig Sun Sep 30 04:03:28 2012
+++ data/ui/rhythmbox-ui.xml Sun Sep 30 12:30:39 2012
@@ -3,8 +3,6 @@
<menu name="MusicMenu" action="Music">
<menuitem name="MusicImport" action="MusicAdd"/>
<separator/>
- <menuitem name="MusicCheckDevices" action="MusicCheckDevices"/>
- <separator/>

10
audio/rhythmbox/patches/patch-plugins_Makefile_in
View File

@ -1,16 +1,16 @@
$OpenBSD: patch-plugins_Makefile_in,v 1.4 2012/06/03 11:12:31 ajacoutot Exp $
$OpenBSD: patch-plugins_Makefile_in,v 1.5 2012/09/30 14:58:39 ajacoutot Exp $
audiocd plugin requires cdda support in gvfs which we do not provide as
this would require HAL or gudev.
--- plugins/Makefile.in.orig Sun Jun 3 11:07:15 2012
+++ plugins/Makefile.in Sun Jun 3 12:02:23 2012
@@ -398,7 +398,7 @@ top_builddir = @top_builddir@
--- plugins/Makefile.in.orig Sun Sep 30 11:39:55 2012
+++ plugins/Makefile.in Sun Sep 30 12:31:15 2012
@@ -423,7 +423,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
pluginincludedir = $(includedir)/rhythmbox/plugins
plugininclude_HEADERS = rb-plugin-macros.h
-SUBDIRS = audiocd audioscrobbler dbus-media-server generic-player \
+SUBDIRS = audioscrobbler dbus-media-server generic-player \
iradio mmkeys mpris power-manager sample $(am__append_1) \
iradio mmkeys mpris power-manager $(am__append_1) \
$(am__append_2) $(am__append_3) $(am__append_4) \
$(am__append_5) $(am__append_6) $(am__append_7) \

36
audio/rhythmbox/patches/patch-plugins_grilo_rb-grilo-plugin_c
View File

@ -1,36 +0,0 @@
$OpenBSD: patch-plugins_grilo_rb-grilo-plugin_c,v 1.1 2012/09/29 12:20:14 ajacoutot Exp $
From 86eb47f705b2f0e6e8ba8d90073c961d47dbfb95 Mon Sep 17 00:00:00 2001
From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
Date: Fri, 17 Aug 2012 13:28:05 +0000
Subject: grilo: Port to the grilo 0.2 API
--- plugins/grilo/rb-grilo-plugin.c.orig Thu May 31 00:51:09 2012
+++ plugins/grilo/rb-grilo-plugin.c Sat Sep 29 14:05:14 2012
@@ -65,7 +65,7 @@ typedef struct
{
PeasExtensionBase parent;
- GrlPluginRegistry *registry;
+ GrlRegistry *registry;
GHashTable *sources;
RBShellPlayer *shell_player;
gulong emit_cover_art_id;
@@ -93,7 +93,7 @@ rb_grilo_plugin_init (RBGriloPlugin *plugin)
static void
rb_grilo_plugin_source_deleted (RBGriloSource *source, RBGriloPlugin *plugin)
{
- GrlMediaSource *media_source;
+ GrlSource *media_source;
g_object_get (source, "media-source", &media_source, NULL);
g_hash_table_remove (plugin->sources, media_source);
@@ -101,7 +101,7 @@ rb_grilo_plugin_source_deleted (RBGriloSource *source,
}
static void
-grilo_source_added_cb (GrlPluginRegistry *registry, GrlMediaPlugin *grilo_plugin, RBGriloPlugin *plugin)
+grilo_source_added_cb (GrlRegistry *registry, GrlPlugin *grilo_plugin, RBGriloPlugin *plugin)
{
RBSource *grilo_source;
RBShell *shell;

157
audio/rhythmbox/patches/patch-plugins_grilo_rb-grilo-source_c
View File

@ -1,157 +0,0 @@
$OpenBSD: patch-plugins_grilo_rb-grilo-source_c,v 1.1 2012/09/29 12:20:14 ajacoutot Exp $
From 86eb47f705b2f0e6e8ba8d90073c961d47dbfb95 Mon Sep 17 00:00:00 2001
From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
Date: Fri, 17 Aug 2012 13:28:05 +0000
Subject: grilo: Port to the grilo 0.2 API
--- plugins/grilo/rb-grilo-source.c.orig Thu May 31 00:51:09 2012
+++ plugins/grilo/rb-grilo-source.c Sat Sep 29 14:05:14 2012
@@ -91,7 +91,7 @@ static RBEntryView *impl_get_entry_view (RBSource *sou
struct _RBGriloSourcePrivate
{
- GrlMediaSource *grilo_source;
+ GrlSource *grilo_source;
GList *grilo_keys;
RhythmDBEntryType *entry_type;
@@ -189,7 +189,7 @@ rb_grilo_source_class_init (RBGriloSourceClass *klass)
g_param_spec_object ("grilo-source",
"grilo source",
"grilo source object",
- GRL_TYPE_MEDIA_SOURCE,
+ GRL_TYPE_SOURCE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
g_type_class_add_private (klass, sizeof (RBGriloSourcePrivate));
@@ -288,49 +288,49 @@ rb_grilo_source_constructed (GObject *object)
source_keys = grl_metadata_source_supported_keys (GRL_METADATA_SOURCE (source->priv->grilo_source));
- if (g_list_find ((GList *)source_keys, GRL_METADATA_KEY_TRACK_NUMBER)) {
+ if (g_list_find ((GList *)source_keys, GUINT_TO_POINTER(GRL_METADATA_KEY_TRACK_NUMBER))) {
rb_entry_view_append_column (source->priv->entry_view, RB_ENTRY_VIEW_COL_TRACK_NUMBER, FALSE);
source->priv->grilo_keys = g_list_prepend (source->priv->grilo_keys,
- GRL_METADATA_KEY_TRACK_NUMBER);
+ GUINT_TO_POINTER(GRL_METADATA_KEY_TRACK_NUMBER));
}
- if (g_list_find ((GList *)source_keys, GRL_METADATA_KEY_TITLE)) {
+ if (g_list_find ((GList *)source_keys, GUINT_TO_POINTER(GRL_METADATA_KEY_TITLE))) {
rb_entry_view_append_column (source->priv->entry_view, RB_ENTRY_VIEW_COL_TITLE, TRUE);
source->priv->grilo_keys = g_list_prepend (source->priv->grilo_keys,
- GRL_METADATA_KEY_TITLE);
+ GUINT_TO_POINTER(GRL_METADATA_KEY_TITLE));
}
- if (g_list_find ((GList *)source_keys, GRL_METADATA_KEY_GENRE)) {
+ if (g_list_find ((GList *)source_keys, GUINT_TO_POINTER(GRL_METADATA_KEY_GENRE))) {
rb_entry_view_append_column (source->priv->entry_view, RB_ENTRY_VIEW_COL_GENRE, FALSE);
source->priv->grilo_keys = g_list_prepend (source->priv->grilo_keys,
- GRL_METADATA_KEY_GENRE);
+ GUINT_TO_POINTER(GRL_METADATA_KEY_GENRE));
}
- if (g_list_find ((GList *)source_keys, GRL_METADATA_KEY_ARTIST)) {
+ if (g_list_find ((GList *)source_keys, GUINT_TO_POINTER(GRL_METADATA_KEY_ARTIST))) {
rb_entry_view_append_column (source->priv->entry_view, RB_ENTRY_VIEW_COL_ARTIST, FALSE);
source->priv->grilo_keys = g_list_prepend (source->priv->grilo_keys,
- GRL_METADATA_KEY_ARTIST);
+ GUINT_TO_POINTER(GRL_METADATA_KEY_ARTIST));
}
- if (g_list_find ((GList *)source_keys, GRL_METADATA_KEY_ALBUM)) {
+ if (g_list_find ((GList *)source_keys, GUINT_TO_POINTER(GRL_METADATA_KEY_ALBUM))) {
rb_entry_view_append_column (source->priv->entry_view, RB_ENTRY_VIEW_COL_ALBUM, FALSE);
source->priv->grilo_keys = g_list_prepend (source->priv->grilo_keys,
- GRL_METADATA_KEY_ALBUM);
+ GUINT_TO_POINTER(GRL_METADATA_KEY_ALBUM));
}
/*
- if (g_list_find ((GList *)source_keys, GRL_METADATA_KEY_DATE)) {
+ if (g_list_find ((GList *)source_keys, GUINT_TO_POINTER(GRL_METADATA_KEY_DATE))) {
rb_entry_view_append_column (source->priv->entry_view, RB_ENTRY_VIEW_COL_YEAR, FALSE);
source->priv->grilo_keys = g_list_prepend (source->priv->grilo_keys,
- GRL_METADATA_KEY_DATE);
+ GUINT_TO_POINTER(GRL_METADATA_KEY_DATE));
}
*/
- if (g_list_find ((GList *)source_keys, GRL_METADATA_KEY_DURATION)) {
+ if (g_list_find ((GList *)source_keys, GUINT_TO_POINTER(GRL_METADATA_KEY_DURATION))) {
rb_entry_view_append_column (source->priv->entry_view, RB_ENTRY_VIEW_COL_DURATION, FALSE);
source->priv->grilo_keys = g_list_prepend (source->priv->grilo_keys,
- GRL_METADATA_KEY_DURATION);
+ GUINT_TO_POINTER(GRL_METADATA_KEY_DURATION));
}
- source->priv->grilo_keys = g_list_prepend (source->priv->grilo_keys, GRL_METADATA_KEY_CHILDCOUNT);
- source->priv->grilo_keys = g_list_prepend (source->priv->grilo_keys, GRL_METADATA_KEY_URL);
- source->priv->grilo_keys = g_list_prepend (source->priv->grilo_keys, GRL_METADATA_KEY_THUMBNAIL);
+ source->priv->grilo_keys = g_list_prepend (source->priv->grilo_keys, GUINT_TO_POINTER(GRL_METADATA_KEY_CHILDCOUNT));
+ source->priv->grilo_keys = g_list_prepend (source->priv->grilo_keys, GUINT_TO_POINTER(GRL_METADATA_KEY_URL));
+ source->priv->grilo_keys = g_list_prepend (source->priv->grilo_keys, GUINT_TO_POINTER(GRL_METADATA_KEY_THUMBNAIL));
/* probably add an image column too? */
source->priv->browser_model = gtk_tree_store_new (4, GRL_TYPE_MEDIA, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT);
@@ -405,7 +405,7 @@ rb_grilo_source_constructed (GObject *object)
}
RBSource *
-rb_grilo_source_new (GObject *plugin, GrlMediaSource *grilo_source)
+rb_grilo_source_new (GObject *plugin, GrlSource *grilo_source)
{
GObject *source;
RBShell *shell;
@@ -546,7 +546,7 @@ create_entry_for_media (RhythmDB *db, RhythmDBEntryTyp
set_string_prop_from_key (db, entry, RHYTHMDB_PROP_GENRE, data, GRL_METADATA_KEY_GENRE);
set_string_prop_from_key (db, entry, RHYTHMDB_PROP_TITLE, data, GRL_METADATA_KEY_TITLE);
- if (grl_data_has_key (data, GRL_METADATA_KEY_DATE)) {
+ if (grl_data_has_key (data, GRL_METADATA_KEY_PUBLICATION_DATE)) {
/* something - grilo has this as a string? */
}
@@ -643,7 +643,7 @@ set_container_type (RBGriloSource *source, GtkTreeIter
}
static void
-grilo_browse_cb (GrlMediaSource *grilo_source, guint operation_id, GrlMedia *media, guint remaining, RBGriloSource *source, const GError *error)
+grilo_browse_cb (GrlSource *grilo_source, guint operation_id, GrlMedia *media, guint remaining, RBGriloSource *source, const GError *error)
{
if (operation_id != source->priv->browse_op) {
return;
@@ -751,7 +751,7 @@ browse_next (RBGriloSource *source)
source->priv->browse_position,
CONTAINER_FETCH_SIZE,
GRL_RESOLVE_NORMAL,
- (GrlMediaSourceResultCb) grilo_browse_cb,
+ (GrlSourceResultCb) grilo_browse_cb,
source);
}
@@ -784,7 +784,7 @@ start_browse (RBGriloSource *source, GrlMedia *contain
static void media_browse_next (RBGriloSource *source);
static void
-grilo_media_browse_cb (GrlMediaSource *grilo_source, guint operation_id, GrlMedia *media, guint remaining, RBGriloSource *source, const GError *error)
+grilo_media_browse_cb (GrlSource *grilo_source, guint operation_id, GrlMedia *media, guint remaining, RBGriloSource *source, const GError *error)
{
if (operation_id != source->priv->media_browse_op) {
return;
@@ -871,7 +871,7 @@ media_browse_next (RBGriloSource *source)
source->priv->media_browse_position,
CONTAINER_FETCH_SIZE,
GRL_RESOLVE_NORMAL,
- (GrlMediaSourceResultCb) grilo_media_browse_cb,
+ (GrlSourceResultCb) grilo_media_browse_cb,
source);
} else {
source->priv->media_browse_op =
@@ -881,7 +881,7 @@ media_browse_next (RBGriloSource *source)
source->priv->media_browse_position,
CONTAINER_FETCH_SIZE,
GRL_RESOLVE_NORMAL,
- (GrlMediaSourceResultCb) grilo_media_browse_cb,
+ (GrlSourceResultCb) grilo_media_browse_cb,
source);
}
}

18
audio/rhythmbox/patches/patch-plugins_grilo_rb-grilo-source_h
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-plugins_grilo_rb-grilo-source_h,v 1.1 2012/09/29 12:20:14 ajacoutot Exp $
From 86eb47f705b2f0e6e8ba8d90073c961d47dbfb95 Mon Sep 17 00:00:00 2001
From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
Date: Fri, 17 Aug 2012 13:28:05 +0000
Subject: grilo: Port to the grilo 0.2 API
--- plugins/grilo/rb-grilo-source.h.orig Thu Apr 26 12:31:19 2012
+++ plugins/grilo/rb-grilo-source.h Sat Sep 29 14:05:14 2012
@@ -72,7 +72,7 @@ typedef struct
} RBGriloEntryData;
RBSource * rb_grilo_source_new (GObject *plugin,
- GrlMediaSource *grilo_source);
+ GrlSource *grilo_source);
GType rb_grilo_source_get_type (void);
void _rb_grilo_source_register_type (GTypeModule *module);

17
audio/rhythmbox/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.35 2012/09/29 12:20:14 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.36 2012/09/30 14:58:39 ajacoutot Exp $
@bin bin/rhythmbox
@bin bin/rhythmbox-client
include/rhythmbox/
@ -72,6 +72,7 @@ include/rhythmbox/widgets/rb-cell-renderer-rating.h
include/rhythmbox/widgets/rb-dialog.h
include/rhythmbox/widgets/rb-entry-view.h
include/rhythmbox/widgets/rb-fading-image.h
include/rhythmbox/widgets/rb-import-dialog.h
include/rhythmbox/widgets/rb-library-browser.h
include/rhythmbox/widgets/rb-object-property-editor.h
include/rhythmbox/widgets/rb-property-view.h
@ -251,6 +252,18 @@ lib/rhythmbox/plugins/sendto/sendto.plugin
lib/rhythmbox/plugins/sendto/sendto.py
lib/rhythmbox/plugins/sendto/sendto.pyc
lib/rhythmbox/plugins/sendto/sendto.pyo
lib/rhythmbox/sample-plugins/
lib/rhythmbox/sample-plugins/sample/
lib/rhythmbox/sample-plugins/sample-python/
lib/rhythmbox/sample-plugins/sample-python/sample-python.plugin
lib/rhythmbox/sample-plugins/sample-python/sample-python.py
lib/rhythmbox/sample-plugins/sample-python/sample-python.pyc
lib/rhythmbox/sample-plugins/sample-python/sample-python.pyo
lib/rhythmbox/sample-plugins/sample-vala/
lib/rhythmbox/sample-plugins/sample-vala/libsample-vala.so
lib/rhythmbox/sample-plugins/sample-vala/sample-vala.plugin
lib/rhythmbox/sample-plugins/sample/libsample.so
lib/rhythmbox/sample-plugins/sample/sample.plugin
@bin libexec/rhythmbox-metadata
@man man/man1/rhythmbox-client.1
@man man/man1/rhythmbox.1
@ -679,6 +692,7 @@ share/locale/eo/LC_MESSAGES/rhythmbox.mo
share/locale/es/LC_MESSAGES/rhythmbox.mo
share/locale/et/LC_MESSAGES/rhythmbox.mo
share/locale/eu/LC_MESSAGES/rhythmbox.mo
share/locale/fa/LC_MESSAGES/rhythmbox.mo
share/locale/fi/LC_MESSAGES/rhythmbox.mo
share/locale/fr/LC_MESSAGES/rhythmbox.mo
share/locale/ga/LC_MESSAGES/rhythmbox.mo
@ -819,6 +833,7 @@ share/rhythmbox/icons/hicolor/scalable/places/
share/rhythmbox/icons/hicolor/scalable/places/library-internet-radio.svg
share/rhythmbox/icons/hicolor/scalable/places/playlist-automatic.svg
share/rhythmbox/icons/hicolor/scalable/places/playlist.svg
share/rhythmbox/import-dialog.ui
share/rhythmbox/library-prefs.ui
share/rhythmbox/media-player-properties.ui
share/rhythmbox/playback-prefs.ui