[qt-gstreamer] Fix compilation with glib 2.29 (FTBFS #716209)
nucleo
nucleo at fedoraproject.org
Tue Aug 30 21:51:44 UTC 2011
commit 7514c08c7ea85ac2615a3551f12583e4d3d2d091
Author: nucleo <nucleo at fedoraproject.org>
Date: Wed Aug 31 00:51:31 2011 +0300
Fix compilation with glib 2.29 (FTBFS #716209)
qt-gstreamer-glib-2.29.patch | 22 ++++++++++++++++++++++
qt-gstreamer.spec | 11 +++++++++--
2 files changed, 31 insertions(+), 2 deletions(-)
---
diff --git a/qt-gstreamer-glib-2.29.patch b/qt-gstreamer-glib-2.29.patch
new file mode 100644
index 0000000..a3c7ee7
--- /dev/null
+++ b/qt-gstreamer-glib-2.29.patch
@@ -0,0 +1,22 @@
+From a5487083433341783733858b5c153b759053f032 Mon Sep 17 00:00:00 2001
+From: George Kiagiadakis <george.kiagiadakis at collabora.co.uk>
+Date: Tue, 09 Aug 2011 10:16:03 +0000
+Subject: Fix compilation with glib 2.29
+
+---
+diff --git a/src/QGst/caps.cpp b/src/QGst/caps.cpp
+index 0be9b70..3342ba4 100644
+--- a/src/QGst/caps.cpp
++++ b/src/QGst/caps.cpp
+@@ -126,7 +126,8 @@ bool Caps::isFixed() const
+
+ bool Caps::isWritable() const
+ {
+- return (GST_CAPS_REFCOUNT_VALUE(object<GstCaps>()) == 1);
++ GstCaps *caps = object<GstCaps>(); //workaround for bug #653266
++ return (GST_CAPS_REFCOUNT_VALUE(caps) == 1);
+ }
+
+ bool Caps::equals(const CapsPtr & caps2) const
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/qt-gstreamer.spec b/qt-gstreamer.spec
index d48dcce..8614598 100644
--- a/qt-gstreamer.spec
+++ b/qt-gstreamer.spec
@@ -1,6 +1,6 @@
Name: qt-gstreamer
Version: 0.10.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: C++ bindings for GStreamer with a Qt-style API
Group: System Environment/Libraries
@@ -9,6 +9,10 @@ URL: http://gstreamer.freedesktop.org/wiki/QtGStreamer
Source0: http://gstreamer.freedesktop.org/src/%{name}/%{name}-%{version}.tar.bz2
# fix LIB_INSTALL_DIR
Patch0: qt-gstreamer-0.10.1-libdir.patch
+# Fix compilation with glib 2.29
+# https://bugzilla.gnome.org/show_bug.cgi?id=653266
+# http://cgit.freedesktop.org/gstreamer/qt-gstreamer/commit/?id=a5487083433341783733858b5c153b759053f032
+Patch1: qt-gstreamer-glib-2.29.patch
BuildRequires: automoc bison flex
BuildRequires: boost-devel
@@ -38,7 +42,7 @@ for %{name}.
%prep
%setup -q
%patch0 -p1
-
+%patch1 -p1
%build
mkdir -p %{_target_platform}
@@ -86,5 +90,8 @@ rm -rf %{buildroot}
%changelog
+* Wed Aug 31 2011 Alexey Kurov <nucleo at fedoraproject.org> - 0.10.1-2
+- Fix compilation with glib 2.29 (FTBFS #716209)
+
* Thu Feb 3 2011 Alexey Kurov <nucleo at fedoraproject.org> - 0.10.1-1
- Initial RPM release
More information about the scm-commits
mailing list