Date: Thursday, July 28, 2016 @ 18:35:39
Author: heftig
Revision: 272637
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
rhythmbox/repos/extra-i686/PKGBUILD
(from rev 272636, rhythmbox/trunk/PKGBUILD)
rhythmbox/repos/extra-i686/rhythmbox-grilo-0.3.0.patch
(from rev 272636, rhythmbox/trunk/rhythmbox-grilo-0.3.0.patch)
rhythmbox/repos/extra-x86_64/PKGBUILD
(from rev 272636, rhythmbox/trunk/PKGBUILD)
rhythmbox/repos/extra-x86_64/rhythmbox-grilo-0.3.0.patch
(from rev 272636, rhythmbox/trunk/rhythmbox-grilo-0.3.0.patch)
Deleted:
rhythmbox/repos/extra-i686/PKGBUILD
rhythmbox/repos/extra-i686/rhythmbox-grilo-0.3.0.patch
rhythmbox/repos/extra-i686/rhythmbox.install
rhythmbox/repos/extra-x86_64/PKGBUILD
rhythmbox/repos/extra-x86_64/rhythmbox-grilo-0.3.0.patch
rhythmbox/repos/extra-x86_64/rhythmbox.install
------------------------------------------+
/PKGBUILD | 116 +++++++++++++++++
/rhythmbox-grilo-0.3.0.patch | 196 +++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 57 --------
extra-i686/rhythmbox-grilo-0.3.0.patch | 98 --------------
extra-i686/rhythmbox.install | 13 -
extra-x86_64/PKGBUILD | 57 --------
extra-x86_64/rhythmbox-grilo-0.3.0.patch | 98 --------------
extra-x86_64/rhythmbox.install | 13 -
8 files changed, 312 insertions(+), 336 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-07-28 18:35:19 UTC (rev 272636)
+++ extra-i686/PKGBUILD 2016-07-28 18:35:39 UTC (rev 272637)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <[email protected]>
-# Contributor: Giovanni Scafora <[email protected]>
-
-pkgname=rhythmbox
-pkgver=3.3.1
-pkgrel=1
-pkgdesc="An iTunes-like music playback and management application"
-arch=(i686 x86_64)
-license=(GPL)
-url="http://www.rhythmbox.org";
-depends=(dconf desktop-file-utils gst-plugins-base gst-plugins-good libsoup
json-glib libnotify libpeas media-player-info totem-plparser tdb webkit2gtk
python-gobject libgudev)
-makedepends=(itstool intltool brasero gobject-introspection vala grilo
libdmapsharing lirc libgpod libmtp gtk-doc clutter-gst2 clutter-gtk mx)
-optdepends=('gst-plugins-ugly: Extra media codecs'
- 'gst-plugins-bad: Extra media codecs'
- 'gst-libav: Extra media codecs'
- 'brasero: Audio CD Recorder plugin'
- 'libdmapsharing: DAAP Music Sharing plugin'
- 'grilo-plugins: Grilo media browser plugin'
- 'lirc: LIRC plugin'
- 'libgpod: Portable Players - iPod plugin'
- 'libmtp: Portable Players - MTP plugin'
- 'gvfs-mtp: Portable Players - Android plugin'
- 'mx: Visualiser plugin'
- 'clutter-gtk: Visualiser plugin')
-options=('!emptydirs')
-install=rhythmbox.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz
- rhythmbox-grilo-0.3.0.patch)
-sha256sums=('ef3c1023ed05025cd2aaed9ca83bf9bc557e4e8da660d7f31c5e3158fda93c61'
- 'c84098f0706ad330204cc1c30b670c17b28cf3e501b987dd092a0df2bea27c40')
-
-prepare() {
- cd $pkgname-$pkgver
- patch -Np1 -i ../rhythmbox-grilo-0.3.0.patch
-}
-
-build() {
- cd "$pkgname-$pkgver"
- NOCONFIGURE=1 ./autogen.sh
- ./configure --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/rhythmbox \
- --localstatedir=/var --disable-static \
- --enable-daap --enable-python --enable-vala
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=655517
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
-}
-
-package() {
- cd "$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
- rm -r "$pkgdir/usr/lib/rhythmbox/sample-plugins"
- rm -r "$pkgdir/usr/lib/rhythmbox/plugins/rbzeitgeist"
-}
Copied: rhythmbox/repos/extra-i686/PKGBUILD (from rev 272636,
rhythmbox/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-07-28 18:35:39 UTC (rev 272637)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Jan de Groot <[email protected]>
+# Contributor: Giovanni Scafora <[email protected]>
+
+pkgname=rhythmbox
+pkgver=3.3.1
+pkgrel=2
+pkgdesc="Music playback and management application"
+arch=(i686 x86_64)
+license=(GPL)
+url="https://wiki.gnome.org/Apps/Rhythmbox";
+depends=(dconf gst-plugins-base gst-plugins-good libsoup json-glib libnotify
libpeas
+ media-player-info totem-plparser tdb webkit2gtk python-gobject
libgudev)
+makedepends=(itstool intltool brasero gobject-introspection vala grilo
libdmapsharing lirc libgpod
+ libmtp gtk-doc clutter-gst2 clutter-gtk mx)
+optdepends=('gst-plugins-ugly: Extra media codecs'
+ 'gst-plugins-bad: Extra media codecs'
+ 'gst-libav: Extra media codecs'
+ 'brasero: Audio CD Recorder plugin'
+ 'libdmapsharing: DAAP Music Sharing plugin'
+ 'grilo-plugins: Grilo media browser plugin'
+ 'lirc: LIRC plugin'
+ 'libgpod: Portable Players - iPod plugin'
+ 'libmtp: Portable Players - MTP plugin'
+ 'gvfs-mtp: Portable Players - Android plugin'
+ 'mx: Visualiser plugin'
+ 'clutter-gtk: Visualiser plugin')
+options=('!emptydirs')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz
+ rhythmbox-grilo-0.3.0.patch)
+sha256sums=('ef3c1023ed05025cd2aaed9ca83bf9bc557e4e8da660d7f31c5e3158fda93c61'
+ 'c84098f0706ad330204cc1c30b670c17b28cf3e501b987dd092a0df2bea27c40')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../rhythmbox-grilo-0.3.0.patch
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+ NOCONFIGURE=1 ./autogen.sh
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --libexecdir=/usr/lib/rhythmbox \
+ --localstatedir=/var --disable-static \
+ --enable-daap --enable-python --enable-vala
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+ rm -r "$pkgdir/usr/lib/rhythmbox/sample-plugins"
+ rm -r "$pkgdir/usr/lib/rhythmbox/plugins/rbzeitgeist"
+}
Deleted: extra-i686/rhythmbox-grilo-0.3.0.patch
===================================================================
--- extra-i686/rhythmbox-grilo-0.3.0.patch 2016-07-28 18:35:19 UTC (rev
272636)
+++ extra-i686/rhythmbox-grilo-0.3.0.patch 2016-07-28 18:35:39 UTC (rev
272637)
@@ -1,98 +0,0 @@
-From af7aab21f2ed0d837ddf583126f7dbfd88a69627 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <[email protected]>
-Date: Thu, 17 Dec 2015 13:42:12 +0100
-Subject: [PATCH] grilo: Port to 0.3.0
-
-https://bugzilla.gnome.org/show_bug.cgi?id=759589
----
- configure.ac | 4 ++--
- plugins/grilo/rb-grilo-plugin.c | 2 +-
- plugins/grilo/rb-grilo-source.c | 10 +++++-----
- 3 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4457182..1929905 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -54,7 +54,7 @@ LIBSOUP_REQS=2.34.0
- GUDEV_REQS=143
- LIBMTP_REQS=0.3.0
- LIBPEAS_REQS=0.7.3
--GRILO_REQS=0.2.0
-+GRILO_REQS=0.3.0
- LIBXML2_REQS=2.7.8
- LIBSECRET_REQS=0.18
-
-@@ -714,7 +714,7 @@ AC_ARG_ENABLE(grilo,
- [Disable Grilo support]),,
- enable_grilo=auto)
- if test "x$enable_grilo" != "xno"; then
-- PKG_CHECK_MODULES(GRILO, grilo-0.2 >= $GRILO_REQS, have_grilo=yes,
have_grilo=no)
-+ PKG_CHECK_MODULES(GRILO, grilo-0.3 >= $GRILO_REQS, have_grilo=yes,
have_grilo=no)
- if test "x$have_grilo" = "xno" -a "x$enable_grilo" = "xyes"; then
- AC_MSG_ERROR([Grilo support explicitly requested, but grilo
couldn not be found])
- fi
-diff --git a/plugins/grilo/rb-grilo-plugin.c b/plugins/grilo/rb-grilo-plugin.c
-index 2816be2..5c56b93 100644
---- a/plugins/grilo/rb-grilo-plugin.c
-+++ b/plugins/grilo/rb-grilo-plugin.c
-@@ -213,7 +213,7 @@ impl_activate (PeasActivatable *plugin)
- pi->registry = grl_registry_get_default ();
- g_signal_connect (pi->registry, "source-added", G_CALLBACK
(grilo_source_added_cb), pi);
- g_signal_connect (pi->registry, "source-removed", G_CALLBACK
(grilo_source_removed_cb), pi);
-- if (grl_registry_load_all_plugins (pi->registry, &error) == FALSE) {
-+ if (grl_registry_load_all_plugins (pi->registry, TRUE, &error) ==
FALSE) {
- g_warning ("Failed to load Grilo plugins: %s", error->message);
- g_clear_error (&error);
- }
-diff --git a/plugins/grilo/rb-grilo-source.c b/plugins/grilo/rb-grilo-source.c
-index 103e06b..22a9d11 100644
---- a/plugins/grilo/rb-grilo-source.c
-+++ b/plugins/grilo/rb-grilo-source.c
-@@ -524,7 +524,7 @@ make_operation_options (RBGriloSource *source,
GrlSupportedOps op, int position)
- grl_operation_options_set_count (options,
- CONTAINER_FETCH_SIZE);
- grl_operation_options_set_type_filter (options, GRL_TYPE_FILTER_AUDIO);
-- grl_operation_options_set_flags (options, GRL_RESOLVE_NORMAL);
-+ grl_operation_options_set_resolution_flags (options,
GRL_RESOLVE_NORMAL);
-
- return options;
- }
-@@ -684,7 +684,7 @@ grilo_browse_cb (GrlSource *grilo_source, guint
operation_id, GrlMedia *media, g
- source->priv->browse_position++;
- }
-
-- if (media && GRL_IS_MEDIA_BOX (media)) {
-+ if (media && grl_media_is_container (media)) {
-
- GtkTreeIter new_row;
- if (source->priv->browse_container == NULL) {
-@@ -724,7 +724,7 @@ grilo_browse_cb (GrlSource *grilo_source, guint
operation_id, GrlMedia *media, g
- 2, CONTAINER_MARKER,
- 3, 0,
- -1);
-- } else if (media && GRL_IS_MEDIA_AUDIO (media)) {
-+ } else if (media && grl_media_is_audio (media)) {
- source->priv->browse_got_media = TRUE;
- }
-
-@@ -854,7 +854,7 @@ grilo_media_browse_cb (GrlSource *grilo_source, guint
operation_id, GrlMedia *me
- source->priv->media_browse_got_results = TRUE;
- source->priv->media_browse_position++;
-
-- if (GRL_IS_MEDIA_AUDIO (media)) {
-+ if (grl_media_is_audio (media)) {
- RhythmDBEntry *entry;
- entry = create_entry_for_media (source->priv->db,
-
source->priv->entry_type,
-@@ -863,7 +863,7 @@ grilo_media_browse_cb (GrlSource *grilo_source, guint
operation_id, GrlMedia *me
- if (entry != NULL) {
- rhythmdb_query_model_add_entry
(source->priv->query_model, entry, -1);
- }
-- } else if (GRL_IS_MEDIA_BOX (media)) {
-+ } else if (grl_media_is_container (media)) {
- source->priv->media_browse_got_containers = TRUE;
- }
- }
---
-2.5.0
\ No newline at end of file
Copied: rhythmbox/repos/extra-i686/rhythmbox-grilo-0.3.0.patch (from rev
272636, rhythmbox/trunk/rhythmbox-grilo-0.3.0.patch)
===================================================================
--- extra-i686/rhythmbox-grilo-0.3.0.patch (rev 0)
+++ extra-i686/rhythmbox-grilo-0.3.0.patch 2016-07-28 18:35:39 UTC (rev
272637)
@@ -0,0 +1,98 @@
+From af7aab21f2ed0d837ddf583126f7dbfd88a69627 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <[email protected]>
+Date: Thu, 17 Dec 2015 13:42:12 +0100
+Subject: [PATCH] grilo: Port to 0.3.0
+
+https://bugzilla.gnome.org/show_bug.cgi?id=759589
+---
+ configure.ac | 4 ++--
+ plugins/grilo/rb-grilo-plugin.c | 2 +-
+ plugins/grilo/rb-grilo-source.c | 10 +++++-----
+ 3 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4457182..1929905 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -54,7 +54,7 @@ LIBSOUP_REQS=2.34.0
+ GUDEV_REQS=143
+ LIBMTP_REQS=0.3.0
+ LIBPEAS_REQS=0.7.3
+-GRILO_REQS=0.2.0
++GRILO_REQS=0.3.0
+ LIBXML2_REQS=2.7.8
+ LIBSECRET_REQS=0.18
+
+@@ -714,7 +714,7 @@ AC_ARG_ENABLE(grilo,
+ [Disable Grilo support]),,
+ enable_grilo=auto)
+ if test "x$enable_grilo" != "xno"; then
+- PKG_CHECK_MODULES(GRILO, grilo-0.2 >= $GRILO_REQS, have_grilo=yes,
have_grilo=no)
++ PKG_CHECK_MODULES(GRILO, grilo-0.3 >= $GRILO_REQS, have_grilo=yes,
have_grilo=no)
+ if test "x$have_grilo" = "xno" -a "x$enable_grilo" = "xyes"; then
+ AC_MSG_ERROR([Grilo support explicitly requested, but grilo
couldn not be found])
+ fi
+diff --git a/plugins/grilo/rb-grilo-plugin.c b/plugins/grilo/rb-grilo-plugin.c
+index 2816be2..5c56b93 100644
+--- a/plugins/grilo/rb-grilo-plugin.c
++++ b/plugins/grilo/rb-grilo-plugin.c
+@@ -213,7 +213,7 @@ impl_activate (PeasActivatable *plugin)
+ pi->registry = grl_registry_get_default ();
+ g_signal_connect (pi->registry, "source-added", G_CALLBACK
(grilo_source_added_cb), pi);
+ g_signal_connect (pi->registry, "source-removed", G_CALLBACK
(grilo_source_removed_cb), pi);
+- if (grl_registry_load_all_plugins (pi->registry, &error) == FALSE) {
++ if (grl_registry_load_all_plugins (pi->registry, TRUE, &error) ==
FALSE) {
+ g_warning ("Failed to load Grilo plugins: %s", error->message);
+ g_clear_error (&error);
+ }
+diff --git a/plugins/grilo/rb-grilo-source.c b/plugins/grilo/rb-grilo-source.c
+index 103e06b..22a9d11 100644
+--- a/plugins/grilo/rb-grilo-source.c
++++ b/plugins/grilo/rb-grilo-source.c
+@@ -524,7 +524,7 @@ make_operation_options (RBGriloSource *source,
GrlSupportedOps op, int position)
+ grl_operation_options_set_count (options,
+ CONTAINER_FETCH_SIZE);
+ grl_operation_options_set_type_filter (options, GRL_TYPE_FILTER_AUDIO);
+- grl_operation_options_set_flags (options, GRL_RESOLVE_NORMAL);
++ grl_operation_options_set_resolution_flags (options,
GRL_RESOLVE_NORMAL);
+
+ return options;
+ }
+@@ -684,7 +684,7 @@ grilo_browse_cb (GrlSource *grilo_source, guint
operation_id, GrlMedia *media, g
+ source->priv->browse_position++;
+ }
+
+- if (media && GRL_IS_MEDIA_BOX (media)) {
++ if (media && grl_media_is_container (media)) {
+
+ GtkTreeIter new_row;
+ if (source->priv->browse_container == NULL) {
+@@ -724,7 +724,7 @@ grilo_browse_cb (GrlSource *grilo_source, guint
operation_id, GrlMedia *media, g
+ 2, CONTAINER_MARKER,
+ 3, 0,
+ -1);
+- } else if (media && GRL_IS_MEDIA_AUDIO (media)) {
++ } else if (media && grl_media_is_audio (media)) {
+ source->priv->browse_got_media = TRUE;
+ }
+
+@@ -854,7 +854,7 @@ grilo_media_browse_cb (GrlSource *grilo_source, guint
operation_id, GrlMedia *me
+ source->priv->media_browse_got_results = TRUE;
+ source->priv->media_browse_position++;
+
+- if (GRL_IS_MEDIA_AUDIO (media)) {
++ if (grl_media_is_audio (media)) {
+ RhythmDBEntry *entry;
+ entry = create_entry_for_media (source->priv->db,
+
source->priv->entry_type,
+@@ -863,7 +863,7 @@ grilo_media_browse_cb (GrlSource *grilo_source, guint
operation_id, GrlMedia *me
+ if (entry != NULL) {
+ rhythmdb_query_model_add_entry
(source->priv->query_model, entry, -1);
+ }
+- } else if (GRL_IS_MEDIA_BOX (media)) {
++ } else if (grl_media_is_container (media)) {
+ source->priv->media_browse_got_containers = TRUE;
+ }
+ }
+--
+2.5.0
\ No newline at end of file
Deleted: extra-i686/rhythmbox.install
===================================================================
--- extra-i686/rhythmbox.install 2016-07-28 18:35:19 UTC (rev 272636)
+++ extra-i686/rhythmbox.install 2016-07-28 18:35:39 UTC (rev 272637)
@@ -1,13 +0,0 @@
-post_install() {
- glib-compile-schemas /usr/share/glib-2.0/schemas
- update-desktop-database -q
- gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-07-28 18:35:19 UTC (rev 272636)
+++ extra-x86_64/PKGBUILD 2016-07-28 18:35:39 UTC (rev 272637)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <[email protected]>
-# Contributor: Giovanni Scafora <[email protected]>
-
-pkgname=rhythmbox
-pkgver=3.3.1
-pkgrel=1
-pkgdesc="An iTunes-like music playback and management application"
-arch=(i686 x86_64)
-license=(GPL)
-url="http://www.rhythmbox.org";
-depends=(dconf desktop-file-utils gst-plugins-base gst-plugins-good libsoup
json-glib libnotify libpeas media-player-info totem-plparser tdb webkit2gtk
python-gobject libgudev)
-makedepends=(itstool intltool brasero gobject-introspection vala grilo
libdmapsharing lirc libgpod libmtp gtk-doc clutter-gst2 clutter-gtk mx)
-optdepends=('gst-plugins-ugly: Extra media codecs'
- 'gst-plugins-bad: Extra media codecs'
- 'gst-libav: Extra media codecs'
- 'brasero: Audio CD Recorder plugin'
- 'libdmapsharing: DAAP Music Sharing plugin'
- 'grilo-plugins: Grilo media browser plugin'
- 'lirc: LIRC plugin'
- 'libgpod: Portable Players - iPod plugin'
- 'libmtp: Portable Players - MTP plugin'
- 'gvfs-mtp: Portable Players - Android plugin'
- 'mx: Visualiser plugin'
- 'clutter-gtk: Visualiser plugin')
-options=('!emptydirs')
-install=rhythmbox.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz
- rhythmbox-grilo-0.3.0.patch)
-sha256sums=('ef3c1023ed05025cd2aaed9ca83bf9bc557e4e8da660d7f31c5e3158fda93c61'
- 'c84098f0706ad330204cc1c30b670c17b28cf3e501b987dd092a0df2bea27c40')
-
-prepare() {
- cd $pkgname-$pkgver
- patch -Np1 -i ../rhythmbox-grilo-0.3.0.patch
-}
-
-build() {
- cd "$pkgname-$pkgver"
- NOCONFIGURE=1 ./autogen.sh
- ./configure --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/rhythmbox \
- --localstatedir=/var --disable-static \
- --enable-daap --enable-python --enable-vala
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=655517
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
-}
-
-package() {
- cd "$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
- rm -r "$pkgdir/usr/lib/rhythmbox/sample-plugins"
- rm -r "$pkgdir/usr/lib/rhythmbox/plugins/rbzeitgeist"
-}
Copied: rhythmbox/repos/extra-x86_64/PKGBUILD (from rev 272636,
rhythmbox/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-07-28 18:35:39 UTC (rev 272637)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Jan de Groot <[email protected]>
+# Contributor: Giovanni Scafora <[email protected]>
+
+pkgname=rhythmbox
+pkgver=3.3.1
+pkgrel=2
+pkgdesc="Music playback and management application"
+arch=(i686 x86_64)
+license=(GPL)
+url="https://wiki.gnome.org/Apps/Rhythmbox";
+depends=(dconf gst-plugins-base gst-plugins-good libsoup json-glib libnotify
libpeas
+ media-player-info totem-plparser tdb webkit2gtk python-gobject
libgudev)
+makedepends=(itstool intltool brasero gobject-introspection vala grilo
libdmapsharing lirc libgpod
+ libmtp gtk-doc clutter-gst2 clutter-gtk mx)
+optdepends=('gst-plugins-ugly: Extra media codecs'
+ 'gst-plugins-bad: Extra media codecs'
+ 'gst-libav: Extra media codecs'
+ 'brasero: Audio CD Recorder plugin'
+ 'libdmapsharing: DAAP Music Sharing plugin'
+ 'grilo-plugins: Grilo media browser plugin'
+ 'lirc: LIRC plugin'
+ 'libgpod: Portable Players - iPod plugin'
+ 'libmtp: Portable Players - MTP plugin'
+ 'gvfs-mtp: Portable Players - Android plugin'
+ 'mx: Visualiser plugin'
+ 'clutter-gtk: Visualiser plugin')
+options=('!emptydirs')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz
+ rhythmbox-grilo-0.3.0.patch)
+sha256sums=('ef3c1023ed05025cd2aaed9ca83bf9bc557e4e8da660d7f31c5e3158fda93c61'
+ 'c84098f0706ad330204cc1c30b670c17b28cf3e501b987dd092a0df2bea27c40')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../rhythmbox-grilo-0.3.0.patch
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+ NOCONFIGURE=1 ./autogen.sh
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --libexecdir=/usr/lib/rhythmbox \
+ --localstatedir=/var --disable-static \
+ --enable-daap --enable-python --enable-vala
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+ rm -r "$pkgdir/usr/lib/rhythmbox/sample-plugins"
+ rm -r "$pkgdir/usr/lib/rhythmbox/plugins/rbzeitgeist"
+}
Deleted: extra-x86_64/rhythmbox-grilo-0.3.0.patch
===================================================================
--- extra-x86_64/rhythmbox-grilo-0.3.0.patch 2016-07-28 18:35:19 UTC (rev
272636)
+++ extra-x86_64/rhythmbox-grilo-0.3.0.patch 2016-07-28 18:35:39 UTC (rev
272637)
@@ -1,98 +0,0 @@
-From af7aab21f2ed0d837ddf583126f7dbfd88a69627 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <[email protected]>
-Date: Thu, 17 Dec 2015 13:42:12 +0100
-Subject: [PATCH] grilo: Port to 0.3.0
-
-https://bugzilla.gnome.org/show_bug.cgi?id=759589
----
- configure.ac | 4 ++--
- plugins/grilo/rb-grilo-plugin.c | 2 +-
- plugins/grilo/rb-grilo-source.c | 10 +++++-----
- 3 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4457182..1929905 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -54,7 +54,7 @@ LIBSOUP_REQS=2.34.0
- GUDEV_REQS=143
- LIBMTP_REQS=0.3.0
- LIBPEAS_REQS=0.7.3
--GRILO_REQS=0.2.0
-+GRILO_REQS=0.3.0
- LIBXML2_REQS=2.7.8
- LIBSECRET_REQS=0.18
-
-@@ -714,7 +714,7 @@ AC_ARG_ENABLE(grilo,
- [Disable Grilo support]),,
- enable_grilo=auto)
- if test "x$enable_grilo" != "xno"; then
-- PKG_CHECK_MODULES(GRILO, grilo-0.2 >= $GRILO_REQS, have_grilo=yes,
have_grilo=no)
-+ PKG_CHECK_MODULES(GRILO, grilo-0.3 >= $GRILO_REQS, have_grilo=yes,
have_grilo=no)
- if test "x$have_grilo" = "xno" -a "x$enable_grilo" = "xyes"; then
- AC_MSG_ERROR([Grilo support explicitly requested, but grilo
couldn not be found])
- fi
-diff --git a/plugins/grilo/rb-grilo-plugin.c b/plugins/grilo/rb-grilo-plugin.c
-index 2816be2..5c56b93 100644
---- a/plugins/grilo/rb-grilo-plugin.c
-+++ b/plugins/grilo/rb-grilo-plugin.c
-@@ -213,7 +213,7 @@ impl_activate (PeasActivatable *plugin)
- pi->registry = grl_registry_get_default ();
- g_signal_connect (pi->registry, "source-added", G_CALLBACK
(grilo_source_added_cb), pi);
- g_signal_connect (pi->registry, "source-removed", G_CALLBACK
(grilo_source_removed_cb), pi);
-- if (grl_registry_load_all_plugins (pi->registry, &error) == FALSE) {
-+ if (grl_registry_load_all_plugins (pi->registry, TRUE, &error) ==
FALSE) {
- g_warning ("Failed to load Grilo plugins: %s", error->message);
- g_clear_error (&error);
- }
-diff --git a/plugins/grilo/rb-grilo-source.c b/plugins/grilo/rb-grilo-source.c
-index 103e06b..22a9d11 100644
---- a/plugins/grilo/rb-grilo-source.c
-+++ b/plugins/grilo/rb-grilo-source.c
-@@ -524,7 +524,7 @@ make_operation_options (RBGriloSource *source,
GrlSupportedOps op, int position)
- grl_operation_options_set_count (options,
- CONTAINER_FETCH_SIZE);
- grl_operation_options_set_type_filter (options, GRL_TYPE_FILTER_AUDIO);
-- grl_operation_options_set_flags (options, GRL_RESOLVE_NORMAL);
-+ grl_operation_options_set_resolution_flags (options,
GRL_RESOLVE_NORMAL);
-
- return options;
- }
-@@ -684,7 +684,7 @@ grilo_browse_cb (GrlSource *grilo_source, guint
operation_id, GrlMedia *media, g
- source->priv->browse_position++;
- }
-
-- if (media && GRL_IS_MEDIA_BOX (media)) {
-+ if (media && grl_media_is_container (media)) {
-
- GtkTreeIter new_row;
- if (source->priv->browse_container == NULL) {
-@@ -724,7 +724,7 @@ grilo_browse_cb (GrlSource *grilo_source, guint
operation_id, GrlMedia *media, g
- 2, CONTAINER_MARKER,
- 3, 0,
- -1);
-- } else if (media && GRL_IS_MEDIA_AUDIO (media)) {
-+ } else if (media && grl_media_is_audio (media)) {
- source->priv->browse_got_media = TRUE;
- }
-
-@@ -854,7 +854,7 @@ grilo_media_browse_cb (GrlSource *grilo_source, guint
operation_id, GrlMedia *me
- source->priv->media_browse_got_results = TRUE;
- source->priv->media_browse_position++;
-
-- if (GRL_IS_MEDIA_AUDIO (media)) {
-+ if (grl_media_is_audio (media)) {
- RhythmDBEntry *entry;
- entry = create_entry_for_media (source->priv->db,
-
source->priv->entry_type,
-@@ -863,7 +863,7 @@ grilo_media_browse_cb (GrlSource *grilo_source, guint
operation_id, GrlMedia *me
- if (entry != NULL) {
- rhythmdb_query_model_add_entry
(source->priv->query_model, entry, -1);
- }
-- } else if (GRL_IS_MEDIA_BOX (media)) {
-+ } else if (grl_media_is_container (media)) {
- source->priv->media_browse_got_containers = TRUE;
- }
- }
---
-2.5.0
\ No newline at end of file
Copied: rhythmbox/repos/extra-x86_64/rhythmbox-grilo-0.3.0.patch (from rev
272636, rhythmbox/trunk/rhythmbox-grilo-0.3.0.patch)
===================================================================
--- extra-x86_64/rhythmbox-grilo-0.3.0.patch (rev 0)
+++ extra-x86_64/rhythmbox-grilo-0.3.0.patch 2016-07-28 18:35:39 UTC (rev
272637)
@@ -0,0 +1,98 @@
+From af7aab21f2ed0d837ddf583126f7dbfd88a69627 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <[email protected]>
+Date: Thu, 17 Dec 2015 13:42:12 +0100
+Subject: [PATCH] grilo: Port to 0.3.0
+
+https://bugzilla.gnome.org/show_bug.cgi?id=759589
+---
+ configure.ac | 4 ++--
+ plugins/grilo/rb-grilo-plugin.c | 2 +-
+ plugins/grilo/rb-grilo-source.c | 10 +++++-----
+ 3 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4457182..1929905 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -54,7 +54,7 @@ LIBSOUP_REQS=2.34.0
+ GUDEV_REQS=143
+ LIBMTP_REQS=0.3.0
+ LIBPEAS_REQS=0.7.3
+-GRILO_REQS=0.2.0
++GRILO_REQS=0.3.0
+ LIBXML2_REQS=2.7.8
+ LIBSECRET_REQS=0.18
+
+@@ -714,7 +714,7 @@ AC_ARG_ENABLE(grilo,
+ [Disable Grilo support]),,
+ enable_grilo=auto)
+ if test "x$enable_grilo" != "xno"; then
+- PKG_CHECK_MODULES(GRILO, grilo-0.2 >= $GRILO_REQS, have_grilo=yes,
have_grilo=no)
++ PKG_CHECK_MODULES(GRILO, grilo-0.3 >= $GRILO_REQS, have_grilo=yes,
have_grilo=no)
+ if test "x$have_grilo" = "xno" -a "x$enable_grilo" = "xyes"; then
+ AC_MSG_ERROR([Grilo support explicitly requested, but grilo
couldn not be found])
+ fi
+diff --git a/plugins/grilo/rb-grilo-plugin.c b/plugins/grilo/rb-grilo-plugin.c
+index 2816be2..5c56b93 100644
+--- a/plugins/grilo/rb-grilo-plugin.c
++++ b/plugins/grilo/rb-grilo-plugin.c
+@@ -213,7 +213,7 @@ impl_activate (PeasActivatable *plugin)
+ pi->registry = grl_registry_get_default ();
+ g_signal_connect (pi->registry, "source-added", G_CALLBACK
(grilo_source_added_cb), pi);
+ g_signal_connect (pi->registry, "source-removed", G_CALLBACK
(grilo_source_removed_cb), pi);
+- if (grl_registry_load_all_plugins (pi->registry, &error) == FALSE) {
++ if (grl_registry_load_all_plugins (pi->registry, TRUE, &error) ==
FALSE) {
+ g_warning ("Failed to load Grilo plugins: %s", error->message);
+ g_clear_error (&error);
+ }
+diff --git a/plugins/grilo/rb-grilo-source.c b/plugins/grilo/rb-grilo-source.c
+index 103e06b..22a9d11 100644
+--- a/plugins/grilo/rb-grilo-source.c
++++ b/plugins/grilo/rb-grilo-source.c
+@@ -524,7 +524,7 @@ make_operation_options (RBGriloSource *source,
GrlSupportedOps op, int position)
+ grl_operation_options_set_count (options,
+ CONTAINER_FETCH_SIZE);
+ grl_operation_options_set_type_filter (options, GRL_TYPE_FILTER_AUDIO);
+- grl_operation_options_set_flags (options, GRL_RESOLVE_NORMAL);
++ grl_operation_options_set_resolution_flags (options,
GRL_RESOLVE_NORMAL);
+
+ return options;
+ }
+@@ -684,7 +684,7 @@ grilo_browse_cb (GrlSource *grilo_source, guint
operation_id, GrlMedia *media, g
+ source->priv->browse_position++;
+ }
+
+- if (media && GRL_IS_MEDIA_BOX (media)) {
++ if (media && grl_media_is_container (media)) {
+
+ GtkTreeIter new_row;
+ if (source->priv->browse_container == NULL) {
+@@ -724,7 +724,7 @@ grilo_browse_cb (GrlSource *grilo_source, guint
operation_id, GrlMedia *media, g
+ 2, CONTAINER_MARKER,
+ 3, 0,
+ -1);
+- } else if (media && GRL_IS_MEDIA_AUDIO (media)) {
++ } else if (media && grl_media_is_audio (media)) {
+ source->priv->browse_got_media = TRUE;
+ }
+
+@@ -854,7 +854,7 @@ grilo_media_browse_cb (GrlSource *grilo_source, guint
operation_id, GrlMedia *me
+ source->priv->media_browse_got_results = TRUE;
+ source->priv->media_browse_position++;
+
+- if (GRL_IS_MEDIA_AUDIO (media)) {
++ if (grl_media_is_audio (media)) {
+ RhythmDBEntry *entry;
+ entry = create_entry_for_media (source->priv->db,
+
source->priv->entry_type,
+@@ -863,7 +863,7 @@ grilo_media_browse_cb (GrlSource *grilo_source, guint
operation_id, GrlMedia *me
+ if (entry != NULL) {
+ rhythmdb_query_model_add_entry
(source->priv->query_model, entry, -1);
+ }
+- } else if (GRL_IS_MEDIA_BOX (media)) {
++ } else if (grl_media_is_container (media)) {
+ source->priv->media_browse_got_containers = TRUE;
+ }
+ }
+--
+2.5.0
\ No newline at end of file
Deleted: extra-x86_64/rhythmbox.install
===================================================================
--- extra-x86_64/rhythmbox.install 2016-07-28 18:35:19 UTC (rev 272636)
+++ extra-x86_64/rhythmbox.install 2016-07-28 18:35:39 UTC (rev 272637)
@@ -1,13 +0,0 @@
-post_install() {
- glib-compile-schemas /usr/share/glib-2.0/schemas
- update-desktop-database -q
- gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
