r40762 - in /desktop/unstable/totem/debian: changelog patches/0001-thumbnailer-Remove-totem-disc-usage.patch patches/series

[pochu at users.alioth.debian.org]

Author: pochu
Date: Thu Feb 27 18:55:08 2014
New Revision: 40762

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40762
Log:
* debian/patches/0001-thumbnailer-Remove-totem-disc-usage.patch:
  + Patch from upstream git to fix build with totem-pl-parser 3.10.

Added:
    desktop/unstable/totem/debian/patches/0001-thumbnailer-Remove-totem-disc-usage.patch
Modified:
    desktop/unstable/totem/debian/changelog
    desktop/unstable/totem/debian/patches/series

Modified: desktop/unstable/totem/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/changelog?rev=40762&op=diff
==============================================================================
--- desktop/unstable/totem/debian/changelog	[utf-8] (original)
+++ desktop/unstable/totem/debian/changelog	[utf-8] Thu Feb 27 18:55:08 2014
@@ -1,3 +1,10 @@
+totem (3.8.2-4) UNRELEASED; urgency=medium
+
+  * debian/patches/0001-thumbnailer-Remove-totem-disc-usage.patch:
+    + Patch from upstream git to fix build with totem-pl-parser 3.10.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Thu, 27 Feb 2014 19:54:29 +0100
+
 totem (3.8.2-3) unstable; urgency=low
 
   * Switch gstreamer1.0-plugins-bad Recommends to Depends. The 'scaletempo'

Added: desktop/unstable/totem/debian/patches/0001-thumbnailer-Remove-totem-disc-usage.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/0001-thumbnailer-Remove-totem-disc-usage.patch?rev=40762&op=file
==============================================================================
--- desktop/unstable/totem/debian/patches/0001-thumbnailer-Remove-totem-disc-usage.patch	(added)
+++ desktop/unstable/totem/debian/patches/0001-thumbnailer-Remove-totem-disc-usage.patch	[utf-8] Thu Feb 27 18:55:08 2014
@@ -0,0 +1,70 @@
+From 198d7f251e7816f837378fb2081829188847b916 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Sat, 24 Aug 2013 04:49:57 +0200
+Subject: [PATCH] thumbnailer: Remove totem-disc usage
+
+It was removed from totem-pl-parser for GNOME 3.10.
+---
+ src/totem-video-thumbnailer.c | 26 +++++++++++++++++++++-----
+ 1 file changed, 21 insertions(+), 5 deletions(-)
+
+diff --git a/src/totem-video-thumbnailer.c b/src/totem-video-thumbnailer.c
+index 0a139c8..e2edf33 100644
+--- a/src/totem-video-thumbnailer.c
++++ b/src/totem-video-thumbnailer.c
+@@ -34,7 +34,7 @@
+ #include <glib/gi18n.h>
+ #include <cairo.h>
+ #include <gst/gst.h>
+-#include <totem-disc.h>
++#include <totem-pl-parser.h>
+ 
+ #include <errno.h>
+ #include <unistd.h>
+@@ -89,11 +89,21 @@ typedef struct {
+ static void save_pixbuf (GdkPixbuf *pixbuf, const char *path,
+ 			 const char *video_path, int size, gboolean is_still);
+ 
++static void
++entry_parsed_cb (TotemPlParser *parser,
++		 const char    *uri,
++		 GHashTable    *metadata,
++		 char         **new_url)
++{
++	*new_url = g_strdup (uri);
++}
++
+ static char *
+ get_special_url (GFile *file)
+ {
+ 	char *path, *orig_uri, *uri, *mime_type;
+-	TotemDiscMediaType type;
++	TotemPlParser *parser;
++	TotemPlParserResult res;
+ 
+ 	path = g_file_get_path (file);
+ 
+@@ -107,11 +117,17 @@ get_special_url (GFile *file)
+ 
+ 	uri = NULL;
+ 	orig_uri = g_file_get_uri (file);
+-	type = totem_cd_detect_type_with_url (orig_uri, &uri, NULL);
++
++	parser = totem_pl_parser_new ();
++	g_signal_connect (parser, "entry-parsed",
++			  G_CALLBACK (entry_parsed_cb), &uri);
++
++	res = totem_pl_parser_parse (parser, orig_uri, FALSE);
++
+ 	g_free (orig_uri);
++	g_object_unref (parser);
+ 
+-	if (type == MEDIA_TYPE_DVD ||
+-	    type == MEDIA_TYPE_VCD)
++	if (res == TOTEM_PL_PARSER_RESULT_SUCCESS)
+ 		return uri;
+ 
+ 	g_free (uri);
+-- 
+1.9.0
+

Modified: desktop/unstable/totem/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/series?rev=40762&op=diff
==============================================================================
--- desktop/unstable/totem/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/totem/debian/patches/series	[utf-8] Thu Feb 27 18:55:08 2014
@@ -0,0 +1 @@
+0001-thumbnailer-Remove-totem-disc-usage.patch