reinit the tree, so we can have metadata

9 files changed, 350 insertions, 0 deletions

diff --git a/media-video/snappy/Manifest b/media-video/snappy/Manifest
new file mode 100644
index 000000000000..e3467d4a2e5f
--- /dev/null
+++ b/media-video/snappy/Manifest
@@ -0,0 +1,11 @@
+AUX snappy-1.0-clutter-1.22.patch 721 SHA256 01b4bf0b3000c4d8d91a76319b62eb1537ade46e3e9ff119b1d69382542fe2c2 SHA512 3d808cb79cfec5486726999586a307db0b7426d3250291120ec0e91c35ac8a1fdc5c9545fd58562160d836643396b094d1cbbdb4f1bca6d361c39f9662b203fe WHIRLPOOL 181b8fce9bada41873fd017ac592c771f11012f51a264a0dc0a0bebd8a614ef4fe7776e26659ea1b28f8cdd9c494e79b644ed89573f30233e5f499a0a3015d0b
+AUX snappy-1.0-clutter-gst-3.patch 3951 SHA256 597cec4abf73cc431cb65df858358a968bb1e1a7d3a3f6176f456eab9ad3e084 SHA512 18f550d91d84fc0cd350cee600454ff7b7103e9e17db877b3773817819fe8fcbb24882e3da84b83d3f0c2fd18c9494c34a9dd60a3712d2e0174bca3e49779104 WHIRLPOOL 5e438d18517f52c8946ab408d67cf9c33297b7daad7f79860376255f22180053ecb65979f543baae8197d2c899b09e5409727a6c1c7f07e3c6cd9ff1276e0500
+AUX snappy-1.0-configure1.patch 630 SHA256 19962a6d1566a9fd17ea19a68b8e476c0115ce8cb05d29ea8217dac45fa06dd9 SHA512 ce3a2fa09141bc99becf806c6c45895e785014bc2de877a53c710a9a7cbd5193990e623af75a07300f325770efc3fca2b357f94a18f2ce871800b231d3d84f1d WHIRLPOOL 296014b9ea94d6481910c13f340ec1d194072b0fa784268bf782151aeb01487db0017ce354a275ac41dfc295065b3d1690a46c7cd9c35fb2cb4e12b307259046
+AUX snappy-1.0-configure2.patch 699 SHA256 adbf9363966aca672f189462ecbf85face6c76d2e08ef41c3a5126348057a1b5 SHA512 71bcf47ee1e263a2e14af991f1aa134690df9db2b4279ae1de8a6100db4ad0c0083466a5f88f36d38e72b0389d1081442a0884f346710c42e211b6a2aa4f95b0 WHIRLPOOL db5c1152103ff8f4d204b6e715b603e66041d185807d645ec7f6de87458a5c94a3ee4fd52d1549f2953c11a056aba8041b7fdb0ab7cc5d3168173030e7d89431
+AUX snappy-1.0-string-concatenation.patch 921 SHA256 d8ba9b91bfb8816435365edd7d4c43f4e7dc97914f23cf851297903fba3358df SHA512 4ad47d7907ec77de2ffa866305ff23390915f7f6f27883e4a035e862116cd3e418addbd600954d2a52b8a8ae1c22803e57d672fddaf5e955da6e3110a950671e WHIRLPOOL 6644d189aa4285855b4b65e385adc5dcd600afd7b214ac58ba33c608d1f5b67dd4d6853967598b71119163a416940bc632a4fc08d0662371f47aaf6de74c5783
+AUX snappy-1.0-video-texture.patch 1126 SHA256 d98d35204ec97871fe025a63b76228c3b2cfcf2f21d5fb8a12c09e1939103267 SHA512 b139b5ed43ce85240015467330f17f244bcca59533d203c29d60955ba9992d8cca9f2715d928551fdb5cc92c0618ba60df6a51ffe798d19bbc0532dccf58a810 WHIRLPOOL b8991cf1b0d989c472ca319474156062308ef65b8d2cf7664a4e7cea4e0234f2cff3531d304a1ed4f7d3b1b896be2f9738f5bbaf6e0b0d5bd0b9df5a1d92a529
+DIST snappy-1.0.tar.xz 282964 SHA256 0d33a05c1ad3cc075b8b9bf38d45634ea5204159454597b0882dd6a8d9763f58 SHA512 d8a3fd3a598efde4d699cc8fa13bee1239917a877627b26d5d278af5fd1824f02acf5ce685f8bf994087b3374de9917a5aa4f6f6ebe94f385c8d3bf91887eca9 WHIRLPOOL 0dd3b30e6208b37af4e8476604c80718a1939481bb105f54338559f952f1cf78d5110b0dde8ba389a8bfe065a268ef6595b308a5c38289ae0f4b76c684969340
+EBUILD snappy-1.0-r1.ebuild 1360 SHA256 5b172a82277f77bdc31727102e63db34a280045a3951f978f61635944cf30db7 SHA512 e40cee3f9d1a7bcb0bee096b876e36afc7eef9f09fdeb43497b6ba2a1a8b471f30352d866324bd788dad45273f584389eb3cba7a88f499563999bc7676c0be26 WHIRLPOOL 26c72bcc10ec1146d39dba98109dffc5c34e90a92906847bdb1474720728c295c7f87157542a001aca1eb72d73c7804e17e74ebf8fe37fa0e70ce5367b403138
+MISC ChangeLog 3336 SHA256 fed9397d29a8802aee826c589434ee680f5009d7f2c76f6482f8189ef7df5c0a SHA512 7172f97a8e9899452a46443a70d66ee4a02933dc7b9adcc783ba0dca3640625ab34cd134cbc62204eb20faee00138259c7f323ddbc75855b326532c696b20eeb WHIRLPOOL ae9ae05f764707539a052fd69a77f10c7d6b7038cd7b20b7f70d904a77590017a78aa8b524ccb23fb2662674d55c7331072064917ef4eb540294a20ceb3dcfed
+MISC ChangeLog-2015 1599 SHA256 1f3c02fe3cda2b8e718502a97cf18e97cf08f9e0592fa5c548afc1ed2d0134be SHA512 07ad8328cf5fa604424236004e4b62f5aeac4262d28d0dc70dbfad0ae07df4a87d7be848579d42bcaa0b7294ecb2797868f637c59920eca5bdde4a43bff6daf3 WHIRLPOOL 4cd3b0e63ef4c2bc4cf893e39f1be158c40bcc4266689ffa28cdbe3bcd23fca482a55b976827a641a6b32b6e3c451b3f4967b081f7047db3451eb9f3f1fd081a
+MISC metadata.xml 393 SHA256 cfa267a9d71dbf2753d1694cbe9ef380fad34a1e66f83146092e4f13244db6dd SHA512 511964afd47b90bb56df75a1fffbbb39c0f6143e3677a7454338e731638099ee24593b0b7049c3d9ba6cf5e56b6dc655d8253f35cd184cc927395e0f871579f1 WHIRLPOOL 93be972a6b988ef0aa8ab07b21e22bef26fb362093ec348248086df974caf0f7dc3f861f2e934a6d65f6fd9dc0dd67b3d39040e5ef28fbe151ce2364ffd81ceb
diff --git a/media-video/snappy/files/snappy-1.0-clutter-1.22.patch b/media-video/snappy/files/snappy-1.0-clutter-1.22.patch
new file mode 100644
index 000000000000..f79d26786732
--- /dev/null
+++ b/media-video/snappy/files/snappy-1.0-clutter-1.22.patch
@@ -0,0 +1,25 @@
+From 529445d6fc5da3ea6e5c81051248b9d4818a1224 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 15 Apr 2015 15:46:14 +0200
+Subject: Set windowing backend to X11
+
+This required to work with Clutter 1.22.
+---
+ src/snappy.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/snappy.c b/src/snappy.c
+index 6054c88..c2bb2d0 100644
+--- a/src/snappy.c
++++ b/src/snappy.c
+@@ -179,6 +179,7 @@ main (int argc, char *argv[])
+ 
+   context = g_option_context_new ("<media file> - Play movie files");
+ 
++  clutter_set_windowing_backend (CLUTTER_WINDOWING_X11);
+   ci_err = gtk_clutter_init (&argc, &argv);
+   if (ci_err != CLUTTER_INIT_SUCCESS)
+     goto quit;
+-- 
+cgit v0.11.2
+
diff --git a/media-video/snappy/files/snappy-1.0-clutter-gst-3.patch b/media-video/snappy/files/snappy-1.0-clutter-gst-3.patch
new file mode 100644
index 000000000000..c914b028d1dd
--- /dev/null
+++ b/media-video/snappy/files/snappy-1.0-clutter-gst-3.patch
@@ -0,0 +1,128 @@
+From 872fc2ed3d0339559e4023523fa0935f168f631a Mon Sep 17 00:00:00 2001
+From: Luis de Bethencourt <luis@debethencourt.com>
+Date: Tue, 28 Jul 2015 12:06:16 +0100
+Subject: clutter: upgrade to clutter-gst-3.0
+
+---
+ configure.ac         | 4 ++--
+ src/gst_engine.c     | 2 +-
+ src/gst_engine.h     | 5 +++--
+ src/snappy.c         | 7 ++-----
+ src/user_interface.h | 4 ++++
+ 5 files changed, 12 insertions(+), 10 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b2986c6..75ffb8d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -35,7 +35,7 @@ AC_CANONICAL_HOST
+ # keep one single GST_REQ, core/base should be same versions anyway
+ GST_REQ=1.4.0
+ CLUTTER_REQS=1.20.0
+-CLUTTER_GST_REQS=2.0.12
++CLUTTER_GST_REQS=2.99.2
+ CLUTTER_GTK_REQS=1.6.0
+ GTK_REQS=3.5.0
+ GIO_REQ=2.32
+@@ -55,7 +55,7 @@ PKG_CHECK_MODULES([CLUTTER],
+ AC_SUBST(CLUTTER_CFLAGS)
+ AC_SUBST(CLUTTER_LIBS)
+ 
+-PKG_CHECK_MODULES([CLUTTER_GST], [clutter-gst-2.0 >= $CLUTTER_GST_REQS])
++PKG_CHECK_MODULES([CLUTTER_GST], [clutter-gst-3.0 >= $CLUTTER_GST_REQS])
+ AC_SUBST(CLUTTER_GST_CFLAGS)
+ AC_SUBST(CLUTTER_GST_LIBS)
+ 
+diff --git a/src/gst_engine.c b/src/gst_engine.c
+index 8fc16d4..431d77c 100644
+--- a/src/gst_engine.c
++++ b/src/gst_engine.c
+@@ -724,7 +724,7 @@ cycle_streams (GstEngine * engine, guint streamid)
+ 
+ /*            Init GstEngine variables           */
+ gboolean
+-engine_init (GstEngine * engine, GstElement * sink)
++engine_init (GstEngine * engine, ClutterGstVideoSink * sink)
+ {
+   engine->playing = FALSE;
+   engine->direction_foward = TRUE;
+diff --git a/src/gst_engine.h b/src/gst_engine.h
+index 70dce63..1c044eb 100644
+--- a/src/gst_engine.h
++++ b/src/gst_engine.h
+@@ -24,6 +24,7 @@
+ #define __GST_ENGINE_H__
+ 
+ #include <gst/gst.h>
++#include <clutter-gst/clutter-gst.h>
+ 
+ /* GStreamer Interfaces */
+ #include <gst/video/navigation.h>
+@@ -50,7 +51,7 @@ struct _GstEngine
+   gchar *uri;
+ 
+   GstElement *player;
+-  GstElement *sink;
++  ClutterGstVideoSink *sink;
+ 
+   GstBus *bus;
+ 
+@@ -64,7 +65,7 @@ gboolean bus_call (GstBus * bus, GstMessage * msg, gpointer data);
+ gboolean change_state (GstEngine * engine, gchar * state);
+ gboolean check_missing_plugins_error (GstEngine * engine, GstMessage * msg);
+ gboolean cycle_streams (GstEngine * engine, guint streamid);
+-gboolean engine_init (GstEngine * engine, GstElement * sink);
++gboolean engine_init (GstEngine * engine, ClutterGstVideoSink * sink);
+ gboolean engine_change_offset (GstEngine * engine, gint64 av_offest);
+ gboolean engine_change_speed (GstEngine * engine, gdouble rate);
+ void engine_load_uri (GstEngine * engine, gchar * uri);
+diff --git a/src/snappy.c b/src/snappy.c
+index c2bb2d0..c06fd10 100644
+--- a/src/snappy.c
++++ b/src/snappy.c
+@@ -29,9 +29,6 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <string.h>
+-#include <clutter/clutter.h>
+-#include <clutter-gst/clutter-gst.h>
+-#include <clutter-gtk/clutter-gtk.h>
+ 
+ #include "user_interface.h"
+ 
+@@ -160,7 +157,7 @@ main (int argc, char *argv[])
+   UserInterface *ui = NULL;
+   GstEngine *engine = NULL;
+   ClutterActor *video_texture;
+-  GstElement *sink;
++  ClutterGstVideoSink *sink;
+ 
+   gboolean ok, blind = FALSE, fullscreen = FALSE, hide = FALSE, loop = FALSE;
+   gboolean secret = FALSE, tags = FALSE;
+@@ -230,7 +227,7 @@ main (int argc, char *argv[])
+ 
+   /* Gstreamer engine */
+   engine = g_new (GstEngine, 1);
+-  sink = gst_element_factory_make ("cluttersink", "video-sink");
++  sink = clutter_gst_video_sink_new ();
+   if (sink == NULL) {
+     g_print ("ERROR: Failed to create clutter-gst sink element\n");
+     return FALSE;
+diff --git a/src/user_interface.h b/src/user_interface.h
+index 6fe43c5..b011da0 100644
+--- a/src/user_interface.h
++++ b/src/user_interface.h
+@@ -23,6 +23,10 @@
+ #ifndef __USER_INTERFACE_H__
+ #define __USER_INTERFACE_H__
+ 
++#include <clutter/clutter.h>
++#include <clutter-gst/clutter-gst.h>
++#include <clutter-gtk/clutter-gtk.h>
++
+ #include <gtk/gtk.h>
+ 
+ #include "gst_engine.h"
+-- 
+cgit v0.11.2
+
diff --git a/media-video/snappy/files/snappy-1.0-configure1.patch b/media-video/snappy/files/snappy-1.0-configure1.patch
new file mode 100644
index 000000000000..cd499d7197ab
--- /dev/null
+++ b/media-video/snappy/files/snappy-1.0-configure1.patch
@@ -0,0 +1,25 @@
+From 259bebe65f0f108726d5a0504b23c85525199b15 Mon Sep 17 00:00:00 2001
+From: Luis de Bethencourt <luis.bg@samsung.com>
+Date: Tue, 2 Jun 2015 16:47:31 +0100
+Subject: configure: update GStreamer version
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index b628f33..430647f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -33,7 +33,7 @@ AC_LIBTOOL_WIN32_DLL
+ AC_CANONICAL_HOST
+ 
+ # keep one single GST_REQ, core/base should be same versions anyway
+-GST_REQ=1.0.0
++GST_REQ=1.4.0
+ CLUTTER_REQS=1.12.0
+ CLUTTER_GST_REQS=2.0.0
+ CLUTTER_GTK_REQS=1.0.2
+-- 
+cgit v0.11.2
+
diff --git a/media-video/snappy/files/snappy-1.0-configure2.patch b/media-video/snappy/files/snappy-1.0-configure2.patch
new file mode 100644
index 000000000000..c4787d846a8d
--- /dev/null
+++ b/media-video/snappy/files/snappy-1.0-configure2.patch
@@ -0,0 +1,29 @@
+From c0eacf30b2a0476488004c6000de659ce4380534 Mon Sep 17 00:00:00 2001
+From: Luis de Bethencourt <luis.bg@samsung.com>
+Date: Tue, 2 Jun 2015 16:56:14 +0100
+Subject: configure: update Clutter version
+
+---
+ configure.ac | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 430647f..b2986c6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -34,9 +34,9 @@ AC_CANONICAL_HOST
+ 
+ # keep one single GST_REQ, core/base should be same versions anyway
+ GST_REQ=1.4.0
+-CLUTTER_REQS=1.12.0
+-CLUTTER_GST_REQS=2.0.0
+-CLUTTER_GTK_REQS=1.0.2
++CLUTTER_REQS=1.20.0
++CLUTTER_GST_REQS=2.0.12
++CLUTTER_GTK_REQS=1.6.0
+ GTK_REQS=3.5.0
+ GIO_REQ=2.32
+ 
+-- 
+cgit v0.11.2
+
diff --git a/media-video/snappy/files/snappy-1.0-string-concatenation.patch b/media-video/snappy/files/snappy-1.0-string-concatenation.patch
new file mode 100644
index 000000000000..bafaa164a2d8
--- /dev/null
+++ b/media-video/snappy/files/snappy-1.0-string-concatenation.patch
@@ -0,0 +1,28 @@
+From f2d51cde0e72853050495b3d995db4aee14c66a6 Mon Sep 17 00:00:00 2001
+From: Jan Schmidt <jan@centricular.com>
+Date: Tue, 13 May 2014 14:30:34 -0400
+Subject: ui: string concatenation to use corect format
+
+---
+ src/user_interface.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/user_interface.c b/src/user_interface.c
+index c29c688..8e3894a 100644
+--- a/src/user_interface.c
++++ b/src/user_interface.c
+@@ -1052,9 +1052,9 @@ position_ns_to_str (UserInterface * ui, gint64 nanoseconds)
+   seconds = seconds - (minutes * SEC_IN_MIN);
+ 
+   if (hours >= 1)
+-    return g_strdup_printf ("%d:%02d:%02ld", hours, minutes, seconds);
++    return g_strdup_printf ("%d:%02d:%02" G_GINT64_FORMAT, hours, minutes, seconds);
+   else
+-    return g_strdup_printf ("%02d:%02ld", minutes, seconds);
++    return g_strdup_printf ("%02d:%02" G_GINT64_FORMAT, minutes, seconds);
+ }
+ 
+ static void
+-- 
+cgit v0.11.2
+
diff --git a/media-video/snappy/files/snappy-1.0-video-texture.patch b/media-video/snappy/files/snappy-1.0-video-texture.patch
new file mode 100644
index 000000000000..eed0bd491ae4
--- /dev/null
+++ b/media-video/snappy/files/snappy-1.0-video-texture.patch
@@ -0,0 +1,36 @@
+From f33f7a5e9424544884a37b264bf88ee1866a56ac Mon Sep 17 00:00:00 2001
+From: Luis de Bethencourt <luis@debethencourt.com>
+Date: Tue, 28 Jul 2015 14:02:44 +0100
+Subject: clutter: update method to create video texture
+
+---
+ src/snappy.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/snappy.c b/src/snappy.c
+index c06fd10..94b6e5b 100644
+--- a/src/snappy.c
++++ b/src/snappy.c
+@@ -222,8 +222,6 @@ main (int argc, char *argv[])
+   ui->tags = tags;
+   ui->data_dir = data_dir;
+   interface_init (ui);
+-  video_texture = g_object_new (CLUTTER_TYPE_TEXTURE, "disable-slicing", TRUE,
+-      NULL);
+ 
+   /* Gstreamer engine */
+   engine = g_new (GstEngine, 1);
+@@ -232,7 +230,9 @@ main (int argc, char *argv[])
+     g_print ("ERROR: Failed to create clutter-gst sink element\n");
+     return FALSE;
+   }
+-  g_object_set (G_OBJECT (sink), "texture", video_texture, NULL);
++  video_texture = g_object_new (CLUTTER_TYPE_ACTOR, "content",
++      g_object_new (CLUTTER_GST_TYPE_CONTENT, "sink", sink, NULL),
++      "name", "texture", NULL);
+ 
+   ok = engine_init (engine, sink);
+   if (!ok)
+-- 
+cgit v0.11.2
+
diff --git a/media-video/snappy/metadata.xml b/media-video/snappy/metadata.xml
new file mode 100644
index 000000000000..96905b59e4ed
--- /dev/null
+++ b/media-video/snappy/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gstreamer@gentoo.org</email>
+		<name>GStreamer package maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		Snappy is a gstreamer + clutter media player with powerful features in mind
+	</longdescription>
+</pkgmetadata>
diff --git a/media-video/snappy/snappy-1.0-r1.ebuild b/media-video/snappy/snappy-1.0-r1.ebuild
new file mode 100644
index 000000000000..aa41637c6525
--- /dev/null
+++ b/media-video/snappy/snappy-1.0-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="A simple media player written using GStreamer and Clutter"
+HOMEPAGE="https://wiki.gnome.org/Apps/Snappy"
+
+KEYWORDS="amd64 x86"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=media-libs/clutter-1.20.0:1.0
+	media-libs/clutter-gst:3.0
+	>=media-libs/clutter-gtk-1.6.0:1.0
+	>=x11-libs/gtk+-3.5.0:3
+	x11-libs/libXtst
+
+	>=media-libs/gstreamer-1.4.0:1.0
+	>=media-libs/gst-plugins-base-1.4.0:1.0
+
+	media-plugins/gst-plugins-meta:1.0
+
+	!!<net-misc/spice-gtk-0.19
+" # File collision -- /usr/bin/snappy with older versions
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# Fix compat with clutter-1.22 (from 'master')
+	epatch "${FILESDIR}"/${P}-clutter-1.22.patch
+
+	# ui: string concatenation to use corect format (from 'master')
+	epatch "${FILESDIR}"/${P}-string-concatenation.patch
+
+	# clutter: update method to create video texture (from 'master')
+	epatch "${FILESDIR}"/${P}-video-texture.patch
+
+	# Move to clutter-gst-3 (from 'master')
+	epatch "${FILESDIR}"/${P}-configure{1,2}.patch
+	epatch "${FILESDIR}"/${P}-clutter-gst-3.patch
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS README THANKS ToDo docs/*"
+	gnome2_src_configure --enable-dbus
+}