[gtk-osx] Patch wrong include order in old versions of gstreamer's gstdatetime.c
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-osx] Patch wrong include order in old versions of gstreamer's gstdatetime.c
- Date: Sun, 5 Oct 2014 17:37:02 +0000 (UTC)
commit 9d43ad9f1fea15bab4ad930fa3b13194dad3735d
Author: Mario Sanchez Prada <mario mariospr org>
Date: Fri May 30 21:48:51 2014 +0100
Patch wrong include order in old versions of gstreamer's gstdatetime.c
Swapping the positions of includes for glib-compat-private.h and
gst_private.h prevents getting the following error while building:
error: use of undeclared identifier 'g_log_domain_gstreamer'
Note: This has been fixed upstream in gstreamer 1.2.1
modulesets-stable/gtk-osx-gstreamer.modules | 2 ++
modulesets/gtk-osx-gstreamer.modules | 8 ++++++--
.../gstreamer-fix-includes-in-gstdatetime.patch | 12 ++++++++++++
3 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-gstreamer.modules b/modulesets-stable/gtk-osx-gstreamer.modules
index 1cb5432..9e4ba08 100644
--- a/modulesets-stable/gtk-osx-gstreamer.modules
+++ b/modulesets-stable/gtk-osx-gstreamer.modules
@@ -31,6 +31,7 @@
makeargs="ERROR_CFLAGS=" autogen-sh="configure">
<branch module="gstreamer/0.10/gstreamer-0.10.35.tar.bz2" version="0.10.35"
hash="sha256:817bfea2cd46e2487b97e2ed9218f0299b32a3de1e5e80b4c7868d17e9089786">
+ <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/gstreamer-fix-includes-in-gstdatetime.patch"
strip="1"/>
</branch>
<after>
<dep package="glib"/>
@@ -41,6 +42,7 @@
makeargs="ERROR_CFLAGS=" autogen-sh="configure">
<branch module="gstreamer/1.0/gstreamer-1.0.2.tar.xz" version="1.0.2"
hash="sha256:10c59112bb01a274eb33950300da13d25fd23a7494781bf1b2328372fdb6ee06">
+ <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/gstreamer-fix-includes-in-gstdatetime.patch"
strip="1"/>
</branch>
<after>
<dep package="glib"/>
diff --git a/modulesets/gtk-osx-gstreamer.modules b/modulesets/gtk-osx-gstreamer.modules
index 9d7a6f5..d35a678 100644
--- a/modulesets/gtk-osx-gstreamer.modules
+++ b/modulesets/gtk-osx-gstreamer.modules
@@ -28,7 +28,9 @@
<autotools id="gstreamer" autogenargs="--disable-tests"
supports-non-srcdir-builds="no"
makeargs="ERROR_CFLAGS=" >
- <branch revision="0.10"/>
+ <branch revision="0.10">
+ <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/gstreamer-fix-includes-in-gstdatetime.patch"
strip="1"/>
+ </branch>
<after>
<dep package="glib"/>
<dep package="libxml2"/>
@@ -38,7 +40,9 @@
<autotools id="gstreamer-1.0" autogenargs="--disable-tests"
supports-non-srcdir-builds="no"
makeargs="ERROR_CFLAGS=" >
- <branch module="gstreamer" revision="1.0"/>
+ <branch module="gstreamer" revision="1.0">
+ <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/gstreamer-fix-includes-in-gstdatetime.patch"
strip="1"/>
+ </branch>
<after>
<dep package="glib"/>
<dep package="libxml2"/>
diff --git a/patches/gstreamer-fix-includes-in-gstdatetime.patch
b/patches/gstreamer-fix-includes-in-gstdatetime.patch
new file mode 100644
index 0000000..8c3b4cd
--- /dev/null
+++ b/patches/gstreamer-fix-includes-in-gstdatetime.patch
@@ -0,0 +1,12 @@
+--- a/gst/gstdatetime.c 2014-05-30 21:36:32.000000000 +0100
++++ b/gst/gstdatetime.c 2014-05-30 21:36:46.000000000 +0100
+@@ -21,8 +21,8 @@
+ #include "config.h"
+ #endif
+
+-#include "glib-compat-private.h"
+ #include "gst_private.h"
++#include "glib-compat-private.h"
+ #include "gstdatetime.h"
+ #include <glib.h>
+ #include <math.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]