gstreamer-vaapi: upgrade to 0.4.3

Use tarballs instead of git tags (upstream git means using submodules, which are
tricky).

Also use PACKAGECONFIG to respect x11/wayland DISTRO_FEATURES.

Delete glib-includes.patch, as it wasn't being used.

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>

3 files changed, 24 insertions, 86 deletions

diff --git a/common/recipes-multimedia/gstreamer/gstreamer-vaapi/glib-includes.patch b/common/recipes-multimedia/gstreamer/gstreamer-vaapi/glib-includes.patch
deleted file mode 100644
index 381e507e..00000000
--- a/common/recipes-multimedia/gstreamer/gstreamer-vaapi/glib-includes.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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_0.4.3.bb b/common/recipes-multimedia/gstreamer/gstreamer-vaapi_0.4.3.bb
new file mode 100644
index 00000000..93e0fbc5
--- /dev/null
+++ b/common/recipes-multimedia/gstreamer/gstreamer-vaapi_0.4.3.bb
@@ -0,0 +1,24 @@
+SUMMARY = "VA-API support to GStreamer"
+DESCRIPTION = "gstreamer-vaapi consists of a collection of VA-API \
+based plugins for GStreamer and helper libraries: `vaapidecode', \
+`vaapiconvert', and `vaapisink'."
+
+LICENSE = "LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
+
+DEPENDS = "gstreamer gst-plugins-base gst-plugins-bad libva"
+
+SRC_URI = "http://www.freedesktop.org/software/vaapi/releases/${BPN}/${BPN}-${PV}.tar.bz2"
+SRC_URI[md5sum] = "7b1ede7193bc5a0aca921c490684f7b5"
+SRC_URI[sha256sum] = "68e0598456fe17085f6b8b1ce3da066322cc02c363955fb319776a5404d2b0da"
+
+inherit autotools pkgconfig gtk-doc
+
+PACKAGECONFIG ??= "${@base_contains("DISTRO_FEATURES", "x11", "x11", "", d)} \
+                   ${@base_contains("DISTRO_FEATURES", "wayland", "wayland", "", d)}"
+PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxrandr"
+PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland"
+
+FILES_${PN} += "${libdir}/gstreamer-0.10/*.so"
+FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
+FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a"
diff --git a/common/recipes-multimedia/gstreamer/gstreamer-vaapi_git.bb b/common/recipes-multimedia/gstreamer/gstreamer-vaapi_git.bb
deleted file mode 100644
index bdcf88ff..00000000
--- a/common/recipes-multimedia/gstreamer/gstreamer-vaapi_git.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-SUMMARY = "VA-API support to GStreamer"
-DESCRIPTION = "gstreamer-vaapi consists of a collection of VA-API \
-based plugins for GStreamer and helper libraries: `vaapidecode', \
-`vaapiconvert', and `vaapisink'."
-
-LICENSE = "LGPLv2.1+"
-LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
-
-DEPENDS = "gstreamer gst-plugins-base gst-plugins-bad libva"
-
-# 0.4.0 tag
-SRCREV = "329065546463512c8cc9c92c7f34510793ceb6dd"
-PV = "0.4.0+git${SRCPV}"
-PR = "r0"
-
-SRC_URI = "git://gitorious.org/vaapi/gstreamer-vaapi.git"
-
-SRC_URI[md5sum] = "729d75f21df79114a8c81d896489e5ad"
-SRC_URI[sha256sum] = "f1770c4537f1615701dbc845eee5732fbb1036b3acafbc7488e551fab334a31d"
-
-S = "${WORKDIR}/git"
-
-inherit autotools pkgconfig gtk-doc
-
-EXTRA_OECONF = "--disable-ffmpeg"
-
-do_configure_prepend() {
-  # DEBUG: Executing shell function do_configure
-  # ln: target `m4/' is not a directory: No such file or directory
-  # cp: cannot create regular file `m4/': Not a directory
-  # (should be fixed in autotools.bbclass)
-  mkdir --parents ${B}/m4
-}
-
-FILES_${PN} += "${libdir}/gstreamer-0.10/*.so"
-FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
-FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a"