From da5dc7186d3caf42ae206fce538d73d5fafb2741 Mon Sep 17 00:00:00 2001
From: Tom Zanussi <tom.zanussi@intel.com>
Date: Tue, 29 May 2012 23:02:56 -0500
Subject: gstreamer-vaapi: fix glib includes

Fix "Only <glib.h> can be included directly" compilation errors seen
when building with 1.3/master.

Patch pulled from a post-0.2.9 gstreamer-vaapi version (which however
doesn't work with the current stack so a straight upgrade won't work
as a fix at this point).

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 .../gstreamer/gstreamer-vaapi/glib-includes.patch  | 49 ++++++++++++++++++++++
 .../gstreamer/gstreamer-vaapi_git.bb               |  4 +-
 2 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 common/recipes-multimedia/gstreamer/gstreamer-vaapi/glib-includes.patch

diff --git a/common/recipes-multimedia/gstreamer/gstreamer-vaapi/glib-includes.patch b/common/recipes-multimedia/gstreamer/gstreamer-vaapi/glib-includes.patch
new file mode 100644
index 00000000..381e507e
--- /dev/null
+++ b/common/recipes-multimedia/gstreamer/gstreamer-vaapi/glib-includes.patch
@@ -0,0 +1,49 @@
+commit a698766a8b155b9c282ee1d53c39a833c826616d
+Author: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
+Date:   Tue Feb 7 10:01:01 2012 +0100
+
+    glib: fix includes.
+
+Upstream-Status: Backport
+
+Signed-off-by: Tom Zanussi <tom.zanussi (a] intel.com>
+
+Index: git/gst-libs/gst/vaapi/gstvaapiutils.h
+===================================================================
+--- git.orig/gst-libs/gst/vaapi/gstvaapiutils.h	2012-05-29 22:30:37.007259101 -0500
++++ git/gst-libs/gst/vaapi/gstvaapiutils.h	2012-05-29 22:32:03.896466158 -0500
+@@ -23,7 +23,7 @@
+ #define GST_VAAPI_UTILS_H
+ 
+ #include "config.h"
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ #ifdef GST_VAAPI_USE_OLD_VAAPI_0_29
+ # include <va.h>
+Index: git/gst-libs/gst/vaapi/gstvaapiutils_glx.h
+===================================================================
+--- git.orig/gst-libs/gst/vaapi/gstvaapiutils_glx.h	2012-05-29 22:30:47.497252785 -0500
++++ git/gst-libs/gst/vaapi/gstvaapiutils_glx.h	2012-05-29 22:32:03.907085421 -0500
+@@ -27,7 +27,7 @@
+ #include <GL/glext.h>
+ #include <GL/glx.h>
+ #include <GL/glxext.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ #if GLX_GLXEXT_VERSION < 18
+ typedef void (*PFNGLXBINDTEXIMAGEEXTPROC)(Display *, GLXDrawable, int, const int *);
+Index: git/gst-libs/gst/vaapi/gstvaapiutils_x11.h
+===================================================================
+--- git.orig/gst-libs/gst/vaapi/gstvaapiutils_x11.h	2012-05-29 22:30:56.827305274 -0500
++++ git/gst-libs/gst/vaapi/gstvaapiutils_x11.h	2012-05-29 22:32:03.916668015 -0500
+@@ -24,7 +24,7 @@
+ 
+ #include "config.h"
+ #include <X11/Xlib.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ void x11_trap_errors(void)
+     attribute_hidden;
diff --git a/common/recipes-multimedia/gstreamer/gstreamer-vaapi_git.bb b/common/recipes-multimedia/gstreamer/gstreamer-vaapi_git.bb
index 8ffbb516..fe601cca 100644
--- a/common/recipes-multimedia/gstreamer/gstreamer-vaapi_git.bb
+++ b/common/recipes-multimedia/gstreamer/gstreamer-vaapi_git.bb
@@ -13,7 +13,9 @@ SRCREV = "c98c14bd32855467a5a0ff21b6c703e9e3461467"
 PV = "0.2.9+git${SRCPV}"
 PR = "r0"
 
-SRC_URI = "git://gitorious.org/vaapi/gstreamer-vaapi.git"
+SRC_URI = "git://gitorious.org/vaapi/gstreamer-vaapi.git \
+           file://glib-includes.patch"
+
 SRC_URI[md5sum] = "729d75f21df79114a8c81d896489e5ad"
 SRC_URI[sha256sum] = "f1770c4537f1615701dbc845eee5732fbb1036b3acafbc7488e551fab334a31d"
 
-- 
cgit v1.2.3-54-g00ecf