[totem-pl-parser/f16] Add upstream compile fix for libquvi.so.7
Nicoleau Fabien
eponyme at fedoraproject.org
Tue Dec 6 22:54:08 UTC 2011
commit 164263a3702ad984c534b0d9e21c66d05058890a
Author: eponyme <eponyme at fedoraproject.org>
Date: Tue Dec 6 23:54:01 2011 +0100
Add upstream compile fix for libquvi.so.7
totem-pl-parser-quvi-0.4.patch | 38 ++++++++++++++++++++++++++++++++++++++
totem-pl-parser.spec | 10 ++++++++--
2 files changed, 46 insertions(+), 2 deletions(-)
---
diff --git a/totem-pl-parser-quvi-0.4.patch b/totem-pl-parser-quvi-0.4.patch
new file mode 100644
index 0000000..4f98aa2
--- /dev/null
+++ b/totem-pl-parser-quvi-0.4.patch
@@ -0,0 +1,38 @@
+From 4e15c57a438ee900f6ce601810a59a316b039fa1 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Fri, 21 Oct 2011 15:36:26 +0000
+Subject: lib: Require quvi 0.4.0
+
+And adapt API usage.
+
+Original patch by Marien Zwart in:
+https://bugs.gentoo.org/show_bug.cgi?id=386651
+
+https://bugzilla.gnome.org/show_bug.cgi?id=661451
+---
+diff --git a/plparse/totem-pl-parser-videosite.c b/plparse/totem-pl-parser-videosite.c
+index 9706d5a..b1645d6 100644
+--- a/plparse/totem-pl-parser-videosite.c
++++ b/plparse/totem-pl-parser-videosite.c
+@@ -75,7 +75,7 @@ totem_pl_parser_add_videosite (TotemPlParser *parser,
+ #ifdef HAVE_QUVI
+ QUVIcode rc;
+ quvi_t handle;
+- quvi_video_t v;
++ quvi_media_t v;
+ char *uri;
+ /* properties */
+ const char *video_uri;
+@@ -104,8 +104,8 @@ totem_pl_parser_add_videosite (TotemPlParser *parser,
+ return TOTEM_PL_PARSER_RESULT_ERROR;
+ }
+
+- getprop (QUVIPROP_VIDEOURL, video_uri);
+- if (quvi_getprop (v, QUVIPROP_VIDEOFILELENGTH, &length) == QUVI_OK)
++ getprop (QUVIPROP_MEDIAURL, video_uri);
++ if (quvi_getprop (v, QUVIPROP_MEDIACONTENTLENGTH, &length) == QUVI_OK)
+ length_str = g_strdup_printf ("%f", length);
+ else
+ length_str = NULL;
+--
+cgit v0.9.0.2
diff --git a/totem-pl-parser.spec b/totem-pl-parser.spec
index 542e367..0e60daa 100644
--- a/totem-pl-parser.spec
+++ b/totem-pl-parser.spec
@@ -1,6 +1,6 @@
Name: totem-pl-parser
Version: 2.32.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Totem Playlist Parser library
Group: System Environment/Libraries
@@ -9,13 +9,15 @@ Url: http://www.gnome.org/projects/totem/
Source0: http://download.gnome.org/sources/%{name}/2.31/%{name}-%{version}.tar.bz2
Obsoletes: totem-plparser
+Patch0: totem-pl-parser-quvi-0.4.patch
+
BuildRequires: glib2-devel
BuildRequires: gmime-devel
BuildRequires: libxml2-devel
BuildRequires: libsoup-devel
BuildRequires: gobject-introspection-devel
BuildRequires: gettext
-BuildRequires: quvi-devel
+BuildRequires: libquvi-devel
BuildRequires: libarchive-devel
BuildRequires: perl(XML::Parser) intltool
@@ -38,6 +40,7 @@ developing applications that use %{name}.
%prep
%setup -q
+%patch0 -p1
%build
%configure --enable-static=no
@@ -68,6 +71,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%{_datadir}/gir-1.0/*.gir
%changelog
+* Tue Dec 6 2011 Fabien Nicoleau <nicoleau.fabien at gmail.com> 2.32.6-2
+- Add upstream compile fix for libquvi.so.7 (and rebuild for this version)
+
* Tue Sep 20 2011 Bastien Nocera <bnocera at redhat.com> 2.32.6-1
- Update to 2.32.6
More information about the scm-commits
mailing list