Hello community, here is the log from the commit of package empathy for openSUSE:Factory checked in at 2016-04-14 13:00:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/empathy (Old) and /work/SRC/openSUSE:Factory/.empathy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "empathy" Changes: -------- --- /work/SRC/openSUSE:Factory/empathy/empathy.changes 2016-03-29 14:28:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.empathy.new/empathy.changes 2016-04-14 13:00:51.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Mar 25 12:09:56 UTC 2016 - [email protected] + +- Add empathy-clutter-gst-3_0.patch: Port to clutter-gst-3.0. +- Replace pkgconfig(clutter-gst-2.0) for pkgconfig(clutter-gst-3.0) + BuildRequires due to above port. +- Add libtool BuildRequires and pass autoreconf -fiv since above + patch touches the buildsystem. + +------------------------------------------------------------------- New: ---- empathy-clutter-gst-3_0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ empathy.spec ++++++ --- /var/tmp/diff_new_pack.uegSxy/_old 2016-04-14 13:00:53.000000000 +0200 +++ /var/tmp/diff_new_pack.uegSxy/_new 2016-04-14 13:00:53.000000000 +0200 @@ -28,6 +28,8 @@ Url: http://live.gnome.org/Empathy Source: http://download.gnome.org/sources/empathy/3.12/%{name}-%{version}.tar.xz Source99: %{name}-rpmlintrc +# PATCH-FIX-UPSTREAM empathy-clutter-gst-3_0.patch bgo#751185 [email protected] -- Port empathy to clutter-gst-3.0 +Patch0: empathy-clutter-gst-3_0.patch # PATCH-FIX-UPSTREAM empathy-fix-icons-in-search-bar.patch [email protected] -- Fix the previous/next icons. Patch1: empathy-fix-icons-in-search-bar.patch # PATCH-FIX-UPSTREAM empathy-Don-t-crash-in-window_get_workspace-under-Wayland.patch [email protected] -- Don't crash in window_get_workspace under Wayland @@ -42,13 +44,14 @@ Patch6: empathy-Add-a-missing-tag-to-the-AppData-file.patch BuildRequires: fdupes BuildRequires: intltool +BuildRequires: libtool BuildRequires: translation-update-upstream BuildRequires: update-desktop-files BuildRequires: yelp-tools BuildRequires: pkgconfig(champlain-gtk-0.12) >= 0.12.1 BuildRequires: pkgconfig(cheese-gtk) >= 3.4.0 BuildRequires: pkgconfig(clutter-1.0) >= 1.10.0 -BuildRequires: pkgconfig(clutter-gst-2.0) >= 1.5.2 +BuildRequires: pkgconfig(clutter-gst-3.0) BuildRequires: pkgconfig(clutter-gtk-1.0) >= 1.1.2 BuildRequires: pkgconfig(cogl-1.0) >= 1.14 BuildRequires: pkgconfig(enchant) @@ -130,6 +133,7 @@ %lang_package %prep %setup -q +%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -139,6 +143,7 @@ translation-update-upstream %build +autoreconf -fiv %configure --disable-static \ --with-pic \ --enable-goa \ ++++++ empathy-clutter-gst-3_0.patch ++++++ >From 3269cc87e9a18d57552c1cc2556e9138b02adf15 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin <[email protected]> Date: Mon, 30 Nov 2015 15:19:39 +0000 Subject: [PATCH] call: port to clutter-gst 3.0 https://bugzilla.gnome.org/show_bug.cgi?id=751185 --- configure.ac | 2 +- src/empathy-call-window.c | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index 992a17b..1fef3af 100644 --- a/configure.ac +++ b/configure.ac @@ -247,7 +247,7 @@ PKG_CHECK_MODULES(EMPATHY_CALL, telepathy-farstream >= $TP_FS_REQUIRED clutter-1.0 >= $CLUTTER_REQUIRED clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED - clutter-gst-2.0 + clutter-gst-3.0 gstreamer-1.0 gstreamer-audio-1.0 gstreamer-video-1.0 diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index a54346c..dbef578 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -22,6 +22,7 @@ #include "empathy-call-window.h" #include <glib/gi18n.h> +#include <clutter-gst/clutter-gst.h> #include <telepathy-farstream/telepathy-farstream.h> #include <farstream/fs-element-added-notifier.h> #include <farstream/fs-utils.h> @@ -391,19 +392,17 @@ create_video_output_widget (EmpathyCallWindow *self) g_assert (priv->video_output == NULL); g_assert (priv->pipeline != NULL); - priv->video_output = clutter_texture_new (); - - clutter_texture_set_keep_aspect_ratio (CLUTTER_TEXTURE (priv->video_output), - TRUE); - - priv->video_output_sink = gst_element_factory_make ("cluttersink", NULL); - if (priv->video_output_sink == NULL) - g_error ("Missing cluttersink"); - else - g_object_set (priv->video_output_sink, "texture", priv->video_output, NULL); + priv->video_output_sink = clutter_gst_video_sink_new (); + priv->video_output = g_object_new (CLUTTER_TYPE_ACTOR, + "content", g_object_new (CLUTTER_GST_TYPE_ASPECTRATIO, + "sink", priv->video_output_sink, + NULL), + NULL); clutter_container_add_actor (CLUTTER_CONTAINER (priv->video_box), priv->video_output); + clutter_actor_add_constraint (priv->video_output, + clutter_bind_constraint_new (priv->video_box, CLUTTER_BIND_SIZE, 0)); gtk_widget_add_events (priv->video_container, GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK); @@ -1063,7 +1062,7 @@ static void create_video_preview (EmpathyCallWindow *self) { EmpathyCallWindowPriv *priv = GET_PRIV (self); - ClutterLayoutManager *layout; + ClutterLayoutManager *layout, *sublayout; ClutterActor *preview; ClutterActor *b; ClutterAction *action; @@ -1077,10 +1076,7 @@ create_video_preview (EmpathyCallWindow *self) clutter_actor_set_size (preview, SELF_VIDEO_SECTION_WIDTH, SELF_VIDEO_SECTION_HEIGHT); - priv->video_preview_sink = gst_element_factory_make ("cluttersink", NULL); - if (priv->video_preview_sink == NULL) - g_error ("Missing cluttersink, check your clutter-gst installation"); - g_object_set (priv->video_preview_sink, "texture", preview, NULL); + priv->video_preview_sink = clutter_gst_video_sink_new (); g_object_add_weak_pointer (G_OBJECT (priv->video_preview_sink), (gpointer) &priv->video_preview_sink); /* Add a little offset to the video preview */ @@ -1090,6 +1086,10 @@ create_video_preview (EmpathyCallWindow *self) clutter_actor_set_size (priv->video_preview, SELF_VIDEO_SECTION_WIDTH + 2 * SELF_VIDEO_SECTION_MARGIN, SELF_VIDEO_SECTION_HEIGHT + 2 * SELF_VIDEO_SECTION_MARGIN); + clutter_actor_set_content (priv->video_preview, + g_object_new (CLUTTER_GST_TYPE_ASPECTRATIO, + "sink", priv->video_preview, + NULL)); /* Spinner for when changing the camera device */ priv->preview_spinner_widget = gtk_spinner_new (); -- 2.6.2
