CaROS/meta-intel
3
0
Fork 0
mirror of git://git.yoctoproject.org/meta-intel synced 2026-01-01 13:58:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

gstreamer-vaapi: Update to 0.6.1

Browse Source 
Backport a patch to remove unneeded headers that cause the build to fail

Signed-off-by: Saul Wold <sgw@linux.intel.com>
This commit is contained in:
Saul Wold 2015-12-11 10:07:44 -08:00
parent 6cc51b5806
commit 0c187f62ba
3 changed files with 68 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/recipes-multimedia/gstreamer/gstreamer-vaapi-1.0_0.5.10.bb
View File

@ -1,9 +0,0 @@
require gstreamer-vaapi.inc
DEPENDS += "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
GST_API_VERSION = "1.4"
SRC_URI[md5sum] = "3bd90b696b644be943450ba0c1497193"
SRC_URI[sha256sum] = "0dd236c7bf225322b8934fdba99a7a9e4542566a2acbe7564cdc3ec2c8b73c9d"

10
common/recipes-multimedia/gstreamer/gstreamer-vaapi-1.0_0.6.1.bb Normal file
View File

@ -0,0 +1,10 @@
require gstreamer-vaapi.inc
DEPENDS += "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
GST_API_VERSION = "1.4"
SRC_URI += "file://0001-libs-remove-unneeded-headers.patch"
SRC_URI[md5sum] = "f01425481bd161f57334dab7ab4069d3"
SRC_URI[sha256sum] = "36fc8afeb7ec679ea8df34671a34dba57dcc0b66255fb0991acb485e3efd67b3"

58
common/recipes-multimedia/gstreamer/gstreamer-vaapi/0001-libs-remove-unneeded-headers.patch Normal file
View File

@ -0,0 +1,58 @@
Upstream-Status: Backport from upstream
Signed-off-by: Saul Wold <sgw@linux.intel.com>
From f182fcfb379344690292c52542f92a9e7f0bf1a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?=
<victorx.jaquez@intel.com>
Date: Wed, 4 Nov 2015 16:50:44 +0100
Subject: [PATCH] libs: remove unneeded headers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Since gstvaapidisplay_glx.h do not expose gl.h/glx.h structures, it is not
required to include them in the header. It is not also required to include
them in gstvaapidisplay_glx.c, since gstvaapiutils_glx.h includes them and
exposes their structures (e.g. GLXPixmap).
Nonetheless, glext.h neither glxext.h are required to include, they are
already included conditionally by gl.h and glx.h, respectively.
Signed-off-by: Víctor Manuel Jáquez Leal <victorx.jaquez@intel.com>
https://bugzilla.gnome.org/show_bug.cgi?id=757577
---
gst-libs/gst/vaapi/gstvaapidisplay_glx.h | 2 --
gst-libs/gst/vaapi/gstvaapiutils_glx.h | 2 --
2 files changed, 4 deletions(-)
diff --git a/gst-libs/gst/vaapi/gstvaapidisplay_glx.h b/gst-libs/gst/vaapi/gstvaapidisplay_glx.h
index 8096cb2..485c413 100644
--- a/gst-libs/gst/vaapi/gstvaapidisplay_glx.h
+++ b/gst-libs/gst/vaapi/gstvaapidisplay_glx.h
@@ -25,8 +25,6 @@
#ifndef GST_VAAPI_DISPLAY_GLX_H
#define GST_VAAPI_DISPLAY_GLX_H
-#include <GL/gl.h>
-#include <GL/glx.h>
#include <gst/vaapi/gstvaapidisplay_x11.h>
G_BEGIN_DECLS
diff --git a/gst-libs/gst/vaapi/gstvaapiutils_glx.h b/gst-libs/gst/vaapi/gstvaapiutils_glx.h
index c89c85f..d78b3ee 100644
--- a/gst-libs/gst/vaapi/gstvaapiutils_glx.h
+++ b/gst-libs/gst/vaapi/gstvaapiutils_glx.h
@@ -28,9 +28,7 @@
#include "config.h"
#include "libgstvaapi_priv_check.h"
#include <GL/gl.h>
-#include <GL/glext.h>
#include <GL/glx.h>
-#include <GL/glxext.h>
#include <glib.h>
#if GLX_GLXEXT_VERSION < 18
--
2.5.0