+++ /dev/null
-Remove definition to fix qt5 build.
-
-Fetch from: http://git.directfb.org/?p=core/DirectFB.git;a=patch;h=203f78a4193a8ff110dec3c860e0928af1a0a72f
-
-From 203f78a4193a8ff110dec3c860e0928af1a0a72f Mon Sep 17 00:00:00 2001
-From: Denis Oliver Kropp <dok@directfb.org>
-Date: Wed, 31 Jul 2013 21:56:05 +0200
-Subject: [PATCH] libdirect: Remove redefinition of __typeof__!!!
-
----
- lib/direct/os/linux/glibc/types.h | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/lib/direct/os/linux/glibc/types.h b/lib/direct/os/linux/glibc/types.h
-index 08e94b2..80cb350 100644
---- a/lib/direct/os/linux/glibc/types.h
-+++ b/lib/direct/os/linux/glibc/types.h
-@@ -81,7 +81,6 @@ typedef int64_t s64;
- #define __dfb_no_instrument_function__ __attribute__((no_instrument_function))
- #define __constructor__ __attribute__((constructor))
- #define __destructor__ __attribute__((destructor))
--#define __typeof__(x) __typeof__(x)
-
- #ifndef __func__
- #define __func__ __FUNCTION__
---
-1.7.9.5
-
Signed-off-by: Carsten Schoenert <c.schoenert@gmail.com>
---- directfb-1.6.3/gfxdrivers/cyber5k/cyber5k.c
-+++ directfb-1.6.3/gfxdrivers/cyber5k/cyber5k.c
-@@ -636,7 +636,8 @@ osdSetRegion( CoreLayer
+Index: b/gfxdrivers/cyber5k/cyber5k.c
+===================================================================
+--- a/gfxdrivers/cyber5k/cyber5k.c
++++ b/gfxdrivers/cyber5k/cyber5k.c
+@@ -640,7 +640,8 @@
CoreLayerRegionConfigFlags updated,
CoreSurface *surface,
CorePalette *palette,
{
DFBResult ret;
-@@ -644,7 +645,7 @@ osdSetRegion( CoreLayer
+@@ -648,7 +649,7 @@
ret = oldPrimaryFuncs.SetRegion( layer, oldPrimaryDriverData,
layer_data, region_data,
config, updated, surface,
if (ret)
return ret;
---- directfb-1.6.3/gfxdrivers/radeon/radeon_crtc1.c
-+++ directfb-1.6.3/gfxdrivers/radeon/radeon_crtc1.c
-@@ -147,14 +147,15 @@ crtc1SetRegion( CoreLayer
+Index: b/gfxdrivers/radeon/radeon_crtc1.c
+===================================================================
+--- a/gfxdrivers/radeon/radeon_crtc1.c
++++ b/gfxdrivers/radeon/radeon_crtc1.c
+@@ -147,14 +147,15 @@
CoreLayerRegionConfigFlags updated,
CoreSurface *surface,
CorePalette *palette,
}
return DFB_OK;
---- directfb-1.6.3/gfxdrivers/cle266/uc_primary.c
-+++ directfb-1.6.3/gfxdrivers/cle266/uc_primary.c
-@@ -138,7 +138,8 @@ osdSetRegion( CoreLayer
+Index: b/gfxdrivers/cle266/uc_primary.c
+===================================================================
+--- a/gfxdrivers/cle266/uc_primary.c
++++ b/gfxdrivers/cle266/uc_primary.c
+@@ -142,7 +142,8 @@
CoreLayerRegionConfigFlags updated,
CoreSurface *surface,
CorePalette *palette,
{
DFBResult ret;
UcDriverData *ucdrv = (UcDriverData*) driver_data;
-@@ -147,7 +148,7 @@ osdSetRegion( CoreLayer
+@@ -151,7 +152,7 @@
ret = ucOldPrimaryFuncs.SetRegion( layer, ucOldPrimaryDriverData,
layer_data, region_data,
config, updated, surface,
if (ret)
return ret;
---- directfb-1.6.3/gfxdrivers/unichrome/uc_primary.c
-+++ directfb-1.6.3/gfxdrivers/unichrome/uc_primary.c
-@@ -135,7 +135,8 @@ osdSetRegion( CoreLayer
+Index: b/gfxdrivers/unichrome/uc_primary.c
+===================================================================
+--- a/gfxdrivers/unichrome/uc_primary.c
++++ b/gfxdrivers/unichrome/uc_primary.c
+@@ -139,7 +139,8 @@
CoreLayerRegionConfigFlags updated,
CoreSurface *surface,
CorePalette *palette,
{
DFBResult ret;
UcDriverData *ucdrv = (UcDriverData*) driver_data;
-@@ -144,7 +145,7 @@ osdSetRegion( CoreLayer
+@@ -148,7 +149,7 @@
ret = ucOldPrimaryFuncs.SetRegion( layer, ucOldPrimaryDriverData,
layer_data, region_data,
config, updated, surface,
if (ret)
return ret;
-
#
################################################################################
-DIRECTFB_VERSION_MAJOR = 1.6
-DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).3
+DIRECTFB_VERSION_MAJOR = 1.7
+DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).7
DIRECTFB_SITE = http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSION_MAJOR)
DIRECTFB_SOURCE = DirectFB-$(DIRECTFB_VERSION).tar.gz
DIRECTFB_LICENSE = LGPLv2.1+
DIRECTFB_DEPENDENCIES = freetype zlib
ifeq ($(BR2_PACKAGE_DIRECTFB_MULTI),y)
-DIRECTFB_CONF_OPTS += --enable-multi --enable-fusion
+DIRECTFB_CONF_OPTS += --enable-multi --enable-multi-kernel
DIRECTFB_DEPENDENCIES += linux-fusion
+else
+DIRECTFB_CONF_OPTS += --disable-multi --disable-multi-kernel
endif
ifeq ($(BR2_PACKAGE_DIRECTFB_DEBUG_SUPPORT),y)