[meta-intel] [PATCH] libva-intel-driver: upgrade to 1.2.1

[Ross Burton]

Remove the .bb/.inc split as we're only supporting one version.

Add PACKAGECONFIG for X11 and Wayland features.  Add patch to fix compile error
in builds with Wayland but without X11.

Drop the workaround patch, isn't relevant for released hardware.

Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 .../libva/libva-intel-driver.inc                   |   24 ---------------
 ...for-concurrently-playing-VC1-and-H264-vid.patch |    0
 .../libva/libva-intel-driver/wayland-include.patch |   30 +++++++++++++++++++
 .../libva/libva-intel-driver_1.2.0.bb              |    8 -----
 .../libva/libva-intel-driver_1.2.1.bb              |   31 ++++++++++++++++++++
 5 files changed, 61 insertions(+), 32 deletions(-)
 delete mode 100644 common/recipes-multimedia/libva/libva-intel-driver.inc
 rename common/recipes-multimedia/libva/{libva-intel-driver-1.2.0 => libva-intel-driver}/0001-Workaround-for-concurrently-playing-VC1-and-H264-vid.patch (100%)
 create mode 100644 common/recipes-multimedia/libva/libva-intel-driver/wayland-include.patch
 delete mode 100644 common/recipes-multimedia/libva/libva-intel-driver_1.2.0.bb
 create mode 100644 common/recipes-multimedia/libva/libva-intel-driver_1.2.1.bb

diff --git a/common/recipes-multimedia/libva/libva-intel-driver.inc b/common/recipes-multimedia/libva/libva-intel-driver.inc
deleted file mode 100644
index fa7be4c..0000000
--- a/common/recipes-multimedia/libva/libva-intel-driver.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY = "VA driver for Intel G45 & HD Graphics family"
-DESCRIPTION = "libva-driver-intel is the VA-API implementation \
-for Intel G45 chipsets and Intel HD Graphics for Intel Core \
-processor family."
-
-HOMEPAGE = "http://www.freedesktop.org/wiki/Software/vaapi"
-BUGTRACKER = "https://bugs.freedesktop.org"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f"
-
-COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
-
-INC_PR = "r0"
-
-DEPENDS = "libva"
-
-S = "${WORKDIR}/${PN}-${PV}"
-
-inherit autotools pkgconfig
-
-FILES_${PN} += "${libdir}/dri/*.so"
-FILES_${PN}-dev += "${libdir}/dri/*.la"
-FILES_${PN}-dbg += "${libdir}/dri/.debug"
diff --git a/common/recipes-multimedia/libva/libva-intel-driver-1.2.0/0001-Workaround-for-concurrently-playing-VC1-and-H264-vid.patch b/common/recipes-multimedia/libva/libva-intel-driver/0001-Workaround-for-concurrently-playing-VC1-and-H264-vid.patch
similarity index 100%
rename from common/recipes-multimedia/libva/libva-intel-driver-1.2.0/0001-Workaround-for-concurrently-playing-VC1-and-H264-vid.patch
rename to common/recipes-multimedia/libva/libva-intel-driver/0001-Workaround-for-concurrently-playing-VC1-and-H264-vid.patch
diff --git a/common/recipes-multimedia/libva/libva-intel-driver/wayland-include.patch b/common/recipes-multimedia/libva/libva-intel-driver/wayland-include.patch
new file mode 100644
index 0000000..4a46773
--- /dev/null
+++ b/common/recipes-multimedia/libva/libva-intel-driver/wayland-include.patch
@@ -0,0 +1,30 @@
+Fix a compile error when building without X11.
+
+Upstream-Status: Submitted
+Signed-off-by: Ross Burton <ross.burton at intel.com>
+
+From a5c44e48dc73b2892f161bd21591c7ee0a3b7842 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton at intel.com>
+Date: Mon, 21 Oct 2013 16:25:18 +0100
+Subject: [PATCH] i965_output_wayland: add missing include
+
+Signed-off-by: Ross Burton <ross.burton at intel.com>
+---
+ src/i965_output_wayland.h |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/i965_output_wayland.h b/src/i965_output_wayland.h
+index 61ca39f..acea8d9 100644
+--- a/src/i965_output_wayland.h
++++ b/src/i965_output_wayland.h
+@@ -26,6 +26,7 @@
+ #define I965_OUTPUT_WAYLAND_H
+ 
+ #include <stdbool.h>
++#include <va/va_backend.h>
+ 
+ bool
+ i965_output_wayland_init(VADriverContextP ctx);
+-- 
+1.7.10.4
+
diff --git a/common/recipes-multimedia/libva/libva-intel-driver_1.2.0.bb b/common/recipes-multimedia/libva/libva-intel-driver_1.2.0.bb
deleted file mode 100644
index dffde51..0000000
--- a/common/recipes-multimedia/libva/libva-intel-driver_1.2.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require libva-intel-driver.inc
-
-SRC_URI = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/libva-intel-driver-${PV}.tar.bz2"
-
-SRC_URI += "file://0001-Workaround-for-concurrently-playing-VC1-and-H264-vid.patch"
-
-SRC_URI[md5sum] = "afdd4c91ac552a14b4d0ce93b75c88bb"
-SRC_URI[sha256sum] = "a6fceaa118fe5d1a6e7382ed30e6684b4059b3fedd79eb53121a80e8016c748c"
diff --git a/common/recipes-multimedia/libva/libva-intel-driver_1.2.1.bb b/common/recipes-multimedia/libva/libva-intel-driver_1.2.1.bb
new file mode 100644
index 0000000..f90ad50
--- /dev/null
+++ b/common/recipes-multimedia/libva/libva-intel-driver_1.2.1.bb
@@ -0,0 +1,31 @@
+SUMMARY = "VA driver for Intel G45 & HD Graphics family"
+DESCRIPTION = "libva-driver-intel is the VA-API implementation \
+for Intel G45 chipsets and Intel HD Graphics for Intel Core \
+processor family."
+
+HOMEPAGE = "http://www.freedesktop.org/wiki/Software/vaapi"
+BUGTRACKER = "https://bugs.freedesktop.org"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f"
+
+COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
+
+DEPENDS = "libva libdrm"
+
+SRC_URI = "http://www.freedesktop.org/software/vaapi/releases/${BPN}/${BPN}-${PV}.tar.bz2"
+SRC_URI += "file://wayland-include.patch"
+
+SRC_URI[md5sum] = "8248d224d35c9544777f1c7250f581b2"
+SRC_URI[sha256sum] = "5c6917c961b1de7f0d5ea3a6feac8eeec098d8aff6cdf2bca44e9b3083515186"
+
+inherit autotools pkgconfig
+
+PACKAGECONFIG ??= "${@base_contains("DISTRO_FEATURES", "x11", "x11", "", d)} \
+                   ${@base_contains("DISTRO_FEATURES", "opengl wayland", "wayland", "", d)}"
+PACKAGECONFIG[x11] = "--enable-x11,--disable-x11"
+PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland virtual/egl"
+
+FILES_${PN} += "${libdir}/dri/*.so"
+FILES_${PN}-dev += "${libdir}/dri/*.la"
+FILES_${PN}-dbg += "${libdir}/dri/.debug"
-- 
1.7.10.4