diff --git a/0001-Revert-backend-port-to-clutter-gst-3.0.patch b/0001-Revert-backend-port-to-clutter-gst-3.0.patch new file mode 100644 index 0000000..d06124d --- /dev/null +++ b/0001-Revert-backend-port-to-clutter-gst-3.0.patch @@ -0,0 +1,79 @@ +From 51361413cf54371aca52378eefd1980e9cac68b0 Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Sat, 21 Feb 2015 23:47:47 +0100 +Subject: [PATCH] Revert "backend: port to clutter-gst 3.0" + +Downstream patch to use clutter-gst 2.0 while we don't yet have +clutter-gst 3.0. + +This reverts commit 361f76ce9636d3123273b912398b77d29715cf94. +--- + configure.ac | 4 ++-- + src/backend/bacon-video-widget.c | 13 ++++++------- + 2 files changed, 8 insertions(+), 9 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 3a6f764..7a92615 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -93,7 +93,7 @@ GST_REQS=1.3.1 + GST_PLUG_BASE_REQS=1.4.2 + GSTPLUG_REQS=0.11.93 + CLUTTER_REQS=1.17.3 +-CLUTTER_GST_REQS=2.99.2 ++CLUTTER_GST_REQS=1.5.5 + CLUTTER_GTK_REQS=1.5.5 + + dnl Check for the required GStreamer versions for missing plugins +@@ -131,7 +131,7 @@ fi + # Backend requirements + # ================================================================ + +-BACKEND_MODULES="gstreamer-1.0 >= $GST_REQS gstreamer-base-1.0 >= $GST_REQS gstreamer-plugins-base-1.0 >= $GST_PLUG_BASE_REQS $MISSING_PLUGINS_MODULES gstreamer-tag-1.0 >= $GSTPLUG_REQS gstreamer-audio-1.0 gstreamer-video-1.0 clutter-1.0 >= $CLUTTER_REQS clutter-gst-3.0 >= $CLUTTER_GST_REQS clutter-gtk-1.0 cairo >= $CAIRO_REQS gsettings-desktop-schemas" ++BACKEND_MODULES="gstreamer-1.0 >= $GST_REQS gstreamer-base-1.0 >= $GST_REQS gstreamer-plugins-base-1.0 >= $GST_PLUG_BASE_REQS $MISSING_PLUGINS_MODULES gstreamer-tag-1.0 >= $GSTPLUG_REQS gstreamer-audio-1.0 gstreamer-video-1.0 clutter-1.0 >= $CLUTTER_REQS clutter-gst-2.0 >= $CLUTTER_GST_REQS clutter-gtk-1.0 cairo >= $CAIRO_REQS gsettings-desktop-schemas" + + PKG_CHECK_MODULES(BACKEND, $BACKEND_MODULES) + PKG_CHECK_MODULES(BACKEND_TEST, $BACKEND_MODULES gtk+-3.0 >= $GTK_REQS) +diff --git a/src/backend/bacon-video-widget.c b/src/backend/bacon-video-widget.c +index 3e1f7b8..981b50c 100644 +--- a/src/backend/bacon-video-widget.c ++++ b/src/backend/bacon-video-widget.c +@@ -5911,8 +5911,7 @@ bacon_video_widget_initable_init (GInitable *initable, + GError **error) + { + BaconVideoWidget *bvw; +- GstElement *audio_sink = NULL; +- ClutterGstVideoSink *video_sink = NULL; ++ GstElement *audio_sink = NULL, *video_sink = NULL; + gchar *version_str; + GstPlayFlags flags; + ClutterActor *layout; +@@ -5939,7 +5938,7 @@ bacon_video_widget_initable_init (GInitable *initable, + /* Instantiate all the fallible plugins */ + bvw->priv->play = element_make_or_warn ("playbin", "play"); + bvw->priv->audio_pitchcontrol = element_make_or_warn ("scaletempo", "scaletempo"); +- video_sink = clutter_gst_video_sink_new (); ++ video_sink = element_make_or_warn ("cluttersink", "video-sink"); + audio_sink = element_make_or_warn ("autoaudiosink", "audio-sink"); + + if (!bvw->priv->play || +@@ -5984,12 +5983,12 @@ bacon_video_widget_initable_init (GInitable *initable, + clutter_actor_set_background_color (bvw->priv->stage, CLUTTER_COLOR_Black); + + /* Video sink, with aspect frame */ +- bvw->priv->texture = g_object_new (CLUTTER_TYPE_ACTOR, +- "content", g_object_new (CLUTTER_GST_TYPE_CONTENT, +- "sink", video_sink, +- NULL), ++ bvw->priv->texture = g_object_new (CLUTTER_TYPE_TEXTURE, ++ "disable-slicing", TRUE, ++ "reactive", TRUE, + "name", "texture", + NULL); ++ g_object_set (G_OBJECT (video_sink), "texture", bvw->priv->texture, NULL); + + /* The logo */ + bvw->priv->logo_frame = clutter_actor_new (); +-- +2.3.0 + diff --git a/totem.spec b/totem.spec index 8208f7a..e15131e 100644 --- a/totem.spec +++ b/totem.spec @@ -7,6 +7,9 @@ License: GPLv2+ with exceptions Group: Applications/Multimedia URL: https://wiki.gnome.org/Apps/Videos Source0: http://download.gnome.org/sources/totem/3.15/totem-%{version}.tar.xz +# Keep on using clutter-gst2 while the clutter-gst3 package review is under way +# https://bugzilla.redhat.com/show_bug.cgi?id=1194995 +Patch0: 0001-Revert-backend-port-to-clutter-gst-3.0.patch # For all the Python plugins Requires: pygobject3 @@ -52,6 +55,11 @@ BuildRequires: pkgconfig(pygobject-3.0) BuildRequires: vala BuildRequires: /usr/bin/appstream-util +# For patch0 autoreconf +BuildRequires: gnome-common +BuildRequires: autoconf automake intltool gtk-doc +BuildRequires: libappstream-glib-devel + # For the nautilus extension BuildRequires: pkgconfig(libnautilus-extension) @@ -141,6 +149,8 @@ audio and video files in the properties dialog. %prep %setup -q +%patch0 -p1 +autoreconf -fi %build %configure \