From: Thomas Petazzoni Date: Tue, 1 Sep 2015 22:01:02 +0000 (+0200) Subject: directfb: bump to 1.7.7 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3f0bed19ffee4767ddfb32e2e791ecbc6b7e78b7;p=buildroot.git directfb: bump to 1.7.7 In addition to doing the bump, this commit changes the --enable-fusion option to --enable-multi-kernel, as was renamed upstream. The patches were just refreshed, except 0003-remove-redefinition-of-__typeof__.patch, which was removed since it was a backport from upstream, and is therefore now part of DirectFB 1.7.7. Signed-off-by: Thomas Petazzoni Reviewed-by: Vicente Olivert Riera Tested-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- diff --git a/package/directfb/0003-remove-redefinition-of-__typeof__.patch b/package/directfb/0003-remove-redefinition-of-__typeof__.patch deleted file mode 100644 index e3861af97c..0000000000 --- a/package/directfb/0003-remove-redefinition-of-__typeof__.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 -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 - diff --git a/package/directfb/0003-setregion-lock.patch b/package/directfb/0003-setregion-lock.patch new file mode 100644 index 0000000000..bec4234645 --- /dev/null +++ b/package/directfb/0003-setregion-lock.patch @@ -0,0 +1,99 @@ +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 + +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; + diff --git a/package/directfb/0004-setregion-lock.patch b/package/directfb/0004-setregion-lock.patch deleted file mode 100644 index 8a246ea057..0000000000 --- a/package/directfb/0004-setregion-lock.patch +++ /dev/null @@ -1,92 +0,0 @@ -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 - ---- 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; - - diff --git a/package/directfb/0004-use-gcc-link.patch b/package/directfb/0004-use-gcc-link.patch new file mode 100644 index 0000000000..ec6c0ea501 --- /dev/null +++ b/package/directfb/0004-use-gcc-link.patch @@ -0,0 +1,35 @@ +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 + +From 176ce06b40897a357fe76a558af517197325f188 Mon Sep 17 00:00:00 2001 +From: Markos Chandras +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 +--- + 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 + diff --git a/package/directfb/0005-use-gcc-link.patch b/package/directfb/0005-use-gcc-link.patch deleted file mode 100644 index ec6c0ea501..0000000000 --- a/package/directfb/0005-use-gcc-link.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 - -From 176ce06b40897a357fe76a558af517197325f188 Mon Sep 17 00:00:00 2001 -From: Markos Chandras -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 ---- - 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 - diff --git a/package/directfb/directfb.hash b/package/directfb/directfb.hash index a577cba06e..069d8c3f1d 100644 --- a/package/directfb/directfb.hash +++ b/package/directfb/directfb.hash @@ -1,2 +1,2 @@ -# locally computed hash -sha256 7a96aced0f69b2ec0810e9923068e61c21e6b19dd593e09394c872414df75e70 DirectFB-1.6.3.tar.gz +# Locally computed +sha256 b785c638dc31b8fe3a7c81be1475c89b2255ab3d67b777c747d3fbc52f8027a3 DirectFB-1.7.7.tar.gz diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk index ad1dd18a28..c27e982773 100644 --- a/package/directfb/directfb.mk +++ b/package/directfb/directfb.mk @@ -4,8 +4,8 @@ # ################################################################################ -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+ @@ -35,8 +35,10 @@ DIRECTFB_CONFIG_SCRIPTS = directfb-config 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)