Hello community,

here is the log from the commit of package pinpoint for openSUSE:Factory 
checked in at 2012-01-05 19:14:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pinpoint (Old)
 and      /work/SRC/openSUSE:Factory/.pinpoint.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "pinpoint", Maintainer is ""

Changes:
--------
--- /work/SRC/openSUSE:Factory/pinpoint/pinpoint.changes        2011-10-13 
12:33:07.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.pinpoint.new/pinpoint.changes   2012-01-05 
19:15:00.000000000 +0100
@@ -1,0 +2,18 @@
+Mon Jan  2 02:41:38 UTC 2012 - g...@suse.com
+
+- Add Add pinpoint-racy-video-frame.patch to fix the segfault when
+  rendering the video thumbnail on the speaker screen
+  (bnc#739092, bgo#665756)
+
+-------------------------------------------------------------------
+Tue Nov 15 16:50:30 UTC 2011 - dims...@opensuse.org
+
+- Update to version 0.1.4:
+  + Start of a speaker screen, support for speaker notes.
+  + A camera/v4l based slide background.
+  + Fully stop videos when transitioning between them.
+  + Made "fade" be the default transition.
+  + Inhibit screensaver when running fullscreen.
+- Drop pinpoint-speakerview.patch: fixed upstream.
+
+-------------------------------------------------------------------

Old:
----
  pinpoint-0.1.2.tar.bz2
  pinpoint-speakerview.patch

New:
----
  pinpoint-0.1.4.tar.bz2
  pinpoint-racy-video-frame.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ pinpoint.spec ++++++
--- /var/tmp/diff_new_pack.o14wMj/_old  2012-01-05 19:15:01.000000000 +0100
+++ /var/tmp/diff_new_pack.o14wMj/_new  2012-01-05 19:15:01.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package pinpoint
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,15 +18,15 @@
 
 
 Name:           pinpoint
-Version:        0.1.2
-Release:        3
-License:        LGPL-2.1+
+Version:        0.1.4
+Release:        0
 Summary:        Simple Presentation Tool for Excellent Presentations
-Url:            http://live.gnome.org/Pinpoint
+License:        LGPL-2.1+
 Group:          Productivity/Publishing/Presentation
-Source:         
http://ftp.gnome.org/pub/GNOME/sources/pinpoint/0.1/%{name}-%{version}.tar.bz2
-# PATCH-FEATURE-UPSTREAM pinpoint-speakerview.patch -- Taken from git, add the 
speaker view feature
-Patch1:         pinpoint-speakerview.patch
+Url:            http://live.gnome.org/Pinpoint
+Source:         
http://download.gnome.org/sources/pinpoint/0.1/%{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM pinpoint-racy-video-frame.patch bnc#739092,bgo#665756 
g...@suse.com -- Fix crash when rendering the video thumbnail on the speaker 
screen
+Patch1:         pinpoint-racy-video-frame.patch
 BuildRequires:  pkgconfig(cairo-pdf)
 BuildRequires:  pkgconfig(clutter-1.0)
 BuildRequires:  pkgconfig(clutter-gst-1.0)

++++++ pinpoint-0.1.2.tar.bz2 -> pinpoint-0.1.4.tar.bz2 ++++++
++++ 4668 lines of diff (skipped)

++++++ pinpoint-racy-video-frame.patch ++++++
>From 591e97ad8c787a257db1eebfb8e1cc2098a02014 Mon Sep 17 00:00:00 2001
From: Gary Ching-Pang Lin <chingp...@gmail.com>
Date: Fri, 30 Dec 2011 18:04:37 +0800
Subject: [PATCH] Skip the frames until the previous frame is rendered

Rendering the thumbnail of the video file may takes longer than
15 milliseconds, and pinpoint would crash when there are more than
2 threads to render the frames.

https://bugzilla.gnome.org/show_bug.cgi?id=665756
---
 pp-clutter.c |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/pp-clutter.c b/pp-clutter.c
index 1136033..f4ad00a 100644
--- a/pp-clutter.c
+++ b/pp-clutter.c
@@ -1638,11 +1638,18 @@ static gboolean update_speaker_screen (ClutterRenderer 
*renderer)
     return FALSE;
 
   point = pp_slidep->data;
+  static gboolean is_updated = TRUE;
   static float current_slide_time = 0.0;
   static float current_slide_duration = 0.0;
   static GList *current_slide = NULL;
   float nh, nw;
 
+  /* Skip this update since the previous one isn't finished */
+  if (!is_updated)
+    return TRUE;
+
+  is_updated = FALSE;
+
   if (renderer->reset)
     {
       current_slide = NULL;
@@ -1708,7 +1715,7 @@ static gboolean update_speaker_screen (ClutterRenderer 
*renderer)
     }
 
   if (!renderer->speaker_mode)
-    return TRUE;
+    goto out;
 
   if (point->speaker_notes)
     clutter_text_set_text (CLUTTER_TEXT (renderer->speaker_notes),
@@ -1874,6 +1881,10 @@ static gboolean update_speaker_screen (ClutterRenderer 
*renderer)
                               nh * 0.35);
   clutter_actor_set_width    (renderer->speaker_notes,
                               nw * 0.5);
+
+out:
+  is_updated = TRUE;
+
   return TRUE;
 }
 
-- 
1.7.7

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to