summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-12-21 11:38:40 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-10 23:43:16 +0000
commit0120167750078b7b0ed1c8454c04b57b90e73e98 (patch)
treeb587e4c5978f4c53e79a930b7bc0b5b16253c4d0 /meta
parent909b3bee33eb50d567ed610caca6a4bad7446eb7 (diff)
downloadpoky-0120167750078b7b0ed1c8454c04b57b90e73e98.tar.gz
directfb: fix build against Mesa 9
Mesa 9 changed the libgbm API, so take a patch from upstream to fix this. (From OE-Core rev: ab6f8ea9ddc69433c3e84058d8ea5502cbab35c3) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/directfb/directfb.inc3
-rw-r--r--meta/recipes-graphics/directfb/directfb/mesa9.patch29
2 files changed, 31 insertions, 1 deletions
diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc
index bc0071f128..c9b8ff8887 100644
--- a/meta/recipes-graphics/directfb/directfb.inc
+++ b/meta/recipes-graphics/directfb/directfb.inc
@@ -15,7 +15,8 @@ INC_PR = "r0"
15 15
16SRC_URI = "http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-${PV}.tar.gz \ 16SRC_URI = "http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-${PV}.tar.gz \
17 file://directfb-1.2.x-fix-pkgconfig-cflags.patch \ 17 file://directfb-1.2.x-fix-pkgconfig-cflags.patch \
18 file://configurefix.patch" 18 file://configurefix.patch \
19 file://mesa9.patch"
19 20
20S = "${WORKDIR}/DirectFB-${PV}" 21S = "${WORKDIR}/DirectFB-${PV}"
21 22
diff --git a/meta/recipes-graphics/directfb/directfb/mesa9.patch b/meta/recipes-graphics/directfb/directfb/mesa9.patch
new file mode 100644
index 0000000000..43fd5c2040
--- /dev/null
+++ b/meta/recipes-graphics/directfb/directfb/mesa9.patch
@@ -0,0 +1,29 @@
1Patch from upstream to fix build against Mesa 9.
2
3Upstream-Status: Backport
4Signed-off-by: Ross Burton <ross.burton@intel.com>
5
6From 54beba0715a4fead2a0aa5477977347f81fc2bc0 Mon Sep 17 00:00:00 2001
7From: Andreas Shimokawa <andi@directfb.org>
8Date: Wed, 24 Oct 2012 18:01:15 +0200
9Subject: [PATCH] mesa: fix compatibility with mesa 9.0
10
11---
12 systems/mesa/mesa_surface_pool.c | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/systems/mesa/mesa_surface_pool.c b/systems/mesa/mesa_surface_pool.c
16index 0a588bb..bfb5ff3 100644
17--- a/systems/mesa/mesa_surface_pool.c
18+++ b/systems/mesa/mesa_surface_pool.c
19@@ -297,7 +297,7 @@ mesaAllocateBuffer( CoreSurfacePool *pool,
20 alloc->bo = gbm_bo_create( mesa->gbm, surface->config.size.w, surface->config.size.h, GBM_BO_FORMAT_ARGB8888,
21 GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING );
22 alloc->handle = gbm_bo_get_handle( alloc->bo ).u32;
23- alloc->pitch = gbm_bo_get_pitch( alloc->bo );
24+ alloc->pitch = gbm_bo_get_stride( alloc->bo );
25
26 alloc->image = eglCreateImageKHR( mesa->dpy, NULL, EGL_NATIVE_PIXMAP_KHR, alloc->bo, NULL );
27
28--
291.7.9.5