summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-11-13 15:15:47 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2013-11-14 21:56:27 (GMT)
commit678e42bdcc31b6f416c9885fc90498a4700276cd (patch)
treef9f3c827e72628596bd3daac7bc4d14b00868460
parenta9f02ffa711079ba835af431802e0a3b7b006904 (diff)
downloadmeta-intel-678e42bdcc31b6f416c9885fc90498a4700276cd.tar.gz
libva-intel-driver: upgrade to 1.2.1
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@intel.com> Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
-rw-r--r--common/recipes-multimedia/libva/libva-intel-driver.inc24
-rw-r--r--common/recipes-multimedia/libva/libva-intel-driver/0001-Workaround-for-concurrently-playing-VC1-and-H264-vid.patch (renamed from common/recipes-multimedia/libva/libva-intel-driver-1.2.0/0001-Workaround-for-concurrently-playing-VC1-and-H264-vid.patch)0
-rw-r--r--common/recipes-multimedia/libva/libva-intel-driver/wayland-include.patch30
-rw-r--r--common/recipes-multimedia/libva/libva-intel-driver_1.2.0.bb8
-rw-r--r--common/recipes-multimedia/libva/libva-intel-driver_1.2.1.bb31
5 files changed, 61 insertions, 32 deletions
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 @@
1SUMMARY = "VA driver for Intel G45 & HD Graphics family"
2DESCRIPTION = "libva-driver-intel is the VA-API implementation \
3for Intel G45 chipsets and Intel HD Graphics for Intel Core \
4processor family."
5
6HOMEPAGE = "http://www.freedesktop.org/wiki/Software/vaapi"
7BUGTRACKER = "https://bugs.freedesktop.org"
8
9LICENSE = "MIT"
10LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f"
11
12COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
13
14INC_PR = "r0"
15
16DEPENDS = "libva"
17
18S = "${WORKDIR}/${PN}-${PV}"
19
20inherit autotools pkgconfig
21
22FILES_${PN} += "${libdir}/dri/*.so"
23FILES_${PN}-dev += "${libdir}/dri/*.la"
24FILES_${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
index e000632..e000632 100644
--- 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
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 @@
1Fix a compile error when building without X11.
2
3Upstream-Status: Submitted
4Signed-off-by: Ross Burton <ross.burton@intel.com>
5
6From a5c44e48dc73b2892f161bd21591c7ee0a3b7842 Mon Sep 17 00:00:00 2001
7From: Ross Burton <ross.burton@intel.com>
8Date: Mon, 21 Oct 2013 16:25:18 +0100
9Subject: [PATCH] i965_output_wayland: add missing include
10
11Signed-off-by: Ross Burton <ross.burton@intel.com>
12---
13 src/i965_output_wayland.h | 1 +
14 1 file changed, 1 insertion(+)
15
16diff --git a/src/i965_output_wayland.h b/src/i965_output_wayland.h
17index 61ca39f..acea8d9 100644
18--- a/src/i965_output_wayland.h
19+++ b/src/i965_output_wayland.h
20@@ -26,6 +26,7 @@
21 #define I965_OUTPUT_WAYLAND_H
22
23 #include <stdbool.h>
24+#include <va/va_backend.h>
25
26 bool
27 i965_output_wayland_init(VADriverContextP ctx);
28--
291.7.10.4
30
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 @@
1require libva-intel-driver.inc
2
3SRC_URI = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/libva-intel-driver-${PV}.tar.bz2"
4
5SRC_URI += "file://0001-Workaround-for-concurrently-playing-VC1-and-H264-vid.patch"
6
7SRC_URI[md5sum] = "afdd4c91ac552a14b4d0ce93b75c88bb"
8SRC_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 @@
1SUMMARY = "VA driver for Intel G45 & HD Graphics family"
2DESCRIPTION = "libva-driver-intel is the VA-API implementation \
3for Intel G45 chipsets and Intel HD Graphics for Intel Core \
4processor family."
5
6HOMEPAGE = "http://www.freedesktop.org/wiki/Software/vaapi"
7BUGTRACKER = "https://bugs.freedesktop.org"
8
9LICENSE = "MIT"
10LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f"
11
12COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
13
14DEPENDS = "libva libdrm"
15
16SRC_URI = "http://www.freedesktop.org/software/vaapi/releases/${BPN}/${BPN}-${PV}.tar.bz2"
17SRC_URI += "file://wayland-include.patch"
18
19SRC_URI[md5sum] = "8248d224d35c9544777f1c7250f581b2"
20SRC_URI[sha256sum] = "5c6917c961b1de7f0d5ea3a6feac8eeec098d8aff6cdf2bca44e9b3083515186"
21
22inherit autotools pkgconfig
23
24PACKAGECONFIG ??= "${@base_contains("DISTRO_FEATURES", "x11", "x11", "", d)} \
25 ${@base_contains("DISTRO_FEATURES", "opengl wayland", "wayland", "", d)}"
26PACKAGECONFIG[x11] = "--enable-x11,--disable-x11"
27PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland virtual/egl"
28
29FILES_${PN} += "${libdir}/dri/*.so"
30FILES_${PN}-dev += "${libdir}/dri/*.la"
31FILES_${PN}-dbg += "${libdir}/dri/.debug"