From 0120167750078b7b0ed1c8454c04b57b90e73e98 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 21 Dec 2012 11:38:40 +0000 Subject: [PATCH] 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-graphics/directfb/directfb.inc | 3 +- .../directfb/directfb/mesa9.patch | 29 +++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/directfb/directfb/mesa9.patch 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" SRC_URI = "http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-${PV}.tar.gz \ file://directfb-1.2.x-fix-pkgconfig-cflags.patch \ - file://configurefix.patch" + file://configurefix.patch \ + file://mesa9.patch" S = "${WORKDIR}/DirectFB-${PV}" 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 @@ +Patch from upstream to fix build against Mesa 9. + +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From 54beba0715a4fead2a0aa5477977347f81fc2bc0 Mon Sep 17 00:00:00 2001 +From: Andreas Shimokawa +Date: Wed, 24 Oct 2012 18:01:15 +0200 +Subject: [PATCH] mesa: fix compatibility with mesa 9.0 + +--- + systems/mesa/mesa_surface_pool.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/systems/mesa/mesa_surface_pool.c b/systems/mesa/mesa_surface_pool.c +index 0a588bb..bfb5ff3 100644 +--- a/systems/mesa/mesa_surface_pool.c ++++ b/systems/mesa/mesa_surface_pool.c +@@ -297,7 +297,7 @@ mesaAllocateBuffer( CoreSurfacePool *pool, + alloc->bo = gbm_bo_create( mesa->gbm, surface->config.size.w, surface->config.size.h, GBM_BO_FORMAT_ARGB8888, + GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING ); + alloc->handle = gbm_bo_get_handle( alloc->bo ).u32; +- alloc->pitch = gbm_bo_get_pitch( alloc->bo ); ++ alloc->pitch = gbm_bo_get_stride( alloc->bo ); + + alloc->image = eglCreateImageKHR( mesa->dpy, NULL, EGL_NATIVE_PIXMAP_KHR, alloc->bo, NULL ); + +-- +1.7.9.5