diff options
| author |   Lauren Post <lauren.post@freescale.com> | 2013-08-19 14:17:43 -0500 |
|---|---|---|
| committer |   Saul Wold <sgw@linux.intel.com> | 2013-08-22 09:15:35 -0700 |
| commit | 00c078ff442676acf5f4653fe8c5ebf29de811a4 (patch) | |
| tree | d9de3b293e65667e3334b04b1382e7be54fd04ef /meta | |
| parent | 1d08cef09cc7cbf682e8b372987fe4456961272b (diff) | |
| download | openembedded-core-contrib-00c078ff442676acf5f4653fe8c5ebf29de811a4.tar.gz | |
directfb: Upgrade to 1.6.3
Remove mesa patch as 1.6.3 provides compatibility with mesa
Signed-off-by: Lauren Post <lauren.post@freescale.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-graphics/directfb/directfb.inc | 3 | ||||
| -rw-r--r-- | meta/recipes-graphics/directfb/directfb/mesa9.patch | 29 | ||||
| -rwxr-xr-x[-rw-r--r--] | meta/recipes-graphics/directfb/directfb_1.6.3.bb (renamed from meta/recipes-graphics/directfb/directfb_1.6.1.bb) | 5 |
3 files changed, 3 insertions, 34 deletions
diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc index 7295c35546..60b12f7caa 100644 --- a/meta/recipes-graphics/directfb/directfb.inc +++ b/meta/recipes-graphics/directfb/directfb.inc @@ -14,8 +14,7 @@ DEPENDS = "jpeg libpng freetype zlib tslib" INC_PR = "r0" SRC_URI = "http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-${PV}.tar.gz \ - file://configurefix.patch \ - file://mesa9.patch" + file://configurefix.patch" S = "${WORKDIR}/DirectFB-${PV}" diff --git a/meta/recipes-graphics/directfb/directfb/mesa9.patch b/meta/recipes-graphics/directfb/directfb/mesa9.patch deleted file mode 100644 index 43fd5c2040..0000000000 --- a/meta/recipes-graphics/directfb/directfb/mesa9.patch +++ /dev/null @@ -1,29 +0,0 @@ -Patch from upstream to fix build against Mesa 9. - -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 54beba0715a4fead2a0aa5477977347f81fc2bc0 Mon Sep 17 00:00:00 2001 -From: Andreas Shimokawa <andi@directfb.org> -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 diff --git a/meta/recipes-graphics/directfb/directfb_1.6.1.bb b/meta/recipes-graphics/directfb/directfb_1.6.3.bb index 1230d12944..277e9a9b5e 100644..100755 --- a/meta/recipes-graphics/directfb/directfb_1.6.1.bb +++ b/meta/recipes-graphics/directfb/directfb_1.6.3.bb @@ -22,6 +22,5 @@ EXTRA_OECONF = "\ LEAD_SONAME = "libdirectfb-1.6.so.0" -SRC_URI[md5sum] = "76d3066e75664aa79204af545f2f3c65" -SRC_URI[sha256sum] = "f47575ea35dd8a30e548c04bf52d8565756d0bed45d1cf9f8afac1cf9b521c45" - +SRC_URI[md5sum] = "641e8e999c017770da647f9b5b890906" +SRC_URI[sha256sum] = "7a96aced0f69b2ec0810e9923068e61c21e6b19dd593e09394c872414df75e70" |