r45455 - in /desktop/unstable/totem-pl-parser/debian: changelog patches/totem-pl-parser-use-old-quvi.patch
noskcaj-guest at users.alioth.debian.org
noskcaj-guest at users.alioth.debian.org
Thu Jul 2 08:29:54 UTC 2015
Author: noskcaj-guest
Date: Thu Jul 2 08:29:54 2015
New Revision: 45455
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45455
Log:
New upstream release
Modified:
desktop/unstable/totem-pl-parser/debian/changelog
desktop/unstable/totem-pl-parser/debian/patches/totem-pl-parser-use-old-quvi.patch
Modified: desktop/unstable/totem-pl-parser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem-pl-parser/debian/changelog?rev=45455&op=diff
==============================================================================
--- desktop/unstable/totem-pl-parser/debian/changelog [utf-8] (original)
+++ desktop/unstable/totem-pl-parser/debian/changelog [utf-8] Thu Jul 2 08:29:54 2015
@@ -1,3 +1,9 @@
+totem-pl-parser (3.10.5-1) UNRELEASED; urgency=medium
+
+ * New upstream release
+
+ -- Jackson Doak <noskcaj at ubuntu.com> Thu, 02 Jul 2015 18:22:58 +1000
+
totem-pl-parser (3.10.3-1) unstable; urgency=medium
* New upstream release.
Modified: desktop/unstable/totem-pl-parser/debian/patches/totem-pl-parser-use-old-quvi.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem-pl-parser/debian/patches/totem-pl-parser-use-old-quvi.patch?rev=45455&op=diff
==============================================================================
--- desktop/unstable/totem-pl-parser/debian/patches/totem-pl-parser-use-old-quvi.patch [utf-8] (original)
+++ desktop/unstable/totem-pl-parser/debian/patches/totem-pl-parser-use-old-quvi.patch [utf-8] Thu Jul 2 08:29:54 2015
@@ -9,22 +9,20 @@
configure.ac
plparse/videosite-parser.c
---
- configure.ac | 8 +-
- plparse/Makefile.am | 9 --
- plparse/totem-pl-parser-videosite.c | 162 ++++++++++++++--------------
- plparse/videosite-parser.c | 191 ----------------------------------
- totem-plparser-mini-uninstalled.pc.in | 2 +-
- totem-plparser-mini.pc.in | 2 +-
- totem-plparser-uninstalled.pc.in | 2 +-
- totem-plparser.pc.in | 2 +-
- 8 files changed, 94 insertions(+), 284 deletions(-)
+ configure.ac | 8 -
+ plparse/Makefile.am | 9 -
+ plparse/totem-pl-parser-videosite.c | 162 +++++++++++++++-------------
+ plparse/videosite-parser.c | 191 ----------------------------------
+ totem-plparser-mini-uninstalled.pc.in | 2
+ totem-plparser-mini.pc.in | 2
+ totem-plparser-uninstalled.pc.in | 2
+ totem-plparser.pc.in | 2
+ 8 files changed, 93 insertions(+), 285 deletions(-)
delete mode 100644 plparse/videosite-parser.c
-diff --git a/configure.ac b/configure.ac
-index 6c574e5..df205e5 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -45,7 +45,7 @@ AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
+@@ -45,7 +45,7 @@ AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenum
# Requirements
GLIB_REQS=2.31.0
GIO_REQS=2.24.0
@@ -55,8 +53,6 @@
##################################
# Checking libarchive dependency
-diff --git a/plparse/Makefile.am b/plparse/Makefile.am
-index 949975b..aee6393 100644
--- a/plparse/Makefile.am
+++ b/plparse/Makefile.am
@@ -72,7 +72,6 @@ libtotem_plparser_la_CPPFLAGS = \
@@ -89,11 +85,9 @@
# Introspection
-include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS =
-diff --git a/plparse/totem-pl-parser-videosite.c b/plparse/totem-pl-parser-videosite.c
-index 743ef7f..631f4ca 100644
--- a/plparse/totem-pl-parser-videosite.c
+++ b/plparse/totem-pl-parser-videosite.c
-@@ -24,41 +24,36 @@
+@@ -24,6 +24,14 @@
#include <string.h>
#include <glib.h>
@@ -108,15 +102,16 @@
#include "totem-pl-parser-mini.h"
#include "totem-pl-parser-videosite.h"
#include "totem-pl-parser-private.h"
-
--#define BASE 20
--
- gboolean
+@@ -32,35 +40,20 @@ gboolean
totem_pl_parser_is_videosite (const char *uri, gboolean debug)
{
#ifdef HAVE_QUVI
- const char *args[] = {
+-#ifdef UNINSTALLED_TESTS
+- "../totem-pl-parser-videosite",
+-#else
- LIBEXECDIR "/totem-pl-parser-videosite",
+-#endif
- "--check",
- "--url",
- NULL,
@@ -155,7 +150,7 @@
#else
return FALSE;
#endif /* HAVE_QUVI */
-@@ -66,6 +61,10 @@ totem_pl_parser_is_videosite (const char *uri, gboolean debug)
+@@ -68,6 +61,10 @@ totem_pl_parser_is_videosite (const char
#ifndef TOTEM_PL_PARSER_MINI
@@ -166,7 +161,7 @@
TotemPlParserResult
totem_pl_parser_add_videosite (TotemPlParser *parser,
GFile *file,
-@@ -74,64 +73,75 @@ totem_pl_parser_add_videosite (TotemPlParser *parser,
+@@ -76,64 +73,75 @@ totem_pl_parser_add_videosite (TotemPlPa
gpointer data)
{
#ifdef HAVE_QUVI
@@ -197,13 +192,10 @@
+ const char *thumb_url;
+ double duration;
+ char *duration_str;
-+
+
+- uri = g_file_get_uri (file);
+ if (quvi_init (&handle) != QUVI_OK)
+ return TOTEM_PL_PARSER_RESULT_ERROR;
-
-- uri = g_file_get_uri (file);
-+ quvi_setopt(handle, QUVIOPT_NOVERIFY, TRUE);
-+ quvi_setopt(handle, QUVIOPT_FORMAT, "best");
- args[2] = uri;
- g_spawn_sync (NULL,
@@ -223,6 +215,9 @@
- if (g_str_equal (out, "TOTEM_PL_PARSER_RESULT_ERROR"))
- return TOTEM_PL_PARSER_RESULT_ERROR;
- if (g_str_equal (out, "TOTEM_PL_PARSER_RESULT_UNHANDLED"))
++ quvi_setopt(handle, QUVIOPT_NOVERIFY, TRUE);
++ quvi_setopt(handle, QUVIOPT_FORMAT, "best");
++
+ uri = g_file_get_uri (file);
+ rc = quvi_parse(handle, uri, &v);
+ if (rc != QUVI_OK) {
@@ -253,9 +248,6 @@
- g_strfreev (line);
- }
- g_strfreev (lines);
--
-- totem_pl_parser_add_hash_table (parser, ht, new_uri, FALSE);
-- g_free (new_uri);
+ getprop (QUVIPROP_MEDIAURL, video_uri);
+ if (quvi_getprop (v, QUVIPROP_MEDIACONTENTLENGTH, &length) == QUVI_OK && length)
+ length_str = g_strdup_printf ("%f", length);
@@ -287,15 +279,14 @@
+ g_free (uri);
+ g_free (length_str);
+ g_free (duration_str);
-+
+
+- totem_pl_parser_add_hash_table (parser, ht, new_uri, FALSE);
+- g_free (new_uri);
+ quvi_parse_close (&v);
+ quvi_close (&handle);
return TOTEM_PL_PARSER_RESULT_SUCCESS;
#else
-diff --git a/plparse/videosite-parser.c b/plparse/videosite-parser.c
-deleted file mode 100644
-index be374aa..0000000
--- a/plparse/videosite-parser.c
+++ /dev/null
@@ -1,191 +0,0 @@
@@ -490,8 +481,6 @@
-
- return 0;
-}
-diff --git a/totem-plparser-mini-uninstalled.pc.in b/totem-plparser-mini-uninstalled.pc.in
-index fb22f66..cb6c437 100644
--- a/totem-plparser-mini-uninstalled.pc.in
+++ b/totem-plparser-mini-uninstalled.pc.in
@@ -7,6 +7,6 @@ Name: totem-plparser
@@ -502,8 +491,6 @@
+Requires.private: gthread-2.0 @QUVI@
Libs: ${pc_top_builddir}/${pcfiledir}/plparse/libtotem-plparser-mini.la
Cflags: -I${pc_top_builddir}/${pcfiledir}/plparse
-diff --git a/totem-plparser-mini.pc.in b/totem-plparser-mini.pc.in
-index 29ae520..777b93b 100644
--- a/totem-plparser-mini.pc.in
+++ b/totem-plparser-mini.pc.in
@@ -7,6 +7,6 @@ Name: totem-plparser-mini
@@ -514,8 +501,6 @@
+Requires.private: gthread-2.0 @QUVI@
Libs: -L${libdir} -ltotem-plparser-mini
Cflags: -I${includedir}/totem-pl-parser/1/plparser
-diff --git a/totem-plparser-uninstalled.pc.in b/totem-plparser-uninstalled.pc.in
-index 7264037..6a3d0be 100644
--- a/totem-plparser-uninstalled.pc.in
+++ b/totem-plparser-uninstalled.pc.in
@@ -7,7 +7,7 @@ Name: totem-plparser
@@ -527,8 +512,6 @@
Libs: ${pc_top_builddir}/${pcfiledir}/plparse/libtotem-plparser.la
Libs.private: @LIBGCRYPT_LIBS@
Cflags: -I${pc_top_builddir}/${pcfiledir}/plparse @LIBGCRYPT_CFLAGS@
-diff --git a/totem-plparser.pc.in b/totem-plparser.pc.in
-index 16f9240..abf3cdd 100644
--- a/totem-plparser.pc.in
+++ b/totem-plparser.pc.in
@@ -7,7 +7,7 @@ Name: totem-plparser
@@ -540,6 +523,3 @@
Libs: -L${libdir} -ltotem-plparser
Libs.private: @LIBGCRYPT_LIBS@
Cflags: -I${includedir}/totem-pl-parser/1/plparser @LIBGCRYPT_CFLAGS@
---
-2.0.0.rc0
-
More information about the pkg-gnome-commits
mailing list