* [PATCH 1/2] directfb: Upgrade to 1.6.3
@ 2013-08-19 14:02 Lauren Post
2013-08-19 14:02 ` [PATCH 2/2] directfb: add fusion patch to fix hangs Lauren Post
0 siblings, 1 reply; 3+ messages in thread
From: Lauren Post @ 2013-08-19 14:02 UTC (permalink / raw)
To: openembedded-core
Remove mesa patch as 1.6.3 provides compatibility with mesa
Signed-off-by: Lauren Post <lauren.post@freescale.com>
---
meta/recipes-graphics/directfb/directfb.inc | 3 +-
.../recipes-graphics/directfb/directfb/mesa9.patch | 29 --------------------
.../{directfb_1.6.1.bb => directfb_1.6.3.bb} | 5 ++--
3 files changed, 3 insertions(+), 34 deletions(-)
delete mode 100644 meta/recipes-graphics/directfb/directfb/mesa9.patch
rename meta/recipes-graphics/directfb/{directfb_1.6.1.bb => directfb_1.6.3.bb} (76%)
mode change 100644 => 100755
diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc
index 7295c35..60b12f7 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 43fd5c2..0000000
--- 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
old mode 100644
new mode 100755
similarity index 76%
rename from meta/recipes-graphics/directfb/directfb_1.6.1.bb
rename to meta/recipes-graphics/directfb/directfb_1.6.3.bb
index 1230d12..277e9a9
--- 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"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] directfb: add fusion patch to fix hangs
2013-08-19 14:02 [PATCH 1/2] directfb: Upgrade to 1.6.3 Lauren Post
@ 2013-08-19 14:02 ` Lauren Post
2013-08-19 15:13 ` Saul Wold
0 siblings, 1 reply; 3+ messages in thread
From: Lauren Post @ 2013-08-19 14:02 UTC (permalink / raw)
To: openembedded-core
Fixes test cases in 1.6.3 that had incomplete rendering
caused by hangs
Upstream-Status: Pending
Signed-off-by: Lauren Post <lauren.post@freescale.com>
---
meta/recipes-graphics/directfb/directfb.inc | 3 +-
.../directfb/directfb/fusion.patch | 31 ++++++++++++++++++++
2 files changed, 33 insertions(+), 1 deletion(-)
create mode 100755 meta/recipes-graphics/directfb/directfb/fusion.patch
diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc
index 60b12f7..a23209f 100644
--- a/meta/recipes-graphics/directfb/directfb.inc
+++ b/meta/recipes-graphics/directfb/directfb.inc
@@ -14,7 +14,8 @@ 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://configurefix.patch \
+ file://fusion.patch"
S = "${WORKDIR}/DirectFB-${PV}"
diff --git a/meta/recipes-graphics/directfb/directfb/fusion.patch b/meta/recipes-graphics/directfb/directfb/fusion.patch
new file mode 100755
index 0000000..f2a095a
--- /dev/null
+++ b/meta/recipes-graphics/directfb/directfb/fusion.patch
@@ -0,0 +1,31 @@
+--- a/lib/fusion/fusion.c 2013-01-18 22:57:11.000000000 +0800
++++ b/lib/fusion/fusion.c 2013-07-04 10:42:56.502699119 +0800
+@@ -2853,9 +2853,14 @@
+ direct_mutex_lock( &world->event_dispatcher_mutex );
+
+ while (1) {
+- if (!world->event_dispatcher_buffers)
++ if (!world->event_dispatcher_buffers){
+ direct_waitqueue_wait( &world->event_dispatcher_cond, &world->event_dispatcher_mutex );
+-
++ if (world->dispatch_stop) {
++ D_DEBUG_AT( Fusion_Main_Dispatch, " -> IGNORING (dispatch_stop!)\n" );
++ direct_mutex_unlock( &world->event_dispatcher_mutex );
++ return NULL;
++ }
++ }
+ buf = (FusionEventDispatcherBuffer *)world->event_dispatcher_buffers;
+ D_MAGIC_ASSERT( buf, FusionEventDispatcherBuffer );
+
+@@ -2872,6 +2877,11 @@
+ //D_INFO("waiting...\n");
+ D_ASSERT( buf->read_pos == buf->write_pos );
+ direct_waitqueue_wait( &world->event_dispatcher_cond, &world->event_dispatcher_mutex );
++ if (world->dispatch_stop) {
++ D_DEBUG_AT( Fusion_Main_Dispatch, " -> IGNORING (dispatch_stop!)\n" );
++ direct_mutex_unlock( &world->event_dispatcher_mutex );
++ return NULL;
++ }
+ }
+
+ buf = (FusionEventDispatcherBuffer *)world->event_dispatcher_buffers;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 2/2] directfb: add fusion patch to fix hangs
2013-08-19 14:02 ` [PATCH 2/2] directfb: add fusion patch to fix hangs Lauren Post
@ 2013-08-19 15:13 ` Saul Wold
0 siblings, 0 replies; 3+ messages in thread
From: Saul Wold @ 2013-08-19 15:13 UTC (permalink / raw)
To: Lauren Post; +Cc: openembedded-core
On 08/19/2013 07:02 AM, Lauren Post wrote:
> Fixes test cases in 1.6.3 that had incomplete rendering
> caused by hangs
>
> Upstream-Status: Pending
>
> Signed-off-by: Lauren Post <lauren.post@freescale.com>
> ---
> meta/recipes-graphics/directfb/directfb.inc | 3 +-
> .../directfb/directfb/fusion.patch | 31 ++++++++++++++++++++
> 2 files changed, 33 insertions(+), 1 deletion(-)
> create mode 100755 meta/recipes-graphics/directfb/directfb/fusion.patch
>
> diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc
> index 60b12f7..a23209f 100644
> --- a/meta/recipes-graphics/directfb/directfb.inc
> +++ b/meta/recipes-graphics/directfb/directfb.inc
> @@ -14,7 +14,8 @@ 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://configurefix.patch \
> + file://fusion.patch"
>
> S = "${WORKDIR}/DirectFB-${PV}"
>
> diff --git a/meta/recipes-graphics/directfb/directfb/fusion.patch b/meta/recipes-graphics/directfb/directfb/fusion.patch
> new file mode 100755
> index 0000000..f2a095a
> --- /dev/null
> +++ b/meta/recipes-graphics/directfb/directfb/fusion.patch
The Upstream-Status: tag goes here along with a patch sign-off, the
commit itself also needs a signoff.
Thanks
Sau!
> @@ -0,0 +1,31 @@
> +--- a/lib/fusion/fusion.c 2013-01-18 22:57:11.000000000 +0800
> ++++ b/lib/fusion/fusion.c 2013-07-04 10:42:56.502699119 +0800
> +@@ -2853,9 +2853,14 @@
> + direct_mutex_lock( &world->event_dispatcher_mutex );
> +
> + while (1) {
> +- if (!world->event_dispatcher_buffers)
> ++ if (!world->event_dispatcher_buffers){
> + direct_waitqueue_wait( &world->event_dispatcher_cond, &world->event_dispatcher_mutex );
> +-
> ++ if (world->dispatch_stop) {
> ++ D_DEBUG_AT( Fusion_Main_Dispatch, " -> IGNORING (dispatch_stop!)\n" );
> ++ direct_mutex_unlock( &world->event_dispatcher_mutex );
> ++ return NULL;
> ++ }
> ++ }
> + buf = (FusionEventDispatcherBuffer *)world->event_dispatcher_buffers;
> + D_MAGIC_ASSERT( buf, FusionEventDispatcherBuffer );
> +
> +@@ -2872,6 +2877,11 @@
> + //D_INFO("waiting...\n");
> + D_ASSERT( buf->read_pos == buf->write_pos );
> + direct_waitqueue_wait( &world->event_dispatcher_cond, &world->event_dispatcher_mutex );
> ++ if (world->dispatch_stop) {
> ++ D_DEBUG_AT( Fusion_Main_Dispatch, " -> IGNORING (dispatch_stop!)\n" );
> ++ direct_mutex_unlock( &world->event_dispatcher_mutex );
> ++ return NULL;
> ++ }
> + }
> +
> + buf = (FusionEventDispatcherBuffer *)world->event_dispatcher_buffers;
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-08-19 15:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-19 14:02 [PATCH 1/2] directfb: Upgrade to 1.6.3 Lauren Post
2013-08-19 14:02 ` [PATCH 2/2] directfb: add fusion patch to fix hangs Lauren Post
2013-08-19 15:13 ` Saul Wold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox