[arch-commits] Commit in rhythmbox/trunk (0001-Port-to-clutter-gst-3.0.patch PKGBUILD)

[Jan Steffens]

    Date: Thursday, October 19, 2017 @ 07:27:10
  Author: heftig
Revision: 308245

3.4.2+4+ge123ad533-1

Modified:
  rhythmbox/trunk/PKGBUILD
Deleted:
  rhythmbox/trunk/0001-Port-to-clutter-gst-3.0.patch

------------------------------------+
 0001-Port-to-clutter-gst-3.0.patch |   39 -----------------------------------
 PKGBUILD                           |   20 ++++++-----------
 2 files changed, 7 insertions(+), 52 deletions(-)

Deleted: 0001-Port-to-clutter-gst-3.0.patch
===================================================================
--- 0001-Port-to-clutter-gst-3.0.patch	2017-10-19 07:26:20 UTC (rev 308244)
+++ 0001-Port-to-clutter-gst-3.0.patch	2017-10-19 07:27:10 UTC (rev 308245)
@@ -1,39 +0,0 @@
-From 054925add713e715134f340dd7c873c928ad762f Mon Sep 17 00:00:00 2001
-From: Jan de Groot <jgc at archlinux.org>
-Date: Sun, 5 Feb 2017 13:10:30 +0000
-Subject: [PATCH] Port to clutter-gst-3.0
-
----
- configure.ac                            | 2 +-
- plugins/visualizer/rb-visualizer-page.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 16afcfff6..effbd44d0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -681,7 +681,7 @@ if test "x$enable_visualizer" != "xno"; then
- 	PKG_CHECK_MODULES(CLUTTER,
- 			  clutter-1.0 >= 1.8			\
- 			  clutter-x11-1.0 >= 1.8		\
--			  clutter-gst-2.0				\
-+			  clutter-gst-3.0				\
- 			  clutter-gtk-1.0 >= 1.0		\
- 			  mx-1.0 >= 1.0.1,
- 			  have_clutter=yes,
-diff --git a/plugins/visualizer/rb-visualizer-page.c b/plugins/visualizer/rb-visualizer-page.c
-index 417984335..5b03e7748 100644
---- a/plugins/visualizer/rb-visualizer-page.c
-+++ b/plugins/visualizer/rb-visualizer-page.c
-@@ -352,7 +352,7 @@ impl_constructed (GObject *object)
- 	g_object_ref (page->sink);
- 
- 	/* actual sink */
--	realsink = gst_element_factory_make ("cluttersink", NULL);
-+	realsink = GST_ELEMENT (clutter_gst_video_sink_new ());
- 	g_object_set (realsink, "texture", page->texture, NULL);
- 
- 	videoconvert = gst_element_factory_make ("videoconvert", NULL);
--- 
-2.11.1
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-19 07:26:20 UTC (rev 308244)
+++ PKGBUILD	2017-10-19 07:27:10 UTC (rev 308245)
@@ -3,8 +3,8 @@
 # Contributor: Giovanni Scafora <giovanni at archlinux.org>
 
 pkgname=rhythmbox
-pkgver=3.4.1
-pkgrel=3
+pkgver=3.4.2+4+ge123ad533
+pkgrel=1
 pkgdesc="Music playback and management application"
 arch=(i686 x86_64)
 license=(GPL)
@@ -12,7 +12,7 @@
 depends=(dconf gst-plugins-base gst-plugins-good libsoup json-glib libnotify libpeas
          media-player-info totem-plparser tdb python-gobject libgudev grilo)
 makedepends=(itstool intltool brasero gobject-introspection vala grilo libdmapsharing lirc libgpod
-             libmtp gtk-doc clutter-gst clutter-gtk mx yelp-tools git)
+             libmtp gtk-doc yelp-tools git)
 checkdepends=(check xorg-server-xvfb)
 optdepends=('gst-plugins-ugly: Extra media codecs'
             'gst-plugins-bad: Extra media codecs'
@@ -23,16 +23,11 @@
             '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'
-            'clutter-gst: Visualiser plugin')
+            'gvfs-mtp: Portable Players - Android plugin')
 options=('!emptydirs')
-_commit=7f3624b6b4902932dc9df87ac55f5c71651260f7  # tags/v3.4.1^0
-source=("git+https://git.gnome.org/browse/rhythmbox#commit=$_commit"
-        0001-Port-to-clutter-gst-3.0.patch)
-sha256sums=('SKIP'
-            '996e654effda4f1d081377c837d600fdca6b97319e7f4f55f0307d046aab6a59')
+_commit=e123ad533503b231f68612fcb92884c0f391c5b0  # master
+source=("git+https://git.gnome.org/browse/rhythmbox#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgname
@@ -41,7 +36,6 @@
 
 prepare() {
   cd $pkgname
-  patch -Np1 -i ../0001-Port-to-clutter-gst-3.0.patch
   NOCONFIGURE=1 ./autogen.sh
 }