summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2015-12-11 10:07:44 -0800
committerSaul Wold <sgw@linux.intel.com>2015-12-11 10:24:17 -0800
commit0c187f62ba7e3b40ece44cd0ad2e4b8107922dd7 (patch)
tree204259dcd68b9315396b69aed0e8bceeb0c927b0 /common
parent6cc51b58060c18e14e5c5b331596d469b4b364af (diff)
downloadmeta-intel-0c187f62ba7e3b40ece44cd0ad2e4b8107922dd7.tar.gz
gstreamer-vaapi: Update to 0.6.1
Backport a patch to remove unneeded headers that cause the build to fail Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'common')
-rw-r--r--common/recipes-multimedia/gstreamer/gstreamer-vaapi-1.0_0.5.10.bb9
-rw-r--r--common/recipes-multimedia/gstreamer/gstreamer-vaapi-1.0_0.6.1.bb10
-rw-r--r--common/recipes-multimedia/gstreamer/gstreamer-vaapi/0001-libs-remove-unneeded-headers.patch58
3 files changed, 68 insertions, 9 deletions
diff --git a/common/recipes-multimedia/gstreamer/gstreamer-vaapi-1.0_0.5.10.bb b/common/recipes-multimedia/gstreamer/gstreamer-vaapi-1.0_0.5.10.bb
deleted file mode 100644
index 1a1e0150..00000000
--- a/common/recipes-multimedia/gstreamer/gstreamer-vaapi-1.0_0.5.10.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1require gstreamer-vaapi.inc
2
3DEPENDS += "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
4
5GST_API_VERSION = "1.4"
6
7SRC_URI[md5sum] = "3bd90b696b644be943450ba0c1497193"
8SRC_URI[sha256sum] = "0dd236c7bf225322b8934fdba99a7a9e4542566a2acbe7564cdc3ec2c8b73c9d"
9
diff --git a/common/recipes-multimedia/gstreamer/gstreamer-vaapi-1.0_0.6.1.bb b/common/recipes-multimedia/gstreamer/gstreamer-vaapi-1.0_0.6.1.bb
new file mode 100644
index 00000000..48cd6fd7
--- /dev/null
+++ b/common/recipes-multimedia/gstreamer/gstreamer-vaapi-1.0_0.6.1.bb
@@ -0,0 +1,10 @@
1require gstreamer-vaapi.inc
2
3DEPENDS += "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
4
5GST_API_VERSION = "1.4"
6
7SRC_URI += "file://0001-libs-remove-unneeded-headers.patch"
8
9SRC_URI[md5sum] = "f01425481bd161f57334dab7ab4069d3"
10SRC_URI[sha256sum] = "36fc8afeb7ec679ea8df34671a34dba57dcc0b66255fb0991acb485e3efd67b3"
diff --git a/common/recipes-multimedia/gstreamer/gstreamer-vaapi/0001-libs-remove-unneeded-headers.patch b/common/recipes-multimedia/gstreamer/gstreamer-vaapi/0001-libs-remove-unneeded-headers.patch
new file mode 100644
index 00000000..66335501
--- /dev/null
+++ b/common/recipes-multimedia/gstreamer/gstreamer-vaapi/0001-libs-remove-unneeded-headers.patch
@@ -0,0 +1,58 @@
1Upstream-Status: Backport from upstream
2Signed-off-by: Saul Wold <sgw@linux.intel.com>
3
4From f182fcfb379344690292c52542f92a9e7f0bf1a3 Mon Sep 17 00:00:00 2001
5From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?=
6 <victorx.jaquez@intel.com>
7Date: Wed, 4 Nov 2015 16:50:44 +0100
8Subject: [PATCH] libs: remove unneeded headers
9MIME-Version: 1.0
10Content-Type: text/plain; charset=UTF-8
11Content-Transfer-Encoding: 8bit
12
13Since gstvaapidisplay_glx.h do not expose gl.h/glx.h structures, it is not
14required to include them in the header. It is not also required to include
15them in gstvaapidisplay_glx.c, since gstvaapiutils_glx.h includes them and
16exposes their structures (e.g. GLXPixmap).
17
18Nonetheless, glext.h neither glxext.h are required to include, they are
19already included conditionally by gl.h and glx.h, respectively.
20
21Signed-off-by: Víctor Manuel Jáquez Leal <victorx.jaquez@intel.com>
22
23https://bugzilla.gnome.org/show_bug.cgi?id=757577
24---
25 gst-libs/gst/vaapi/gstvaapidisplay_glx.h | 2 --
26 gst-libs/gst/vaapi/gstvaapiutils_glx.h | 2 --
27 2 files changed, 4 deletions(-)
28
29diff --git a/gst-libs/gst/vaapi/gstvaapidisplay_glx.h b/gst-libs/gst/vaapi/gstvaapidisplay_glx.h
30index 8096cb2..485c413 100644
31--- a/gst-libs/gst/vaapi/gstvaapidisplay_glx.h
32+++ b/gst-libs/gst/vaapi/gstvaapidisplay_glx.h
33@@ -25,8 +25,6 @@
34 #ifndef GST_VAAPI_DISPLAY_GLX_H
35 #define GST_VAAPI_DISPLAY_GLX_H
36
37-#include <GL/gl.h>
38-#include <GL/glx.h>
39 #include <gst/vaapi/gstvaapidisplay_x11.h>
40
41 G_BEGIN_DECLS
42diff --git a/gst-libs/gst/vaapi/gstvaapiutils_glx.h b/gst-libs/gst/vaapi/gstvaapiutils_glx.h
43index c89c85f..d78b3ee 100644
44--- a/gst-libs/gst/vaapi/gstvaapiutils_glx.h
45+++ b/gst-libs/gst/vaapi/gstvaapiutils_glx.h
46@@ -28,9 +28,7 @@
47 #include "config.h"
48 #include "libgstvaapi_priv_check.h"
49 #include <GL/gl.h>
50-#include <GL/glext.h>
51 #include <GL/glx.h>
52-#include <GL/glxext.h>
53 #include <glib.h>
54
55 #if GLX_GLXEXT_VERSION < 18
56--
572.5.0
58