From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- media-video/snappy/Manifest | 10 +- .../snappy/files/snappy-1.0-clutter-1.22.patch | 25 ---- .../snappy/files/snappy-1.0-clutter-gst-3.patch | 128 --------------------- .../snappy/files/snappy-1.0-configure1.patch | 25 ---- .../snappy/files/snappy-1.0-configure2.patch | 29 ----- .../files/snappy-1.0-string-concatenation.patch | 28 ----- .../snappy/files/snappy-1.0-video-texture.patch | 36 ------ media-video/snappy/snappy-1.0-r1.ebuild | 57 --------- media-video/snappy/snappy-1.0_p20200428.ebuild | 2 +- 9 files changed, 2 insertions(+), 338 deletions(-) delete mode 100644 media-video/snappy/files/snappy-1.0-clutter-1.22.patch delete mode 100644 media-video/snappy/files/snappy-1.0-clutter-gst-3.patch delete mode 100644 media-video/snappy/files/snappy-1.0-configure1.patch delete mode 100644 media-video/snappy/files/snappy-1.0-configure2.patch delete mode 100644 media-video/snappy/files/snappy-1.0-string-concatenation.patch delete mode 100644 media-video/snappy/files/snappy-1.0-video-texture.patch delete mode 100644 media-video/snappy/snappy-1.0-r1.ebuild (limited to 'media-video/snappy') diff --git a/media-video/snappy/Manifest b/media-video/snappy/Manifest index a21e046cf76e..d4f4494b868c 100644 --- a/media-video/snappy/Manifest +++ b/media-video/snappy/Manifest @@ -1,11 +1,3 @@ -AUX snappy-1.0-clutter-1.22.patch 721 BLAKE2B 1257ee9db63cf4795a9e1deceac9d9667628b0a76e513f3f830ff955433f25103c731517782242200b574169225be569ecf0a1176174aa9babf650e102a94756 SHA512 3d808cb79cfec5486726999586a307db0b7426d3250291120ec0e91c35ac8a1fdc5c9545fd58562160d836643396b094d1cbbdb4f1bca6d361c39f9662b203fe -AUX snappy-1.0-clutter-gst-3.patch 3951 BLAKE2B d8c708575c2c8dfbf94e87b66c1ee3feb24c6250d921f56821b65e7a30e17b1a39da5997564831a6c0e7c247f9562bb91371043850753938da9fe0f44c165da2 SHA512 18f550d91d84fc0cd350cee600454ff7b7103e9e17db877b3773817819fe8fcbb24882e3da84b83d3f0c2fd18c9494c34a9dd60a3712d2e0174bca3e49779104 -AUX snappy-1.0-configure1.patch 630 BLAKE2B cf3e197213308a0689814f66e1af2f5fb2865f0c3bf1b8812b85b2c9f99e4bed02223b2d82743f518d459425211d96fdd7f22e731b0be26abe4f43a7c9822e51 SHA512 ce3a2fa09141bc99becf806c6c45895e785014bc2de877a53c710a9a7cbd5193990e623af75a07300f325770efc3fca2b357f94a18f2ce871800b231d3d84f1d -AUX snappy-1.0-configure2.patch 699 BLAKE2B d13d0341607ab5acbc134786d88cc522ec8e719626803ae7b3deeaec0096dfb4562830def887760789a766d056b6f981097f510cc1095ed4e4bb18a0b0a45212 SHA512 71bcf47ee1e263a2e14af991f1aa134690df9db2b4279ae1de8a6100db4ad0c0083466a5f88f36d38e72b0389d1081442a0884f346710c42e211b6a2aa4f95b0 -AUX snappy-1.0-string-concatenation.patch 921 BLAKE2B 5e8726793991b93e235529a219ab0cbf4ec899b3fe38cdfa2a30dadfaf410d139b9bb0590b3d486408fea8a87936911d753b9741b1596057687532bdd383dd03 SHA512 4ad47d7907ec77de2ffa866305ff23390915f7f6f27883e4a035e862116cd3e418addbd600954d2a52b8a8ae1c22803e57d672fddaf5e955da6e3110a950671e -AUX snappy-1.0-video-texture.patch 1126 BLAKE2B fba2134c9a44429046c63b93db40d744ff1e658c8a5736b0e187f22b4b5a91e40b6774947deb9d9f36f390a0a75a08044b06f2cb9202cb31501c61bc46204aa2 SHA512 b139b5ed43ce85240015467330f17f244bcca59533d203c29d60955ba9992d8cca9f2715d928551fdb5cc92c0618ba60df6a51ffe798d19bbc0532dccf58a810 -DIST snappy-1.0.tar.xz 282964 BLAKE2B 9855e3c9397ccde1122c22066cc33e98fda93cb364c03d8649a823dddc9de81bb9eaa89002f3fd1410b6910433e554d231774524da1cd917138c3154c6ed153b SHA512 d8a3fd3a598efde4d699cc8fa13bee1239917a877627b26d5d278af5fd1824f02acf5ce685f8bf994087b3374de9917a5aa4f6f6ebe94f385c8d3bf91887eca9 DIST snappy-ebf8e3ed30013e6577fa8994db40743d2ec05e94.tar.bz2 80663 BLAKE2B 1bf4b654c4c8c1b8b5cdbb71295c231588a03034e1ad3691e4c80f6e5439b420a76124d5f7a073eb225a13db99b32745dca3fe6845fbfe3bca6a685810fa7f61 SHA512 adc6c514dc38bab86d100aa481be09a75160a9641cfe32f467cc524ef7a006dabbbd450587c007d6a980e8e4b974b49629295e6cf791be3b42401b45168040f3 -EBUILD snappy-1.0-r1.ebuild 1360 BLAKE2B 4867a12555dfab28d6b3db9cf9c214796322cab950c016dc0f095d2b00524c9340fec05c72d1af2e0f474c980ac5100b118ca2f5391194f703d0a262e9adcdba SHA512 e40cee3f9d1a7bcb0bee096b876e36afc7eef9f09fdeb43497b6ba2a1a8b471f30352d866324bd788dad45273f584389eb3cba7a88f499563999bc7676c0be26 -EBUILD snappy-1.0_p20200428.ebuild 1054 BLAKE2B 82623450455ea4ac6da8a47098c4b01a1ada110bf87d50b796f7e14a02af0f708af1cb149d5c422d29a581106a3a36471316b3af3fdfe6c0c81da745555a8b0b SHA512 4ee1f80a7d4457a9c6044933eacf54595b48b950494b8bf44ee35fdb423a545eacf545ea5341196091da7a3a34c704d672caed82645167ea7c16276639b2afc6 +EBUILD snappy-1.0_p20200428.ebuild 1052 BLAKE2B d516808a19a06aeabeb39b0a994dbebe6cedd9c7f0e18fdf6e9b9d528f9017f5e069d5e3aa55d9b2e2cf4f0a4d55f1369795362dc0c1b2a853a5851bbcb24d92 SHA512 b84d6b189ddfc98186b660298df8abed185348bb19041e0bbe9dc3da727f4ed1b0be53f085339f7712865d2cbe791e085776f3375870c05f80f0eeb4ff99557e MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75 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 deleted file mode 100644 index f79d26786732..000000000000 --- a/media-video/snappy/files/snappy-1.0-clutter-1.22.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 529445d6fc5da3ea6e5c81051248b9d4818a1224 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= -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 (" - 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 deleted file mode 100644 index c914b028d1dd..000000000000 --- a/media-video/snappy/files/snappy-1.0-clutter-gst-3.patch +++ /dev/null @@ -1,128 +0,0 @@ -From 872fc2ed3d0339559e4023523fa0935f168f631a Mon Sep 17 00:00:00 2001 -From: Luis de Bethencourt -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 -+#include - - /* GStreamer Interfaces */ - #include -@@ -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 - #include - #include --#include --#include --#include - - #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 -+#include -+#include -+ - #include - - #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 deleted file mode 100644 index cd499d7197ab..000000000000 --- a/media-video/snappy/files/snappy-1.0-configure1.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 259bebe65f0f108726d5a0504b23c85525199b15 Mon Sep 17 00:00:00 2001 -From: Luis de Bethencourt -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 deleted file mode 100644 index c4787d846a8d..000000000000 --- a/media-video/snappy/files/snappy-1.0-configure2.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c0eacf30b2a0476488004c6000de659ce4380534 Mon Sep 17 00:00:00 2001 -From: Luis de Bethencourt -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 deleted file mode 100644 index bafaa164a2d8..000000000000 --- a/media-video/snappy/files/snappy-1.0-string-concatenation.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f2d51cde0e72853050495b3d995db4aee14c66a6 Mon Sep 17 00:00:00 2001 -From: Jan Schmidt -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 deleted file mode 100644 index eed0bd491ae4..000000000000 --- a/media-video/snappy/files/snappy-1.0-video-texture.patch +++ /dev/null @@ -1,36 +0,0 @@ -From f33f7a5e9424544884a37b264bf88ee1866a56ac Mon Sep 17 00:00:00 2001 -From: Luis de Bethencourt -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/snappy-1.0-r1.ebuild b/media-video/snappy/snappy-1.0-r1.ebuild deleted file mode 100644 index aa41637c6525..000000000000 --- a/media-video/snappy/snappy-1.0-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# 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 - - !!