+++ /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
-
--- /dev/null
+This patch fixes builderrors while using '--with-gfxdrivers' and
+'--with-inputdrivers' with the current DirectFB version 1.6.3.
+
+Patch is taken from
+http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/DirectFB/files/DirectFB-1.6.3-setregion.patch
+
+Signed-off-by: Carsten Schoenert <c.schoenert@gmail.com>
+
+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,
+- CoreSurfaceBufferLock *lock )
++ CoreSurfaceBufferLock *left_lock,
++ CoreSurfaceBufferLock *right_lock )
+ {
+ DFBResult ret;
+
+@@ -648,7 +649,7 @@
+ ret = oldPrimaryFuncs.SetRegion( layer, oldPrimaryDriverData,
+ layer_data, region_data,
+ config, updated, surface,
+- palette, lock );
++ palette, left_lock, right_lock );
+ if (ret)
+ return ret;
+
+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,
+- CoreSurfaceBufferLock *lock )
++ CoreSurfaceBufferLock *left_lock,
++ CoreSurfaceBufferLock *right_lock )
+ {
+
+ if (updated & ~CLRCF_OPTIONS) {
+ return OldPrimaryLayerFuncs.SetRegion( layer,
+ OldPrimaryLayerDriverData,
+ layer_data, region_data,
+- config, updated, surface, palette, lock );
++ config, updated, surface, palette, left_lock, right_lock );
+ }
+
+ return DFB_OK;
+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,
+- CoreSurfaceBufferLock *lock )
++ CoreSurfaceBufferLock *left_lock,
++ CoreSurfaceBufferLock *right_lock )
+ {
+ DFBResult ret;
+ UcDriverData *ucdrv = (UcDriverData*) driver_data;
+@@ -151,7 +152,7 @@
+ ret = ucOldPrimaryFuncs.SetRegion( layer, ucOldPrimaryDriverData,
+ layer_data, region_data,
+ config, updated, surface,
+- palette, lock );
++ palette, left_lock, right_lock );
+ if (ret)
+ return ret;
+
+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,
+- CoreSurfaceBufferLock *lock )
++ CoreSurfaceBufferLock *left_lock,
++ CoreSurfaceBufferLock *right_lock )
+ {
+ DFBResult ret;
+ UcDriverData *ucdrv = (UcDriverData*) driver_data;
+@@ -148,7 +149,7 @@
+ ret = ucOldPrimaryFuncs.SetRegion( layer, ucOldPrimaryDriverData,
+ layer_data, region_data,
+ config, updated, surface,
+- palette, lock );
++ palette, left_lock, right_lock );
+ if (ret)
+ return ret;
+
+++ /dev/null
-This patch fixes builderrors while using '--with-gfxdrivers' and
-'--with-inputdrivers' with the current DirectFB version 1.6.3.
-
-Patch is taken from
-http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/DirectFB/files/DirectFB-1.6.3-setregion.patch
-
-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
- CoreLayerRegionConfigFlags updated,
- CoreSurface *surface,
- CorePalette *palette,
-- CoreSurfaceBufferLock *lock )
-+ CoreSurfaceBufferLock *left_lock,
-+ CoreSurfaceBufferLock *right_lock )
- {
- DFBResult ret;
-
-@@ -644,7 +645,7 @@ osdSetRegion( CoreLayer
- ret = oldPrimaryFuncs.SetRegion( layer, oldPrimaryDriverData,
- layer_data, region_data,
- config, updated, surface,
-- palette, lock );
-+ palette, left_lock, right_lock );
- 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
- CoreLayerRegionConfigFlags updated,
- CoreSurface *surface,
- CorePalette *palette,
-- CoreSurfaceBufferLock *lock )
-+ CoreSurfaceBufferLock *left_lock,
-+ CoreSurfaceBufferLock *right_lock )
- {
-
- if (updated & ~CLRCF_OPTIONS) {
- return OldPrimaryLayerFuncs.SetRegion( layer,
- OldPrimaryLayerDriverData,
- layer_data, region_data,
-- config, updated, surface, palette, lock );
-+ config, updated, surface, palette, left_lock, right_lock );
- }
-
- 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
- CoreLayerRegionConfigFlags updated,
- CoreSurface *surface,
- CorePalette *palette,
-- CoreSurfaceBufferLock *lock )
-+ CoreSurfaceBufferLock *left_lock,
-+ CoreSurfaceBufferLock *right_lock )
- {
- DFBResult ret;
- UcDriverData *ucdrv = (UcDriverData*) driver_data;
-@@ -147,7 +148,7 @@ osdSetRegion( CoreLayer
- ret = ucOldPrimaryFuncs.SetRegion( layer, ucOldPrimaryDriverData,
- layer_data, region_data,
- config, updated, surface,
-- palette, lock );
-+ palette, left_lock, right_lock );
- 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
- CoreLayerRegionConfigFlags updated,
- CoreSurface *surface,
- CorePalette *palette,
-- CoreSurfaceBufferLock *lock )
-+ CoreSurfaceBufferLock *left_lock,
-+ CoreSurfaceBufferLock *right_lock )
- {
- DFBResult ret;
- UcDriverData *ucdrv = (UcDriverData*) driver_data;
-@@ -144,7 +145,7 @@ osdSetRegion( CoreLayer
- ret = ucOldPrimaryFuncs.SetRegion( layer, ucOldPrimaryDriverData,
- layer_data, region_data,
- config, updated, surface,
-- palette, lock );
-+ palette, left_lock, right_lock );
- if (ret)
- return ret;
-
-
--- /dev/null
+Add patch to use 'gcc' instead of 'ld' for linking
+
+The patch has been sent upstream but it has not been merged yet
+
+Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
+
+From 176ce06b40897a357fe76a558af517197325f188 Mon Sep 17 00:00:00 2001
+From: Markos Chandras <markos.chandras@imgtec.com>
+Date: Wed, 28 Aug 2013 10:56:32 +0100
+Subject: [PATCH] rules/libobject.make: Use gcc for linking
+
+Invoking 'ld' directly may miss some necessary linker flags which
+are usually passed by gcc. Therefore, use gcc for linking.
+
+Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
+---
+ rules/libobject.make | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/rules/libobject.make b/rules/libobject.make
+index bc670da..2cba658 100644
+--- a/rules/libobject.make
++++ b/rules/libobject.make
+@@ -3,7 +3,7 @@
+ if test -d $<.tmp; then rmdir $<.tmp; fi
+ mkdir $<.tmp
+ (cd $<.tmp && $(AR) x ../../$<)
+- $(LD) -o $@ -r $<.tmp/*.o
++ $(CC) -nostdlib -o $@ -r $<.tmp/*.o
+ rm -f $<.tmp/*.o && rmdir $<.tmp
+
+ .PHONY: $(LTLIBRARIES:%.la=.libs/%.a)
+--
+1.8.3.2
+
+++ /dev/null
-Add patch to use 'gcc' instead of 'ld' for linking
-
-The patch has been sent upstream but it has not been merged yet
-
-Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
-
-From 176ce06b40897a357fe76a558af517197325f188 Mon Sep 17 00:00:00 2001
-From: Markos Chandras <markos.chandras@imgtec.com>
-Date: Wed, 28 Aug 2013 10:56:32 +0100
-Subject: [PATCH] rules/libobject.make: Use gcc for linking
-
-Invoking 'ld' directly may miss some necessary linker flags which
-are usually passed by gcc. Therefore, use gcc for linking.
-
-Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
----
- rules/libobject.make | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/rules/libobject.make b/rules/libobject.make
-index bc670da..2cba658 100644
---- a/rules/libobject.make
-+++ b/rules/libobject.make
-@@ -3,7 +3,7 @@
- if test -d $<.tmp; then rmdir $<.tmp; fi
- mkdir $<.tmp
- (cd $<.tmp && $(AR) x ../../$<)
-- $(LD) -o $@ -r $<.tmp/*.o
-+ $(CC) -nostdlib -o $@ -r $<.tmp/*.o
- rm -f $<.tmp/*.o && rmdir $<.tmp
-
- .PHONY: $(LTLIBRARIES:%.la=.libs/%.a)
---
-1.8.3.2
-
-# locally computed hash
-sha256 7a96aced0f69b2ec0810e9923068e61c21e6b19dd593e09394c872414df75e70 DirectFB-1.6.3.tar.gz
+# Locally computed
+sha256 b785c638dc31b8fe3a7c81be1475c89b2255ab3d67b777c747d3fbc52f8027a3 DirectFB-1.7.7.tar.gz
#
################################################################################
-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)
projects / buildroot.git / commitdiff