Skip to contentSkip to conversation

DirectFB stack bump

PATCH New Thomas Petazzoni 4 participants 29 messages Sep 1, 2015 – Sep 11, 2015

lore
Share & tools
lore
#0 lore raw

v3 cover DirectFB stack bump

Hello,

Here is the third version of the DirectFB bump. The previous version was submitted in February by Peter Seiderer, so it's time to move forward on this topic. There are too many changes compared to Peter's version to really list all of them, it's better to think of this series almost as a new one: it combines changes from Peter with changes I had also prepared on my side.

The patch series bumps DirectFB, DirectFB-examples and linux-fusion, but also does a number of related cleanups (remove unused/useless options, simplify the DirectFB-examples package, remove no longer useful packages, etc.).

I did quite a bit of build testing: I built 10 different Buildroot configurations, to test each of the 10 direct reverse dependencies of DirectFB:

- Cairo
- EFL (libevas and libecore)
- GStreamer 0.10 DirectFB bad plugin
- Gstreamer 1.x DirectFB bad plugin
- Links with DirectFB support
- Lite
- Qt4 with DirectFB backend (required a patch)
- Qt5 with DirectFB backend
- SDL with DirectFB backend
- VLC with DirectFB backend

All of them built successfully.

Thanks,

Thomas

Peter Seiderer (3):
qt: fix directfb-1.7.7 compiler errors
directfb: do not use inexistant configure options
directfb: add new TIFF option

Thomas Petazzoni (12):
directfb: bump to 1.7.7
directfb: mark as available only for gcc >= 4.5
directfb: remove broken X.org support
directfb: remove BR2_PACKAGE_DIRECTFB_UNIQUE option
directfb: add options for divine and sawman
divine: remove package
sawman: remove package
linux-fusion: bump to 9.0.3, use .tar.xz
linux-fusion: use a more traditional style to define
LINUX_FUSION_MAKE_OPTS
directfb-examples: remove options for each example
directfb-examples: do not install to staging
directfb-examples: bump to 1.7.0

 Config.in.legacy                                   | 232 +++++++++++++++++++++
 package/Config.in                                  |   2 -
 package/directfb-examples/Config.in                | 151 --------------
 package/directfb-examples/directfb-examples.hash   |   4 +-
 package/directfb-examples/directfb-examples.mk     |  96 +--------
 .../0003-remove-redefinition-of-__typeof__.patch   |  28 ---
 ...region-lock.patch => 0003-setregion-lock.patch} |  39 ++--
 ...-use-gcc-link.patch => 0004-use-gcc-link.patch} |   0
 .../directfb/0005-add-missing-idivine-header.patch |  65 ++++++
 package/directfb/Config.in                         |  23 +-
 package/directfb/directfb.hash                     |   4 +-
 package/directfb/directfb.mk                       |  32 +--
 package/divine/Config.in                           |   8 -
 package/divine/divine.mk                           |  19 --
 package/gstreamer/gst-plugins-bad/Config.in        |   4 +
 package/gstreamer1/gst1-plugins-bad/Config.in      |   4 +
 package/linux-fusion/linux-fusion.hash             |   4 +-
 package/linux-fusion/linux-fusion.mk               |  19 +-
 ...ion-constructor-error-for-legacy-c-compil.patch | 163 +++++++++++++++
 package/qt5/qt5base/Config.in                      |   4 +
 .../sawman/0001-link-using-gcc-instead-of-ld.patch |  19 --
 package/sawman/Config.in                           |  11 -
 package/sawman/sawman.mk                           |  16 --
 23 files changed, 547 insertions(+), 400 deletions(-)
 delete mode 100644 package/directfb/0003-remove-redefinition-of-__typeof__.patch
 rename package/directfb/{0004-setregion-lock.patch => 0003-setregion-lock.patch} (79%)
 rename package/directfb/{0005-use-gcc-link.patch => 0004-use-gcc-link.patch} (100%)
 create mode 100644 package/directfb/0005-add-missing-idivine-header.patch
 delete mode 100644 package/divine/Config.in
 delete mode 100644 package/divine/divine.mk
 create mode 100644 package/qt/0008-Fix-conversion-constructor-error-for-legacy-c-compil.patch
 delete mode 100644 package/sawman/0001-link-using-gcc-instead-of-ld.patch
 delete mode 100644 package/sawman/Config.in
 delete mode 100644 package/sawman/sawman.mk
Signature · 1 line
2.5.1
#1 lore raw

PATCH v3 1/15 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.

---
 .../0003-remove-redefinition-of-__typeof__.patch   | 28 ----------------
 ...region-lock.patch => 0003-setregion-lock.patch} | 39 +++++++++++++---------
 ...-use-gcc-link.patch => 0004-use-gcc-link.patch} |  0
 package/directfb/directfb.hash                     |  4 +--
 package/directfb/directfb.mk                       |  8 +++--
 5 files changed, 30 insertions(+), 49 deletions(-)
 delete mode 100644 package/directfb/0003-remove-redefinition-of-__typeof__.patch
 rename package/directfb/{0004-setregion-lock.patch => 0003-setregion-lock.patch} (79%)
 rename package/directfb/{0005-use-gcc-link.patch => 0004-use-gcc-link.patch} (100%)
package/directfb/0003-remove-redefinition-of-__typeof__.patch deleted +0 -28
deleted file mode 100644
index e3861af..0000000
@@ -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 <[email protected]>
-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
-
package/directfb/0003-setregion-lock.patch renamed from package/directfb/0004-setregion-lock.patch +23 -16
similarity index 79%
rename from package/directfb/0004-setregion-lock.patch
rename to package/directfb/0003-setregion-lock.patch
index 8a246ea..bec4234 100644
@@ -6,9 +6,11 @@ http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/DirectFB/files/
 
 Signed-off-by: Carsten Schoenert <[email protected]>
 
---- 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,
@@ -18,7 +20,7 @@ Signed-off-by: Carsten Schoenert <[email protected]>
  {
       DFBResult ret;
  
-@@ -644,7 +645,7 @@ osdSetRegion( CoreLayer
+@@ -648,7 +649,7 @@
       ret = oldPrimaryFuncs.SetRegion( layer, oldPrimaryDriverData,
                                        layer_data, region_data,
                                        config, updated, surface,
@@ -27,9 +29,11 @@ Signed-off-by: Carsten Schoenert <[email protected]>
       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,
@@ -47,9 +51,11 @@ Signed-off-by: Carsten Schoenert <[email protected]>
       }
  
       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,
@@ -59,7 +65,7 @@ Signed-off-by: Carsten Schoenert <[email protected]>
  {
       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,
@@ -68,9 +74,11 @@ Signed-off-by: Carsten Schoenert <[email protected]>
       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,
@@ -80,7 +88,7 @@ Signed-off-by: Carsten Schoenert <[email protected]>
  {
       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,
@@ -89,4 +97,3 @@ Signed-off-by: Carsten Schoenert <[email protected]>
       if (ret)
            return ret;
  
-
package/directfb/0004-use-gcc-link.patch renamed from package/directfb/0005-use-gcc-link.patch +0 -0
similarity index 100%
rename from package/directfb/0005-use-gcc-link.patch
rename to package/directfb/0004-use-gcc-link.patch
package/directfb/directfb.hash +2 -2
index a577cba..069d8c3 100644
@@ -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
package/directfb/directfb.mk +5 -3
index ad1dd18..c27e982 100644
@@ -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)
Signature · 1 line
2.5.1
#2 lore raw

PATCH v3 1/15 directfb: bump to 1.7.7

Dear Thomas Petazzoni,

Quoted 184 lines · Thomas Petazzoni

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.

---
 .../0003-remove-redefinition-of-__typeof__.patch   | 28 ----------------
 ...region-lock.patch => 0003-setregion-lock.patch} | 39 +++++++++++++---------
 ...-use-gcc-link.patch => 0004-use-gcc-link.patch} |  0
 package/directfb/directfb.hash                     |  4 +--
 package/directfb/directfb.mk                       |  8 +++--
 5 files changed, 30 insertions(+), 49 deletions(-)
 delete mode 100644 package/directfb/0003-remove-redefinition-of-__typeof__.patch
 rename package/directfb/{0004-setregion-lock.patch => 0003-setregion-lock.patch} (79%)
 rename package/directfb/{0005-use-gcc-link.patch => 0004-use-gcc-link.patch} (100%)
package/directfb/0003-remove-redefinition-of-__typeof__.patch deleted +0 -28
deleted file mode 100644
index e3861af..0000000
@@ -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 <[email protected]>
-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
-
package/directfb/0003-setregion-lock.patch renamed from package/directfb/0004-setregion-lock.patch +23 -16
similarity index 79%
rename from package/directfb/0004-setregion-lock.patch
rename to package/directfb/0003-setregion-lock.patch
index 8a246ea..bec4234 100644
@@ -6,9 +6,11 @@ http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/DirectFB/files/
 
 Signed-off-by: Carsten Schoenert <[email protected]>
 
---- 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,
@@ -18,7 +20,7 @@ Signed-off-by: Carsten Schoenert <[email protected]>
  {
       DFBResult ret;
 
-@@ -644,7 +645,7 @@ osdSetRegion( CoreLayer
+@@ -648,7 +649,7 @@
       ret = oldPrimaryFuncs.SetRegion( layer, oldPrimaryDriverData,
                                        layer_data, region_data,
                                        config, updated, surface,
@@ -27,9 +29,11 @@ Signed-off-by: Carsten Schoenert <[email protected]>
       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,
@@ -47,9 +51,11 @@ Signed-off-by: Carsten Schoenert <[email protected]>
       }
 
       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,
@@ -59,7 +65,7 @@ Signed-off-by: Carsten Schoenert <[email protected]>
  {
       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,
@@ -68,9 +74,11 @@ Signed-off-by: Carsten Schoenert <[email protected]>
       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,
@@ -80,7 +88,7 @@ Signed-off-by: Carsten Schoenert <[email protected]>
  {
       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,
@@ -89,4 +97,3 @@ Signed-off-by: Carsten Schoenert <[email protected]>
       if (ret)
            return ret;
 
-
package/directfb/0004-use-gcc-link.patch renamed from package/directfb/0005-use-gcc-link.patch +0 -0
similarity index 100%
rename from package/directfb/0005-use-gcc-link.patch
rename to package/directfb/0004-use-gcc-link.patch
package/directfb/directfb.hash +2 -2
index a577cba..069d8c3 100644
@@ -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
package/directfb/directfb.mk +2 -2
index ad1dd18..c27e982 100644
@@ -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

package/directfb/directfb.mk DIRECTFB_CONFIG_SCRIPTS = directfb-config · line 44

Quoted 10 lines
package/directfb/directfb.mk +3 -1
 
 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)

Compile test for MIPS architecture:

$ grep ^DIRECTFB_VERSION package/directfb/directfb.mk
DIRECTFB_VERSION_MAJOR = 1.7
DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).7
$ file
output/target/usr/lib/directfb-1.7-7-pure/systems/libdirectfb_fbdev.so
output/target/usr/lib/directfb-1.7-7-pure/systems/libdirectfb_fbdev.so:
ELF 32-bit MSB shared object, MIPS, MIPS32 rel2 version 1 (SYSV),
dynamically linked, with unknown capability 0x41000000 = 0xf676e75, with
unknown capability 0x10000 = 0x70401, stripped

Regards,

Vincent.

#3 lore raw

PATCH v3 1/15 directfb: bump to 1.7.7

Hi Vicente,

Quoted 12 lines · Vicente Olivert Riera

Dear Thomas Petazzoni,

Quoted 9 lines · Thomas Petazzoni

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.

[snip]

Quoted 2 lines

Thanks for all these reviews and tests! However, it would be more convenient if
you could put the tag just below the Sob (like now) so we don't have to scroll all the way to the bottom to see what you're saying.

Quoted 7 lines

Compile test for MIPS architecture:

$ grep ^DIRECTFB_VERSION package/directfb/directfb.mk
DIRECTFB_VERSION_MAJOR = 1.7
DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).7
Quoted 6 lines
$ file
output/target/usr/lib/directfb-1.7-7-pure/systems/libdirectfb_fbdev.so
output/target/usr/lib/directfb-1.7-7-pure/systems/libdirectfb_fbdev.so:
ELF 32-bit MSB shared object, MIPS, MIPS32 rel2 version 1 (SYSV),
dynamically linked, with unknown capability 0x41000000 = 0xf676e75, with
unknown capability 0x10000 = 0x70401, stripped

BTW, what do you want to show with this information?

Regards,
Arnout

Quoted 9 lines

Regards,

Vincent.
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
#4 lore raw

PATCH v3 1/15 directfb: bump to 1.7.7

Dear Arnout Vandecappelle,

Quoted 14 lines · Arnout Vandecappelle

Hi Vicente,

Quoted 11 lines · Vicente Olivert Riera

Dear Thomas Petazzoni,

Quoted 8 lines · Thomas Petazzoni

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.

Quoted 8 lines
Quoted 1 line
Quoted 1 line

[snip]

Quoted 2 lines

Thanks for all these reviews and tests! However, it would be more convenient if
you could put the tag just below the Sob (like now) so we don't have to scroll all the way to the bottom to see what you're saying.

Ok, sorry. I will do it in that way from now on. Thanks.

Quoted 8 lines
Quoted 8 lines

Compile test for MIPS architecture:

$ grep ^DIRECTFB_VERSION package/directfb/directfb.mk
DIRECTFB_VERSION_MAJOR = 1.7
DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).7
Quoted 8 lines
Quoted 6 lines
$ file
output/target/usr/lib/directfb-1.7-7-pure/systems/libdirectfb_fbdev.so
output/target/usr/lib/directfb-1.7-7-pure/systems/libdirectfb_fbdev.so:
ELF 32-bit MSB shared object, MIPS, MIPS32 rel2 version 1 (SYSV),
dynamically linked, with unknown capability 0x41000000 = 0xf676e75, with
unknown capability 0x10000 = 0x70401, stripped

BTW, what do you want to show with this information?

In the first command I want to state that I was using the right directfb version (this is a version bump patch).

In the second one I want to state that the package was successfully installed (and therefore built) in $(TARGET_DIR). It also states that it was built for the right architecture. Sometimes the packages don't install any native binary file so the file command can't state the second part.

Regards,

Vincent.

Quoted 16 lines

Regards,
Arnout

Quoted 9 lines

Regards,

Vincent.
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

#5 lore raw

PATCH v3 2/15 directfb: mark as available only for gcc >= 4.5

In reply to Thomas Petazzoni

The new DirectFB version does not build with gcc 4.3 from the Blackfin toolchain. One of the reason is that va_copy has some issues, which were fixed in gcc 4.4.0
(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=36799). There are also some other issues, which were fixed by a patch proposed by Peter Seiderer at
http://lists.busybox.net/pipermail/buildroot/2015-February/120281.html.

However, it probably doesn't make a lot of sense to carry patches that are not upstream for such old compilers. Instead, this commit takes the action of making DirectFB available only on toolchains using gcc

Quoted 1 line

= 4.5, which was tested with the Arago toolchain. gcc 4.4 could

potentially work, but wasn't tested (it is no longer supported by the internal toolchain backend, and we don't have any toolchain based on gcc 4.4), so we take the safe decision of requiring at least gcc 4.5.

---
This commit could be squashed into the DirectFB bump itself for bisectability, but was kept separate to ease the review.

---
 package/directfb/Config.in                    | 5 +++--
 package/gstreamer/gst-plugins-bad/Config.in   | 4 ++++
 package/gstreamer1/gst1-plugins-bad/Config.in | 4 ++++
 package/qt5/qt5base/Config.in                 | 4 ++++
 4 files changed, 15 insertions(+), 2 deletions(-)
package/directfb/Config.in +3 -2
index 2b0d5c7..3ab40f9 100644
@@ -2,6 +2,7 @@ config BR2_PACKAGE_DIRECTFB
 	bool "directfb"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
 	select BR2_PACKAGE_FREETYPE
 	select BR2_PACKAGE_ZLIB
 	help
@@ -157,5 +158,5 @@ config BR2_PACKAGE_DIRECTFB_TESTS
 
 endif # BR2_PACKAGE_DIRECTFB
 
-comment "directfb needs a toolchain w/ C++, threads"
-	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
+comment "directfb needs a toolchain w/ C++, threads, gcc >= 4.5"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
package/gstreamer/gst-plugins-bad/Config.in +4 -0
index 1b465b2..43f0554 100644
@@ -263,6 +263,10 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DIRECTFB
 	select BR2_PACKAGE_DIRECTFB
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
+
+comment "directfb needs a toolchain w/ C++, threads, gcc >= 4.5"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVB
 	bool "dvb"
package/gstreamer1/gst1-plugins-bad/Config.in +4 -0
index d268fc6..d5294c3 100644
@@ -495,6 +495,10 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB
 	select BR2_PACKAGE_DIRECTFB
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
+
+comment "directfb needs a toolchain w/ C++, threads, gcc >= 4.5"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND
 	bool "wayland"
package/qt5/qt5base/Config.in +4 -0
index 106517f..6e76e90 100644
@@ -179,6 +179,10 @@ config BR2_PACKAGE_QT5BASE_LINUXFB
 config BR2_PACKAGE_QT5BASE_DIRECTFB
 	bool "directfb support"
 	select BR2_PACKAGE_DIRECTFB
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
+
+comment "directfb needs a toolchain w/ gcc >= 4.5"
+	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
 
 config BR2_PACKAGE_QT5BASE_XCB
 	bool "X.org XCB support"
Signature · 1 line
2.5.1
#6 lore raw

PATCH v3 2/15 directfb: mark as available only for gcc >= 4.5

Dear Thomas Petazzoni,

Quoted 52 lines · Thomas Petazzoni

The new DirectFB version does not build with gcc 4.3 from the Blackfin toolchain. One of the reason is that va_copy has some issues, which were fixed in gcc 4.4.0
(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=36799). There are also some other issues, which were fixed by a patch proposed by Peter Seiderer at
http://lists.busybox.net/pipermail/buildroot/2015-February/120281.html.

However, it probably doesn't make a lot of sense to carry patches that are not upstream for such old compilers. Instead, this commit takes the action of making DirectFB available only on toolchains using gcc

Quoted 1 line

= 4.5, which was tested with the Arago toolchain. gcc 4.4 could

potentially work, but wasn't tested (it is no longer supported by the internal toolchain backend, and we don't have any toolchain based on gcc 4.4), so we take the safe decision of requiring at least gcc 4.5.

---
This commit could be squashed into the DirectFB bump itself for bisectability, but was kept separate to ease the review.

---
 package/directfb/Config.in                    | 5 +++--
 package/gstreamer/gst-plugins-bad/Config.in   | 4 ++++
 package/gstreamer1/gst1-plugins-bad/Config.in | 4 ++++
 package/qt5/qt5base/Config.in                 | 4 ++++
 4 files changed, 15 insertions(+), 2 deletions(-)
package/directfb/Config.in +3 -2
index 2b0d5c7..3ab40f9 100644
@@ -2,6 +2,7 @@ config BR2_PACKAGE_DIRECTFB
 	bool "directfb"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
 	select BR2_PACKAGE_FREETYPE
 	select BR2_PACKAGE_ZLIB
 	help
@@ -157,5 +158,5 @@ config BR2_PACKAGE_DIRECTFB_TESTS
 
 endif # BR2_PACKAGE_DIRECTFB
 
-comment "directfb needs a toolchain w/ C++, threads"
-	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
+comment "directfb needs a toolchain w/ C++, threads, gcc >= 4.5"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
package/gstreamer/gst-plugins-bad/Config.in +0 -0
index 1b465b2..43f0554 100644

package/gstreamer/gst-plugins-bad/Config.in config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DIRECTFB · line 266

Quoted 4 lines
package/gstreamer/gst-plugins-bad/Config.in +1 -0
@@ -263,6 +263,10 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DIRECTFB
 	select BR2_PACKAGE_DIRECTFB
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5

worth adding " #directfb" at the end of that line to see why it's needed, or is it too obvious?

Quoted 11 lines
package/gstreamer/gst-plugins-bad/Config.in +3 -0
+
+comment "directfb needs a toolchain w/ C++, threads, gcc >= 4.5"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVB
 	bool "dvb"
package/gstreamer1/gst1-plugins-bad/Config.in +0 -0
index d268fc6..d5294c3 100644

package/gstreamer1/gst1-plugins-bad/Config.in config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB · line 498

Quoted 4 lines
package/gstreamer1/gst1-plugins-bad/Config.in +1 -0
@@ -495,6 +495,10 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB
 	select BR2_PACKAGE_DIRECTFB
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5

Same as above.

Quoted 11 lines
package/gstreamer1/gst1-plugins-bad/Config.in +3 -0
+
+comment "directfb needs a toolchain w/ C++, threads, gcc >= 4.5"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND
 	bool "wayland"
package/qt5/qt5base/Config.in +0 -0
index 106517f..6e76e90 100644

package/qt5/qt5base/Config.in config BR2_PACKAGE_QT5BASE_LINUXFB · line 182

Quoted 4 lines
package/qt5/qt5base/Config.in +1 -0
@@ -179,6 +179,10 @@ config BR2_PACKAGE_QT5BASE_LINUXFB
 config BR2_PACKAGE_QT5BASE_DIRECTFB
 	bool "directfb support"
 	select BR2_PACKAGE_DIRECTFB
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5

Same as above.

package/qt5/qt5base/Config.in config BR2_PACKAGE_QT5BASE_LINUXFB · line 188

Quoted 7 lines
package/qt5/qt5base/Config.in +3 -0
+
+comment "directfb needs a toolchain w/ gcc >= 4.5"
+	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
 
 config BR2_PACKAGE_QT5BASE_XCB
 	bool "X.org XCB support"

Anyway,

Regards,

Vincent.

#7 lore raw

PATCH v3 2/15 directfb: mark as available only for gcc >= 4.5

In reply to Thomas Petazzoni
Quoted 14 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

The new DirectFB version does not build with gcc 4.3 from the Blackfin toolchain. One of the reason is that va_copy has some issues, which were fixed in gcc 4.4.0
(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=36799). There are also some other issues, which were fixed by a patch proposed by Peter Seiderer at
http://lists.busybox.net/pipermail/buildroot/2015-February/120281.html.

However, it probably doesn't make a lot of sense to carry patches that are not upstream for such old compilers. Instead, this commit takes the action of making DirectFB available only on toolchains using gcc

Quoted 1 line

= 4.5, which was tested with the Arago toolchain. gcc 4.4 could

Quoted 8 lines

potentially work, but wasn't tested (it is no longer supported by the internal toolchain backend, and we don't have any toolchain based on gcc 4.4), so we take the safe decision of requiring at least gcc 4.5.

---
This commit could be squashed into the DirectFB bump itself for bisectability, but was kept separate to ease the review.

Committed with the comments added as suggested by Vincente.

package/gstreamer/gst-plugins-bad/Config.in config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DIRECTFB · line 269

Quoted 9 lines

+++ b/package/gstreamer/gst-plugins-bad/Config.in

package/gstreamer/gst-plugins-bad/Config.in +4 -0
@@ -263,6 +263,10 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DIRECTFB
 	select BR2_PACKAGE_DIRECTFB
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
+
+comment "directfb needs a toolchain w/ C++, threads, gcc >= 4.5"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5

Not directly related to this commit, but even though directfb is a library I think it makes more sense to use 'depends on' (and default y) for these options for "big libraries", as:

- People are likely to explicitly enable those libraroes if they want them

- Gstreamer support size is insignificant compared to the library, and people are likely to want E.G. directfb support in gstreamer if they enable directfb and gstreamer, so the default y is nice

- We don't need to propagate the (often fairly complicated) library dependencies to the users

This applies for E.G. wayland and Qt as well.

But that can (should) be handled outside this series.

Signature · 1 line
Bye, Peter Korsgaard
#8 lore raw

PATCH v3 2/15 directfb: mark as available only for gcc >= 4.5

Quoted 39 lines · Peter Korsgaard
Quoted 14 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

The new DirectFB version does not build with gcc 4.3 from the Blackfin toolchain. One of the reason is that va_copy has some issues, which were fixed in gcc 4.4.0
(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=36799). There are also some other issues, which were fixed by a patch proposed by Peter Seiderer at
http://lists.busybox.net/pipermail/buildroot/2015-February/120281.html.

However, it probably doesn't make a lot of sense to carry patches that are not upstream for such old compilers. Instead, this commit takes the action of making DirectFB available only on toolchains using gcc

Quoted 1 line

= 4.5, which was tested with the Arago toolchain. gcc 4.4 could

Quoted 8 lines

potentially work, but wasn't tested (it is no longer supported by the internal toolchain backend, and we don't have any toolchain based on gcc 4.4), so we take the safe decision of requiring at least gcc 4.5.

---
This commit could be squashed into the DirectFB bump itself for bisectability, but was kept separate to ease the review.

Committed with the comments added as suggested by Vincente.

package/gstreamer/gst-plugins-bad/Config.in config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DIRECTFB · line 269

Quoted 9 lines

+++ b/package/gstreamer/gst-plugins-bad/Config.in

package/gstreamer/gst-plugins-bad/Config.in +4 -0
@@ -263,6 +263,10 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DIRECTFB
 	select BR2_PACKAGE_DIRECTFB
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
+
+comment "directfb needs a toolchain w/ C++, threads, gcc >= 4.5"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5

Not directly related to this commit, but even though directfb is a library I think it makes more sense to use 'depends on' (and default y) for these options for "big libraries", as:

Quoted 2 lines

- People are likely to explicitly enable those libraroes if they want them

Well, except that there may be _programs_ that need that particular library.

Except, as it turns out, in most cases we do already depend on directfb rather
than selecting it. The ones that do have a select (gstreamer and qt5) are unlikely to have a program that needs that specific option.

Quoted 9 lines

- Gstreamer support size is insignificant compared to the library, and people are likely to want E.G. directfb support in gstreamer if they enable directfb and gstreamer, so the default y is nice

- We don't need to propagate the (often fairly complicated) library dependencies to the users

This applies for E.G. wayland and Qt as well.

For Qt it's already the case (cfr. grantlee). For wayland it's just the gst
plugin, where it indeed doesn't make sense to do it this way.

Regards,
Arnout

Quoted 3 lines

But that can (should) be handled outside this series.

Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
#9 lore raw

PATCH v3 2/15 directfb: mark as available only for gcc >= 4.5

In reply to Peter Korsgaard

Dear Peter Korsgaard,

Quoted 11 lines · Peter Korsgaard

Not directly related to this commit, but even though directfb is a library I think it makes more sense to use 'depends on' (and default y) for these options for "big libraries", as:

- People are likely to explicitly enable those libraroes if they want them

- Gstreamer support size is insignificant compared to the library, and people are likely to want E.G. directfb support in gstreamer if they enable directfb and gstreamer, so the default y is nice

Quoted 6 lines

- We don't need to propagate the (often fairly complicated) library dependencies to the users

This applies for E.G. wayland and Qt as well.

But that can (should) be handled outside this series.

I agree. In fact for DirectFB there is already a mix of "select" and "depends on". But we can't blame anyone: it's not always very clear which one to use, so we have to clarify such things once a package starts to be used by a significant number of other packages.

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#10 lore raw

PATCH v3 3/15 qt: fix directfb-1.7.7 compiler errors

In reply to Thomas Petazzoni

From: Peter Seiderer <[email protected]>

---
 ...ion-constructor-error-for-legacy-c-compil.patch | 163 +++++++++++++++++++++
 1 file changed, 163 insertions(+)
 create mode 100644 package/qt/0008-Fix-conversion-constructor-error-for-legacy-c-compil.patch
package/qt/0008-Fix-conversion-constructor-error-for-legacy-c-compil.patch new file +163 -0
new file mode 100644
index 0000000..d7d387a
@@ -0,0 +1,163 @@
+From ea46f47fb3c475ba2d7581c15185b8d43e63b8c2 Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <[email protected]>
+Date: Fri, 27 Feb 2015 21:30:52 +0100
+Subject: [PATCH] Fix conversion/constructor error for legacy c++ compiler.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes the following compile error with legacy c++ compiler:
+
+error: in C++98 ?blitRect? must be initialized by constructor, not by ?{...}?
+
+Signed-off-by: Peter Seiderer <[email protected]>
+---
+ src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp   | 14 +++++++-------
+ src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp        |  6 +++---
+ src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp        |  6 +++---
+ src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp |  2 +-
+ 4 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
+index 876d0c2..ed69386 100644
+--- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
++++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
+@@ -942,7 +942,7 @@ void QDirectFBPaintEngine::drawBufferSpan(const uint *buffer, int bufsize,
+     IDirectFBSurface *src = d->surfaceCache->getSurface(buffer, bufsize);
+     // ### how does this play with setDFBColor
+     src->SetColor(src, 0, 0, 0, const_alpha);
+-    const DFBRectangle rect = { 0, 0, length, 1 };
++    const DFBRectangle rect = (DFBRectangle_C){ 0, 0, length, 1 };
+     d->surface->Blit(d->surface, src, &rect, x, y);
+ }
+ 
+@@ -1223,14 +1223,14 @@ void QDirectFBPaintEnginePrivate::blit(const QRectF &dest, IDirectFBSurface *s,
+     const QRect dr = engine->state()->matrix.mapRect(dest).toRect();
+     if (dr.isEmpty())
+         return;
+-    const DFBRectangle sRect = { sr.x(), sr.y(), sr.width(), sr.height() };
++    const DFBRectangle sRect = (DFBRectangle_C){ sr.x(), sr.y(), sr.width(), sr.height() };
+     DFBResult result;
+ 
+     if (dr.size() == sr.size()) {
+         result = surface->Blit(surface, s, &sRect, dr.x(), dr.y());
+     } else {
+         Q_ASSERT(supportsStretchBlit());
+-        const DFBRectangle dRect = { dr.x(), dr.y(), dr.width(), dr.height() };
++        const DFBRectangle dRect = (DFBRectangle_C){ dr.x(), dr.y(), dr.width(), dr.height() };
+         result = surface->StretchBlit(surface, s, &sRect, &dRect);
+     }
+     if (result != DFB_OK)
+@@ -1261,7 +1261,7 @@ void QDirectFBPaintEnginePrivate::drawTiledPixmap(const QRectF &dest, const QPix
+     if (newClip.isNull())
+         return;
+ 
+-    const DFBRegion clip = {
++    const DFBRegion clip = (DFBRegion_C){
+         newClip.x(),
+         newClip.y(),
+         newClip.right(),
+@@ -1295,7 +1295,7 @@ void QDirectFBPaintEnginePrivate::drawTiledPixmap(const QRectF &dest, const QPix
+         while (y <= destinationRect.bottom()) {
+             qreal x = startX;
+             while (x <= destinationRect.right()) {
+-                const DFBRectangle destination = { qRound(x), qRound(y), mappedSize.width(), mappedSize.height() };
++                const DFBRectangle destination = (DFBRectangle_C){ qRound(x), qRound(y), (int)mappedSize.width(), (int)mappedSize.height() };
+                 surface->StretchBlit(surface, sourceSurface, 0, &destination);
+                 x += mappedSize.width();
+             }
+@@ -1337,7 +1337,7 @@ void QDirectFBPaintEnginePrivate::drawTiledPixmap(const QRectF &dest, const QPix
+     if (currentClip.isEmpty()) {
+         surface->SetClip(surface, 0);
+     } else {
+-        const DFBRegion clip = {
++        const DFBRegion clip = (DFBRegion_C){
+             currentClip.x(),
+             currentClip.y(),
+             currentClip.right(),
+@@ -1356,7 +1356,7 @@ void QDirectFBPaintEnginePrivate::updateClip()
+         surface->SetClip(surface, NULL);
+         clipType = NoClip;
+     } else if (clipData->hasRectClip) {
+-        const DFBRegion r = {
++        const DFBRegion r = (DFBRegion_C){
+             clipData->clipRect.x(),
+             clipData->clipRect.y(),
+             clipData->clipRect.right(),
+diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
+index 412e684..c59c47d 100644
+--- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
++++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
+@@ -363,7 +363,7 @@ void QDirectFBPixmapData::copy(const QPixmapData *data, const QRect &rect)
+     } else {
+         dfbSurface->SetBlittingFlags(dfbSurface, DSBLIT_NOFX);
+     }
+-    const DFBRectangle blitRect = { rect.x(), rect.y(),
++    const DFBRectangle blitRect = (DFBRectangle_C){ rect.x(), rect.y(),
+                                     rect.width(), rect.height() };
+     w = rect.width();
+     h = rect.height();
+@@ -465,7 +465,7 @@ QPixmap QDirectFBPixmapData::transformed(const QTransform &transform,
+     }
+     data->dfbSurface->SetBlittingFlags(data->dfbSurface, flags);
+ 
+-    const DFBRectangle destRect = { 0, 0, size.width(), size.height() };
++    const DFBRectangle destRect = (DFBRectangle_C){ 0, 0, size.width(), size.height() };
+     data->dfbSurface->StretchBlit(data->dfbSurface, dfbSurface, 0, &destRect);
+     data->w = size.width();
+     data->h = size.height();
+@@ -551,7 +551,7 @@ bool QDirectFBPixmapData::scroll(int dx, int dy, const QRect &rect)
+         return false;
+     }
+ 
+-    const DFBRectangle source = { rect.x(), rect.y(), rect.width(), rect.height() };
++    const DFBRectangle source = (DFBRectangle_C){ rect.x(), rect.y(), rect.width(), rect.height() };
+     result = dfbSurface->Blit(dfbSurface, dfbSurface, &source, source.x + dx, source.y + dy);
+     if (result != DFB_OK) {
+         DirectFBError("QDirectFBPixmapData::scroll", result);
+diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
+index eab9580..d26e5bf 100644
+--- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
++++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
+@@ -1635,7 +1635,7 @@ void QDirectFBScreen::solidFill(const QColor &color, const QRegion &region)
+ static inline void clearRect(IDirectFBSurface *surface, const QColor &color, const QRect &rect)
+ {
+     Q_ASSERT(surface);
+-    const DFBRegion region = { rect.left(), rect.top(), rect.right(), rect.bottom() };
++    const DFBRegion region = (DFBRegion_C){ rect.left(), rect.top(), rect.right(), rect.bottom() };
+     // could just reinterpret_cast this to a DFBRegion
+     surface->SetClip(surface, &region);
+     surface->Clear(surface, color.red(), color.green(), color.blue(), color.alpha());
+@@ -1716,14 +1716,14 @@ void QDirectFBScreen::flipSurface(IDirectFBSurface *surface, DFBSurfaceFlipFlags
+             const DFBSurfaceFlipFlags nonWaitFlags = flipFlags & ~DSFLIP_WAIT;
+             for (int i=0; i<rects.size(); ++i) {
+                 const QRect &r = rects.at(i);
+-                const DFBRegion dfbReg = { r.x() + offset.x(), r.y() + offset.y(),
++                const DFBRegion dfbReg = (DFBRegion_C){ r.x() + offset.x(), r.y() + offset.y(),
+                                            r.right() + offset.x(),
+                                            r.bottom() + offset.y() };
+                 surface->Flip(surface, &dfbReg, i + 1 < rects.size() ? nonWaitFlags : flipFlags);
+             }
+         } else {
+             const QRect r = region.boundingRect();
+-            const DFBRegion dfbReg = { r.x() + offset.x(), r.y() + offset.y(),
++            const DFBRegion dfbReg = (DFBRegion_C){ r.x() + offset.x(), r.y() + offset.y(),
+                                        r.right() + offset.x(),
+                                        r.bottom() + offset.y() };
+             surface->Flip(surface, &dfbReg, flipFlags);
+diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
+index 4dff907..25ad06b 100644
+--- a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
++++ b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
+@@ -333,7 +333,7 @@ bool QDirectFBWindowSurface::scroll(const QRegion &region, int dx, int dy)
+     }
+     dfbSurface->SetBlittingFlags(dfbSurface, DSBLIT_NOFX);
+     const QRect r = region.boundingRect();
+-    const DFBRectangle rect = { r.x(), r.y(), r.width(), r.height() };
++    const DFBRectangle rect = (DFBRectangle_C){ r.x(), r.y(), r.width(), r.height() };
+     dfbSurface->Blit(dfbSurface, dfbSurface, &rect, r.x() + dx, r.y() + dy);
+     return true;
+ }
+-- 
+2.1.4
+
Signature · 1 line
2.5.1
#11 lore raw

PATCH v3 3/15 qt: fix directfb-1.7.7 compiler errors

Dear Thomas Petazzoni,

Quoted 1 line · Thomas Petazzoni

From: Peter Seiderer <[email protected]>

Any comments about where this patch comes from? Is it an upstream patch, or has this patch been submitted upstream?

Quoted 16 lines
---
 ...ion-constructor-error-for-legacy-c-compil.patch | 163 +++++++++++++++++++++
 1 file changed, 163 insertions(+)
 create mode 100644 package/qt/0008-Fix-conversion-constructor-error-for-legacy-c-compil.patch
package/qt/0008-Fix-conversion-constructor-error-for-legacy-c-compil.patch new file +3 -0
new file mode 100644
index 0000000..d7d387a
@@ -0,0 +1,163 @@
+From ea46f47fb3c475ba2d7581c15185b8d43e63b8c2 Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <[email protected]>
+Date: Fri, 27 Feb 2015 21:30:52 +0100

package/qt/0008-Fix-conversion-constructor-error-for-legacy-c-compil.patch line 13

Quoted 10 lines
package/qt/0008-Fix-conversion-constructor-error-for-legacy-c-compil.patch new file +10 -0
+Subject: [PATCH] Fix conversion/constructor error for legacy c++ compiler.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes the following compile error with legacy c++ compiler:
+
+error: in C++98 ?blitRect? must be initialized by constructor, not by ?{...}?
+
+Signed-off-by: Peter Seiderer <[email protected]>

you are submitting this patch to Buildroot, so, shouldn't you add your SoB here as well?

Regards,

Vincent.

Quoted 151 lines
package/qt/0008-Fix-conversion-constructor-error-for-legacy-c-compil.patch new file +150 -0
+---
+ src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp   | 14 +++++++-------
+ src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp        |  6 +++---
+ src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp        |  6 +++---
+ src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp |  2 +-
+ 4 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
+index 876d0c2..ed69386 100644
+--- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
++++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
+@@ -942,7 +942,7 @@ void QDirectFBPaintEngine::drawBufferSpan(const uint *buffer, int bufsize,
+     IDirectFBSurface *src = d->surfaceCache->getSurface(buffer, bufsize);
+     // ### how does this play with setDFBColor
+     src->SetColor(src, 0, 0, 0, const_alpha);
+-    const DFBRectangle rect = { 0, 0, length, 1 };
++    const DFBRectangle rect = (DFBRectangle_C){ 0, 0, length, 1 };
+     d->surface->Blit(d->surface, src, &rect, x, y);
+ }
+ 
+@@ -1223,14 +1223,14 @@ void QDirectFBPaintEnginePrivate::blit(const QRectF &dest, IDirectFBSurface *s,
+     const QRect dr = engine->state()->matrix.mapRect(dest).toRect();
+     if (dr.isEmpty())
+         return;
+-    const DFBRectangle sRect = { sr.x(), sr.y(), sr.width(), sr.height() };
++    const DFBRectangle sRect = (DFBRectangle_C){ sr.x(), sr.y(), sr.width(), sr.height() };
+     DFBResult result;
+ 
+     if (dr.size() == sr.size()) {
+         result = surface->Blit(surface, s, &sRect, dr.x(), dr.y());
+     } else {
+         Q_ASSERT(supportsStretchBlit());
+-        const DFBRectangle dRect = { dr.x(), dr.y(), dr.width(), dr.height() };
++        const DFBRectangle dRect = (DFBRectangle_C){ dr.x(), dr.y(), dr.width(), dr.height() };
+         result = surface->StretchBlit(surface, s, &sRect, &dRect);
+     }
+     if (result != DFB_OK)
+@@ -1261,7 +1261,7 @@ void QDirectFBPaintEnginePrivate::drawTiledPixmap(const QRectF &dest, const QPix
+     if (newClip.isNull())
+         return;
+ 
+-    const DFBRegion clip = {
++    const DFBRegion clip = (DFBRegion_C){
+         newClip.x(),
+         newClip.y(),
+         newClip.right(),
+@@ -1295,7 +1295,7 @@ void QDirectFBPaintEnginePrivate::drawTiledPixmap(const QRectF &dest, const QPix
+         while (y <= destinationRect.bottom()) {
+             qreal x = startX;
+             while (x <= destinationRect.right()) {
+-                const DFBRectangle destination = { qRound(x), qRound(y), mappedSize.width(), mappedSize.height() };
++                const DFBRectangle destination = (DFBRectangle_C){ qRound(x), qRound(y), (int)mappedSize.width(), (int)mappedSize.height() };
+                 surface->StretchBlit(surface, sourceSurface, 0, &destination);
+                 x += mappedSize.width();
+             }
+@@ -1337,7 +1337,7 @@ void QDirectFBPaintEnginePrivate::drawTiledPixmap(const QRectF &dest, const QPix
+     if (currentClip.isEmpty()) {
+         surface->SetClip(surface, 0);
+     } else {
+-        const DFBRegion clip = {
++        const DFBRegion clip = (DFBRegion_C){
+             currentClip.x(),
+             currentClip.y(),
+             currentClip.right(),
+@@ -1356,7 +1356,7 @@ void QDirectFBPaintEnginePrivate::updateClip()
+         surface->SetClip(surface, NULL);
+         clipType = NoClip;
+     } else if (clipData->hasRectClip) {
+-        const DFBRegion r = {
++        const DFBRegion r = (DFBRegion_C){
+             clipData->clipRect.x(),
+             clipData->clipRect.y(),
+             clipData->clipRect.right(),
+diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
+index 412e684..c59c47d 100644
+--- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
++++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
+@@ -363,7 +363,7 @@ void QDirectFBPixmapData::copy(const QPixmapData *data, const QRect &rect)
+     } else {
+         dfbSurface->SetBlittingFlags(dfbSurface, DSBLIT_NOFX);
+     }
+-    const DFBRectangle blitRect = { rect.x(), rect.y(),
++    const DFBRectangle blitRect = (DFBRectangle_C){ rect.x(), rect.y(),
+                                     rect.width(), rect.height() };
+     w = rect.width();
+     h = rect.height();
+@@ -465,7 +465,7 @@ QPixmap QDirectFBPixmapData::transformed(const QTransform &transform,
+     }
+     data->dfbSurface->SetBlittingFlags(data->dfbSurface, flags);
+ 
+-    const DFBRectangle destRect = { 0, 0, size.width(), size.height() };
++    const DFBRectangle destRect = (DFBRectangle_C){ 0, 0, size.width(), size.height() };
+     data->dfbSurface->StretchBlit(data->dfbSurface, dfbSurface, 0, &destRect);
+     data->w = size.width();
+     data->h = size.height();
+@@ -551,7 +551,7 @@ bool QDirectFBPixmapData::scroll(int dx, int dy, const QRect &rect)
+         return false;
+     }
+ 
+-    const DFBRectangle source = { rect.x(), rect.y(), rect.width(), rect.height() };
++    const DFBRectangle source = (DFBRectangle_C){ rect.x(), rect.y(), rect.width(), rect.height() };
+     result = dfbSurface->Blit(dfbSurface, dfbSurface, &source, source.x + dx, source.y + dy);
+     if (result != DFB_OK) {
+         DirectFBError("QDirectFBPixmapData::scroll", result);
+diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
+index eab9580..d26e5bf 100644
+--- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
++++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
+@@ -1635,7 +1635,7 @@ void QDirectFBScreen::solidFill(const QColor &color, const QRegion &region)
+ static inline void clearRect(IDirectFBSurface *surface, const QColor &color, const QRect &rect)
+ {
+     Q_ASSERT(surface);
+-    const DFBRegion region = { rect.left(), rect.top(), rect.right(), rect.bottom() };
++    const DFBRegion region = (DFBRegion_C){ rect.left(), rect.top(), rect.right(), rect.bottom() };
+     // could just reinterpret_cast this to a DFBRegion
+     surface->SetClip(surface, &region);
+     surface->Clear(surface, color.red(), color.green(), color.blue(), color.alpha());
+@@ -1716,14 +1716,14 @@ void QDirectFBScreen::flipSurface(IDirectFBSurface *surface, DFBSurfaceFlipFlags
+             const DFBSurfaceFlipFlags nonWaitFlags = flipFlags & ~DSFLIP_WAIT;
+             for (int i=0; i<rects.size(); ++i) {
+                 const QRect &r = rects.at(i);
+-                const DFBRegion dfbReg = { r.x() + offset.x(), r.y() + offset.y(),
++                const DFBRegion dfbReg = (DFBRegion_C){ r.x() + offset.x(), r.y() + offset.y(),
+                                            r.right() + offset.x(),
+                                            r.bottom() + offset.y() };
+                 surface->Flip(surface, &dfbReg, i + 1 < rects.size() ? nonWaitFlags : flipFlags);
+             }
+         } else {
+             const QRect r = region.boundingRect();
+-            const DFBRegion dfbReg = { r.x() + offset.x(), r.y() + offset.y(),
++            const DFBRegion dfbReg = (DFBRegion_C){ r.x() + offset.x(), r.y() + offset.y(),
+                                        r.right() + offset.x(),
+                                        r.bottom() + offset.y() };
+             surface->Flip(surface, &dfbReg, flipFlags);
+diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
+index 4dff907..25ad06b 100644
+--- a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
++++ b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
+@@ -333,7 +333,7 @@ bool QDirectFBWindowSurface::scroll(const QRegion &region, int dx, int dy)
+     }
+     dfbSurface->SetBlittingFlags(dfbSurface, DSBLIT_NOFX);
+     const QRect r = region.boundingRect();
+-    const DFBRectangle rect = { r.x(), r.y(), r.width(), r.height() };
++    const DFBRectangle rect = (DFBRectangle_C){ r.x(), r.y(), r.width(), r.height() };
+     dfbSurface->Blit(dfbSurface, dfbSurface, &rect, r.x() + dx, r.y() + dy);
+     return true;
+ }
+-- 
+2.1.4
+
#12 lore raw

PATCH v3 3/15 qt: fix directfb-1.7.7 compiler errors

Dear Vicente Olivert Riera,

Quoted 7 lines · Vicente Olivert Riera

Dear Thomas Petazzoni,

Quoted 1 line · Thomas Petazzoni

From: Peter Seiderer <[email protected]>

Any comments about where this patch comes from? Is it an upstream patch, or has this patch been submitted upstream?

It has been written by Peter, as far as I know. It has not been submitted upstream so far, and qt 4.x is in deep maintenance mode, so I doubt it will be adopted. But I can try to submit it in a bug report to Qt 4.x. Or maybe Peter you could do it?

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#13 lore raw

PATCH v3 4/15 directfb: do not use inexistant configure options

In reply to Thomas Petazzoni

From: Peter Seiderer <[email protected]>

The --disable-sysfs and --disable-explicit-deps options are not supported by DirectFB anymore, so don't use them.

[Thomas: rework commit log.]

---
 package/directfb/directfb.mk | 2 --
 1 file changed, 2 deletions(-)
package/directfb/directfb.mk +0 -2
index c27e982..da12acb 100644
@@ -14,11 +14,9 @@ DIRECTFB_INSTALL_STAGING = YES
 DIRECTFB_AUTORECONF = YES
 
 DIRECTFB_CONF_OPTS = \
-	--disable-explicit-deps \
 	--enable-zlib \
 	--enable-freetype \
 	--enable-fbdev \
-	--disable-sysfs \
 	--disable-sdl \
 	--disable-vnc \
 	--disable-osx \
Signature · 1 line
2.5.1
#14 lore raw

PATCH v3 4/15 directfb: do not use inexistant configure options

Dear Thomas Petazzoni,

Quoted 4 lines · Thomas Petazzoni

From: Peter Seiderer <[email protected]>

The --disable-sysfs and --disable-explicit-deps options are not supported by DirectFB anymore, so don't use them.

which version introduces such a change? Is it 1.7.7? If so, I think this patch should be squashed with the one that does the version bump to 1.7.7. Otherwise, ignore my comment.

Regards,

Vincent.

Quoted 26 lines

[Thomas: rework commit log.]

---
 package/directfb/directfb.mk | 2 --
 1 file changed, 2 deletions(-)
package/directfb/directfb.mk +0 -2
index c27e982..da12acb 100644
@@ -14,11 +14,9 @@ DIRECTFB_INSTALL_STAGING = YES
 DIRECTFB_AUTORECONF = YES
 
 DIRECTFB_CONF_OPTS = \
-	--disable-explicit-deps \
 	--enable-zlib \
 	--enable-freetype \
 	--enable-fbdev \
-	--disable-sysfs \
 	--disable-sdl \
 	--disable-vnc \
 	--disable-osx \
#15 lore raw

PATCH v3 4/15 directfb: do not use inexistant configure options

Dear Thomas Petazzoni,

Quoted 11 lines · Vicente Olivert Riera

Dear Thomas Petazzoni,

Quoted 4 lines · Thomas Petazzoni

From: Peter Seiderer <[email protected]>

The --disable-sysfs and --disable-explicit-deps options are not supported by DirectFB anymore, so don't use them.

which version introduces such a change? Is it 1.7.7? If so, I think this patch should be squashed with the one that does the version bump to 1.7.7. Otherwise, ignore my comment.

Ok, I just checked that directfb-1.6.3 (the current version in Buildroot) didn't have those options either, so it's fine to not remove them as part of the version bump.

Regards,

Vincent.

Quoted 35 lines

Regards,

Vincent.

Quoted 16 lines

[Thomas: rework commit log.]

---
 package/directfb/directfb.mk | 2 --
 1 file changed, 2 deletions(-)
package/directfb/directfb.mk +0 -0
index c27e982..da12acb 100644
@@ -14,11 +14,9 @@ DIRECTFB_INSTALL_STAGING = YES
 DIRECTFB_AUTORECONF = YES

package/directfb/directfb.mk DIRECTFB_INSTALL_STAGING = YES · line 22

Quoted 10 lines
package/directfb/directfb.mk +0 -2
 
 DIRECTFB_CONF_OPTS = \
-	--disable-explicit-deps \
 	--enable-zlib \
 	--enable-freetype \
 	--enable-fbdev \
-	--disable-sysfs \
 	--disable-sdl \
 	--disable-vnc \
 	--disable-osx \

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

#16 lore raw

PATCH v3 4/15 directfb: do not use inexistant configure options

Dear Thomas Petazzoni,

Quoted 11 lines · Vicente Olivert Riera

Dear Thomas Petazzoni,

Quoted 8 lines · Vicente Olivert Riera

Dear Thomas Petazzoni,

Quoted 4 lines · Thomas Petazzoni

From: Peter Seiderer <[email protected]>

The --disable-sysfs and --disable-explicit-deps options are not supported by DirectFB anymore, so don't use them.

Quoted 7 lines
Quoted 3 lines

which version introduces such a change? Is it 1.7.7? If so, I think this patch should be squashed with the one that does the version bump to 1.7.7. Otherwise, ignore my comment.

Ok, I just checked that directfb-1.6.3 (the current version in Buildroot) didn't have those options either, so it's fine to not remove them as part of the version bump.

Regards,

Vincent.

Quoted 44 lines

Regards,

Vincent.

Quoted 20 lines

Regards,

Vincent.

Quoted 16 lines

[Thomas: rework commit log.]

---
 package/directfb/directfb.mk | 2 --
 1 file changed, 2 deletions(-)
package/directfb/directfb.mk +0 -0
index c27e982..da12acb 100644
@@ -14,11 +14,9 @@ DIRECTFB_INSTALL_STAGING = YES
 DIRECTFB_AUTORECONF = YES
 
Quoted 15 lines

package/directfb/directfb.mk DIRECTFB_INSTALL_STAGING = YES · line 22

Quoted 10 lines
package/directfb/directfb.mk +0 -2
 DIRECTFB_CONF_OPTS = \
-	--disable-explicit-deps \
 	--enable-zlib \
 	--enable-freetype \
 	--enable-fbdev \
-	--disable-sysfs \
 	--disable-sdl \
 	--disable-vnc \
 	--disable-osx \

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

#17 lore raw

PATCH v3 5/15 directfb: remove broken X.org support

In reply to Thomas Petazzoni

The BR2_PACKAGE_XSERVER option never existed, so it was never possible for DirectFB to pass --enable-x11. Moreover, doing this without having at least some dependency on certain X libraries will clearly not work.

Consequently, let's remove this bogus X.org support, and disable X11 support unconditionally (until someone is interested enough to bring this back to life).

The option was actually named BR2_PACKAGE_DIRECTFB_XSERVER but was not used by the .mk file.

---
 package/directfb/Config.in   | 4 ----
 package/directfb/directfb.mk | 9 ++-------
 2 files changed, 2 insertions(+), 11 deletions(-)
package/directfb/Config.in +0 -4
index 3ab40f9..98acec5 100644
@@ -45,10 +45,6 @@ config BR2_PACKAGE_DIRECTFB_TRACE
 	help
 	  Enable call tracing for DirectFB applications
 
-config BR2_PACKAGE_DIRECTFB_XSERVER
-	bool "build with X server backend"
-	depends on BR2_PACKAGE_XORG7
-
 config BR2_PACKAGE_DIRECTFB_UNIQUE
 	bool "enable unique window manager"
 	depends on BR2_UNIMPLEMENTED
package/directfb/directfb.mk +2 -7
index da12acb..acb3e3a 100644
@@ -22,7 +22,8 @@ DIRECTFB_CONF_OPTS = \
 	--disable-osx \
 	--disable-video4linux \
 	--disable-video4linux2 \
-	--without-tools
+	--without-tools \
+	--disable-x11
 
 ifeq ($(BR2_STATIC_LIBS),y)
 DIRECTFB_CONF_OPTS += --disable-dynload
@@ -52,12 +53,6 @@ ifeq ($(BR2_PACKAGE_DIRECTFB_TRACE),y)
 DIRECTFB_CONF_OPTS += --enable-trace
 endif
 
-ifeq ($(BR2_PACKAGE_XSERVER),y)
-DIRECTFB_CONF_OPTS += --enable-x11
-else
-DIRECTFB_CONF_OPTS += --disable-x11
-endif
-
 ifeq ($(BR2_PACKAGE_DIRECTFB_UNIQUE),y)
 DIRECTFB_CONF_OPTS += --enable-unique
 else
Signature · 1 line
2.5.1
#18 lore raw

PATCH v3 6/15 directfb: remove BR2_PACKAGE_DIRECTFB_UNIQUE option

In reply to Thomas Petazzoni

This option depends on BR2_UNIMPLEMENTED (which does not exist) since 2009. Since BR2_UNIMPLEMENTED does not exist, it was not possible to enable BR2_PACKAGE_DIRECTFB_UNIQUE, which means that nobody cared about making it available, and that we don't need to add any Config.in.legacy handling to remove this option.

---
 package/directfb/Config.in   | 4 ----
 package/directfb/directfb.mk | 6 ------
 2 files changed, 10 deletions(-)
package/directfb/Config.in +0 -4
index 98acec5..d71858e 100644
@@ -45,10 +45,6 @@ config BR2_PACKAGE_DIRECTFB_TRACE
 	help
 	  Enable call tracing for DirectFB applications
 
-config BR2_PACKAGE_DIRECTFB_UNIQUE
-	bool "enable unique window manager"
-	depends on BR2_UNIMPLEMENTED
-
 config BR2_PACKAGE_DIRECTFB_ATI128
 	bool "compile ati128 graphics driver"
 	depends on BR2_i386 || BR2_x86_64
package/directfb/directfb.mk +0 -6
index acb3e3a..d44e658 100644
@@ -53,12 +53,6 @@ ifeq ($(BR2_PACKAGE_DIRECTFB_TRACE),y)
 DIRECTFB_CONF_OPTS += --enable-trace
 endif
 
-ifeq ($(BR2_PACKAGE_DIRECTFB_UNIQUE),y)
-DIRECTFB_CONF_OPTS += --enable-unique
-else
-DIRECTFB_CONF_OPTS += --disable-unique
-endif
-
 DIRECTFB_GFX = \
 	$(if $(BR2_PACKAGE_DIRECTFB_ATI128),ati128) \
 	$(if $(BR2_PACKAGE_DIRECTFB_CLE266),cle266) \
Signature · 1 line
2.5.1
#19 lore raw

PATCH v3 7/15 directfb: add options for divine and sawman

In reply to Thomas Petazzoni

Since DirectFB 1.7.x, the divine (virtual input) and sawman (window manager) features have been merged in DirectFB itself rather than being shipped as separate tarballs. This commit creates additional options to enable those features.

Upcoming commits will get rid of the existing divine and sawman Buildroot packages.

---
 .../directfb/0005-add-missing-idivine-header.patch | 65 ++++++++++++++++++++++
 package/directfb/Config.in                         | 10 ++++
 package/directfb/directfb.mk                       | 12 ++++
 3 files changed, 87 insertions(+)
 create mode 100644 package/directfb/0005-add-missing-idivine-header.patch
package/directfb/0005-add-missing-idivine-header.patch new file +65 -0
new file mode 100644
index 0000000..7823eb7
@@ -0,0 +1,65 @@
+Add idivine.h, which is missing from DirectFB tarballs
+
+The idivine.h file was taken from the DirectFB Git repository.
+
+Signed-off-by: Thomas Petazzoni <[email protected]>
+
+Index: b/lib/divine/idivine.h
+===================================================================
+--- /dev/null
++++ b/lib/divine/idivine.h
+@@ -0,0 +1,54 @@
++/*
++   (c) Copyright 2012-2013  DirectFB integrated media GmbH
++   (c) Copyright 2001-2013  The world wide DirectFB Open Source Community (directfb.org)
++   (c) Copyright 2000-2004  Convergence (integrated media) GmbH
++
++   All rights reserved.
++
++   Written by Denis Oliver Kropp <[email protected]>,
++              Andreas Shimokawa <[email protected]>,
++              Marek Pikarski <[email protected]>,
++              Sven Neumann <[email protected]>,
++              Ville Syrj??l?? <[email protected]> and
++              Claudio Ciccani <[email protected]>.
++
++   This library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2 of the License, or (at your option) any later version.
++
++   This library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with this library; if not, write to the
++   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++   Boston, MA 02111-1307, USA.
++*/
++
++
++
++#ifndef __IDIVINE_H__
++#define __IDIVINE_H__
++
++#include <divine.h>
++
++/*
++ * private data struct of IDiVine
++ */
++typedef struct {
++     int                         ref;      /* reference counter */
++
++     DiVine                     *divine;
++} IDiVine_data;
++
++/*
++ * IDiVine constructor/destructor
++ */
++DFBResult IDiVine_Construct( IDiVine *thiz );
++
++void      IDiVine_Destruct ( IDiVine *thiz );
++
++#endif
package/directfb/Config.in +10 -0
index d71858e..f8865e8 100644
@@ -45,6 +45,16 @@ config BR2_PACKAGE_DIRECTFB_TRACE
 	help
 	  Enable call tracing for DirectFB applications
 
+config BR2_PACKAGE_DIRECTFB_DIVINE
+	bool "divine"
+	help
+	  Enable the DiVine feature (virtual input)
+
+config BR2_PACKAGE_DIRECTFB_SAWMAN
+	bool "sawman"
+	help
+	  Enable the SawMan feature (window manager)
+
 config BR2_PACKAGE_DIRECTFB_ATI128
 	bool "compile ati128 graphics driver"
 	depends on BR2_i386 || BR2_x86_64
package/directfb/directfb.mk +12 -0
index d44e658..ea579f5 100644
@@ -53,6 +53,18 @@ ifeq ($(BR2_PACKAGE_DIRECTFB_TRACE),y)
 DIRECTFB_CONF_OPTS += --enable-trace
 endif
 
+ifeq ($(BR2_PACKAGE_DIRECTFB_DIVINE),y)
+DIRECTFB_CONF_OPTS += --enable-divine
+else
+DIRECTFB_CONF_OPTS += --disable-divine
+endif
+
+ifeq ($(BR2_PACKAGE_DIRECTFB_SAWMAN),y)
+DIRECTFB_CONF_OPTS += --enable-sawman
+else
+DIRECTFB_CONF_OPTS += --disable-sawman
+endif
+
 DIRECTFB_GFX = \
 	$(if $(BR2_PACKAGE_DIRECTFB_ATI128),ati128) \
 	$(if $(BR2_PACKAGE_DIRECTFB_CLE266),cle266) \
Signature · 1 line
2.5.1
#20 lore raw

PATCH v3 8/15 directfb: add new TIFF option

In reply to Thomas Petazzoni

From: Peter Seiderer <[email protected]>

[Thomas: don't enable option by default.]

---
 package/directfb/Config.in   | 4 ++++
 package/directfb/directfb.mk | 7 +++++++
 2 files changed, 11 insertions(+)
package/directfb/Config.in +4 -0
index f8865e8..548f602 100644
@@ -125,6 +125,10 @@ config BR2_PACKAGE_DIRECTFB_GIF
 	bool "enable GIF support"
 	default y
 
+config BR2_PACKAGE_DIRECTFB_TIFF
+	bool "enable TIFF support"
+	select BR2_PACKAGE_TIFF
+
 config BR2_PACKAGE_DIRECTFB_IMLIB2
 	bool "enable IMLIB2 support"
 	select BR2_PACKAGE_IMLIB2
package/directfb/directfb.mk +7 -0
index ea579f5..5e68b7b 100644
@@ -106,6 +106,13 @@ else
 DIRECTFB_CONF_OPTS += --disable-gif
 endif
 
+ifeq ($(BR2_PACKAGE_DIRECTFB_TIFF),y)
+DIRECTFB_CONF_OPTS += --enable-tiff
+DIRECTFB_DEPENDENCIES += tiff
+else
+DIRECTFB_CONF_OPTS += --disable-tiff
+endif
+
 ifeq ($(BR2_PACKAGE_DIRECTFB_PNG),y)
 DIRECTFB_CONF_OPTS += --enable-png
 DIRECTFB_DEPENDENCIES += libpng
Signature · 1 line
2.5.1
#21 lore raw

PATCH v3 9/15 divine: remove package

In reply to Thomas Petazzoni

This commit removes the divine package, since the corresponding functionality has been merged in DirectFB itself since 1.7.x.

---
 Config.in.legacy         | 13 +++++++++++++
 package/Config.in        |  1 -
 package/divine/Config.in |  8 --------
 package/divine/divine.mk | 19 -------------------
 4 files changed, 13 insertions(+), 28 deletions(-)
 delete mode 100644 package/divine/Config.in
 delete mode 100644 package/divine/divine.mk
Config.in.legacy +13 -0
index 3330566..3d4551c 100644
@@ -105,6 +105,19 @@ comment "----------------------------------------------------"
 endif
 
 ###############################################################################
+comment "Legacy options removed in 2015.11"
+
+config BR2_PACKAGE_DIVINE
+	bool "divine package removed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_DIRECTFB_DIVINE
+	help
+	  This option has been removed because the divine package no
+	  longer exists: it was merged inside DirectFB itself. This
+	  feature can now be enabled using the
+	  BR2_PACKAGE_DIRECTFB_DIVINE option.
+
+###############################################################################
 comment "Legacy options removed in 2015.08"
 
 config BR2_PACKAGE_KODI_PVR_ADDONS
package/Config.in +0 -1
index 58b7380..be1c18f 100644
@@ -227,7 +227,6 @@ comment "Graphic libraries"
 	source "package/cegui06/Config.in"
 	source "package/directfb/Config.in"
 	source "package/directfb-examples/Config.in"
-	source "package/divine/Config.in"
 	source "package/fbdump/Config.in"
 	source "package/fbgrab/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
package/divine/Config.in deleted +0 -8
deleted file mode 100644
index 7909004..0000000
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_DIVINE
-	bool "directfb virtual input extension"
-	depends on BR2_PACKAGE_DIRECTFB
-	help
-	  DiVine provides a DirectFB input driver that reads input
-	  events from a pipe and dispatches them via a virtual input
-	  device. It also installs the tool 'spooky' that allows to
-	  send input events to DirectFB applications.
package/divine/divine.mk deleted +0 -19
deleted file mode 100644
index 322e5fc..0000000
@@ -1,19 +0,0 @@
-################################################################################
-#
-# divine
-#
-################################################################################
-
-# tagged version 1.6.3, tarball is missing files
-DIVINE_VERSION = 83cafc257a42b9465cd9d6185bf66b8c1b7ed704
-DIVINE_SITE = git://git.directfb.org/git/directfb/extras/DiVine.git
-DIVINE_LICENSE = LGPLv2.1+
-DIVINE_LICENSE_FILES = COPYING
-DIVINE_INSTALL_STAGING = YES
-DIVINE_DEPENDENCIES = directfb
-DIVINE_CONFIG_SCRIPTS = divine-config
-
-# package has no configure script so we have to generate it
-DIVINE_AUTORECONF = YES
-
-$(eval $(autotools-package))
Signature · 1 line
2.5.1
#22 lore raw

PATCH v3 10/15 sawman: remove package

In reply to Thomas Petazzoni

This commit removes the sawman package, since the corresponding functionality has been merged in DirectFB itself since 1.7.x.

---
 Config.in.legacy                                      | 10 ++++++++++
 package/Config.in                                     |  1 -
 .../sawman/0001-link-using-gcc-instead-of-ld.patch    | 19 -------------------
 package/sawman/Config.in                              | 11 -----------
 package/sawman/sawman.mk                              | 16 ----------------
 5 files changed, 10 insertions(+), 47 deletions(-)
 delete mode 100644 package/sawman/0001-link-using-gcc-instead-of-ld.patch
 delete mode 100644 package/sawman/Config.in
 delete mode 100644 package/sawman/sawman.mk
Config.in.legacy +10 -0
index 3d4551c..d0e2c81 100644
@@ -107,6 +107,16 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2015.11"
 
+config BR2_PACKAGE_SAWMAN
+	bool "sawman package removed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_DIRECTFB_SAWMAN
+	help
+	  This option has been removed because the sawman package no
+	  longer exists: it was merged inside DirectFB itself. This
+	  feature can now be enabled using the
+	  BR2_PACKAGE_DIRECTFB_SAWMAN option.
+
 config BR2_PACKAGE_DIVINE
 	bool "divine package removed"
 	select BR2_LEGACY
package/Config.in +0 -1
index be1c18f..acff670 100644
@@ -243,7 +243,6 @@ endif
 	source "package/mesa3d-headers/Config.in"
 	source "package/ocrad/Config.in"
 	source "package/psplash/Config.in"
-	source "package/sawman/Config.in"
 	source "package/sdl/Config.in"
 	source "package/sdl_gfx/Config.in"
 	source "package/sdl_image/Config.in"
package/sawman/0001-link-using-gcc-instead-of-ld.patch deleted +0 -19
deleted file mode 100644
index 02e8029..0000000
@@ -1,19 +0,0 @@
-sawman: Link using gcc instead of ld
-
-Using ld may cause a link failure due to using the default emulation
-linker which is configured when building the linker in binutils.  Using
-gcc instead will pass the appropriate -m value because the compiler 
-knows the ABI you are using.
-
-Signed-off-by: Vicente Olivert Riera <[email protected]>
---- SaWMan-1.6.3/rules/libobject.make.orig	2013-12-17 15:54:22.137856874 +0000
-+++ SaWMan-1.6.3/rules/libobject.make	2013-12-17 15:54:44.233201909 +0000
-@@ -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)
package/sawman/Config.in deleted +0 -11
deleted file mode 100644
index 2f847db..0000000
@@ -1,11 +0,0 @@
-config BR2_PACKAGE_SAWMAN
-	bool "SawMan (Window Manager)"
-	depends on BR2_PACKAGE_DIRECTFB
-	help
-	  SaWMan is a new window manager module for use with DirectFB.
-	  Its main difference to the default module is that it allows
-	  one process to be an application and window manager,
-	  implementing all kinds of diversity, while SaWMan is only the
-	  working horse.
-
-	  See http://www.directfb.org/downloads/Extras/README.SaWMan
package/sawman/sawman.mk deleted +0 -16
deleted file mode 100644
index 559235f..0000000
@@ -1,16 +0,0 @@
-################################################################################
-#
-# sawman
-#
-################################################################################
-
-SAWMAN_VERSION = 1.6.3
-SAWMAN_SOURCE = SaWMan-$(SAWMAN_VERSION).tar.gz
-SAWMAN_SITE = http://www.directfb.org/downloads/Extras
-SAWMAN_INSTALL_STAGING = YES
-SAWMAN_AUTORECONF = YES
-SAWMAN_DEPENDENCIES = directfb
-SAWMAN_LICENSE = LGPLv2.1+
-SAWMAN_LICENSE_FILES = COPYING
-
-$(eval $(autotools-package))
Signature · 1 line
2.5.1
#23 lore raw

PATCH v3 11/15 linux-fusion: bump to 9.0.3, use .tar.xz

In reply to Thomas Petazzoni

This commit bumps linux-fusion to the latest upstream version, and switches to use the more space efficient xz-compressed tarball.

---
 package/linux-fusion/linux-fusion.hash | 4 ++--
 package/linux-fusion/linux-fusion.mk   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)
package/linux-fusion/linux-fusion.hash +2 -2
index 307c522..4bf288d 100644
@@ -1,2 +1,2 @@
-# Locally calculated
-sha256	96508ab2c27074af6e18474fec23595520379e2256df84c63897fcd9672ee9b1	linux-fusion-9.0.2.tar.gz
+# Locally computed
+sha256 c3c71af364ef774c70d3f6fbc32d14bc786d915df633d6fe733e1fde84ad6e99 linux-fusion-9.0.3.tar.xz
package/linux-fusion/linux-fusion.mk +2 -1
index 001388c..a245b8f 100644
@@ -4,8 +4,9 @@
 #
 ################################################################################
 
-LINUX_FUSION_VERSION = 9.0.2
+LINUX_FUSION_VERSION = 9.0.3
 LINUX_FUSION_SITE = http://directfb.org/downloads/Core/linux-fusion
+LINUX_FUSION_SOURCE = linux-fusion-$(LINUX_FUSION_VERSION).tar.xz
 LINUX_FUSION_INSTALL_STAGING = YES
 LINUX_FUSION_DEPENDENCIES = linux
 LINUX_FUSION_LICENSE = GPLv2+
Signature · 1 line
2.5.1
#24 lore raw

PATCH v3 12/15 linux-fusion: use a more traditional style to define LINUX_FUSION_MAKE_OPTS

In reply to Thomas Petazzoni

Use a single assignment to define the value of LINUX_FUSION_MAKE_OPTS instead of a sequence of += assignments.

---
 package/linux-fusion/linux-fusion.mk | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
package/linux-fusion/linux-fusion.mk +8 -8
index a245b8f..f34e0a8 100644
@@ -15,14 +15,14 @@ LINUX_FUSION_LICENSE_FILES = debian/copyright
 LINUX_FOR_FUSION = $(LINUX_VERSION_PROBED)
 LINUX_FUSION_ETC_DIR = $(TARGET_DIR)/etc/udev/rules.d
 
-LINUX_FUSION_MAKE_OPTS = KERNEL_VERSION=$(LINUX_FOR_FUSION)
-LINUX_FUSION_MAKE_OPTS += KERNEL_BUILD=$(LINUX_DIR)
-LINUX_FUSION_MAKE_OPTS += KERNEL_SOURCE=$(LINUX_DIR)
-
-LINUX_FUSION_MAKE_OPTS += SYSROOT=$(TARGET_DIR)
-LINUX_FUSION_MAKE_OPTS += ARCH=$(KERNEL_ARCH)
-LINUX_FUSION_MAKE_OPTS += CROSS_COMPILE=$(TARGET_CROSS)
-LINUX_FUSION_MAKE_OPTS += KERNEL_MODLIB=/lib/modules/$(LINUX_FOR_FUSION)/kernel
+LINUX_FUSION_MAKE_OPTS = \
+	KERNEL_VERSION=$(LINUX_FOR_FUSION) \
+	KERNEL_BUILD=$(LINUX_DIR) \
+	KERNEL_SOURCE=$(LINUX_DIR) \
+	SYSROOT=$(TARGET_DIR) \
+	ARCH=$(KERNEL_ARCH) \
+	CROSS_COMPILE=$(TARGET_CROSS) \
+	KERNEL_MODLIB=/lib/modules/$(LINUX_FOR_FUSION)/kernel
 
 define LINUX_FUSION_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) $(LINUX_FUSION_MAKE_OPTS) -C $(@D)
Signature · 1 line
2.5.1
#25 lore raw

PATCH v3 13/15 directfb-examples: remove options for each example

In reply to Thomas Petazzoni

For some historical reasons, the directfb-examples package has one sub-option for each example, and the .mk files go through some great lengths to install only the needed data files for each example.

This is a bit silly for several reasons:

* In no other Buildroot package we do offer such a fine-grained selection of what the package installs;

* directfb-examples are examples, they are therefore typically not meant to be used on a final production system, but more during development or for demonstration. Those are situations where size generally isn't that critical (all installed, the package takes 2.4 MB on the rootfs);

* Those options and the .mk file logic has to be updated whenever the package is bumped;

* Users can always use a post-build script to keep only the examples they are interested in.

All the options are moved to Config.in.legacy. However, we could debate on whether this is actually useful, since the main option BR2_PACKAGE_DIRECTFB_EXAMPLES will now install a superset of whatever was selected before through sub-options.

---
 Config.in.legacy                               | 209 +++++++++++++++++++++++++
 package/directfb-examples/Config.in            | 151 ------------------
 package/directfb-examples/directfb-examples.mk |  93 -----------
 3 files changed, 209 insertions(+), 244 deletions(-)
Config.in.legacy +209 -0
index d0e2c81..52031fe 100644
@@ -107,6 +107,215 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2015.11"
 
+config BR2_PACKAGE_DIRECTFB_EXAMPLES_ANDI
+	bool "DirectFB example df_andi has been removed"
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  The per-DirectFB example options have been removed. The
+	  BR2_PACKAGE_DIRECTFB_EXAMPLES option now installs all
+	  examples.
+
+config BR2_PACKAGE_DIRECTFB_EXAMPLES_BLTLOAD
+	bool "DirectFB example df_bltload has been removed"
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  The per-DirectFB example options have been removed. The
+	  BR2_PACKAGE_DIRECTFB_EXAMPLES option now installs all
+	  examples.
+
+config BR2_PACKAGE_DIRECTFB_EXAMPLES_CPULOAD
+	bool "DirectFB example df_cpuload has been removed"
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  The per-DirectFB example options have been removed. The
+	  BR2_PACKAGE_DIRECTFB_EXAMPLES option now installs all
+	  examples.
+
+config BR2_PACKAGE_DIRECTFB_EXAMPLES_DATABUFFER
+	bool "DirectFB example df_databuffer has been removed"
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  The per-DirectFB example options have been removed. The
+	  BR2_PACKAGE_DIRECTFB_EXAMPLES option now installs all
+	  examples.
+
+config BR2_PACKAGE_DIRECTFB_EXAMPLES_DIOLOAD
+	bool "DirectFB example df_dioload has been removed"
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  The per-DirectFB example options have been removed. The
+	  BR2_PACKAGE_DIRECTFB_EXAMPLES option now installs all
+	  examples.
+
+config BR2_PACKAGE_DIRECTFB_EXAMPLES_DOK
+	bool "DirectFB example df_dok has been removed"
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  The per-DirectFB example options have been removed. The
+	  BR2_PACKAGE_DIRECTFB_EXAMPLES option now installs all
+	  examples.
+
+config BR2_PACKAGE_DIRECTFB_EXAMPLES_DRIVERTEST
+	bool "DirectFB example df_drivertest has been removed"
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  The per-DirectFB example options have been removed. The
+	  BR2_PACKAGE_DIRECTFB_EXAMPLES option now installs all
+	  examples.
+
+
+config BR2_PACKAGE_DIRECTFB_EXAMPLES_FIRE
+	bool "DirectFB example df_fire has been removed"
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  The per-DirectFB example options have been removed. The
+	  BR2_PACKAGE_DIRECTFB_EXAMPLES option now installs all
+	  examples.
+
+config BR2_PACKAGE_DIRECTFB_EXAMPLES_FLIP
+	bool "DirectFB example df_flip has been removed"
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  The per-DirectFB example options have been removed. The
+	  BR2_PACKAGE_DIRECTFB_EXAMPLES option now installs all
+	  examples.
+
+config BR2_PACKAGE_DIRECTFB_EXAMPLES_FONTS
+	bool "DirectFB example df_fonts has been removed"
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  The per-DirectFB example options have been removed. The
+	  BR2_PACKAGE_DIRECTFB_EXAMPLES option now installs all
+	  examples.
+
+config BR2_PACKAGE_DIRECTFB_EXAMPLES_INPUT
+	bool "DirectFB example df_input has been removed"
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  The per-DirectFB example options have been removed. The
+	  BR2_PACKAGE_DIRECTFB_EXAMPLES option now installs all
+	  examples.
+
+config BR2_PACKAGE_DIRECTFB_EXAMPLES_JOYSTICK
+	bool "DirectFB example df_joystick has been removed"
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  The per-DirectFB example options have been removed. The
+	  BR2_PACKAGE_DIRECTFB_EXAMPLES option now installs all
+	  examples.
+
+config BR2_PACKAGE_DIRECTFB_EXAMPLES_KNUCKLES
+	bool "DirectFB example df_knuckles has been removed"
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  The per-DirectFB example options have been removed. The
+	  BR2_PACKAGE_DIRECTFB_EXAMPLES option now installs all
+	  examples.
+
+config BR2_PACKAGE_DIRECTFB_EXAMPLES_LAYER
+	bool "DirectFB example df_layer has been removed"
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  The per-DirectFB example options have been removed. The
+	  BR2_PACKAGE_DIRECTFB_EXAMPLES option now installs all
+	  examples.
+
+config BR2_PACKAGE_DIRECTFB_EXAMPLES_MATRIX
+	bool "DirectFB example df_matrix has been removed"
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  The per-DirectFB example options have been removed. The
+	  BR2_PACKAGE_DIRECTFB_EXAMPLES option now installs all
+	  examples.
+
+config BR2_PACKAGE_DIRECTFB_EXAMPLES_MATRIX_WATER
+	bool "DirectFB example df_matrix_water has been removed"
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  The per-DirectFB example options have been removed. The
+	  BR2_PACKAGE_DIRECTFB_EXAMPLES option now installs all
+	  examples.
+
+config BR2_PACKAGE_DIRECTFB_EXAMPLES_NEO
+	bool "DirectFB example df_neo has been removed"
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  The per-DirectFB example options have been removed. The
+	  BR2_PACKAGE_DIRECTFB_EXAMPLES option now installs all
+	  examples.
+
+config BR2_PACKAGE_DIRECTFB_EXAMPLES_NETLOAD
+	bool "DirectFB example df_netload has been removed"
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  The per-DirectFB example options have been removed. The
+	  BR2_PACKAGE_DIRECTFB_EXAMPLES option now installs all
+	  examples.
+
+config BR2_PACKAGE_DIRECTFB_EXAMPLES_PALETTE
+	bool "DirectFB example df_palette has been removed"
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  The per-DirectFB example options have been removed. The
+	  BR2_PACKAGE_DIRECTFB_EXAMPLES option now installs all
+	  examples.
+
+config BR2_PACKAGE_DIRECTFB_EXAMPLES_PARTICLE
+	bool "DirectFB example df_particle has been removed"
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  The per-DirectFB example options have been removed. The
+	  BR2_PACKAGE_DIRECTFB_EXAMPLES option now installs all
+	  examples.
+
+config BR2_PACKAGE_DIRECTFB_EXAMPLES_PORTER
+	bool "DirectFB example df_porter has been removed"
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  The per-DirectFB example options have been removed. The
+	  BR2_PACKAGE_DIRECTFB_EXAMPLES option now installs all
+	  examples.
+
+config BR2_PACKAGE_DIRECTFB_EXAMPLES_STRESS
+	bool "DirectFB example df_stress has been removed"
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  The per-DirectFB example options have been removed. The
+	  BR2_PACKAGE_DIRECTFB_EXAMPLES option now installs all
+	  examples.
+
+config BR2_PACKAGE_DIRECTFB_EXAMPLES_TEXTURE
+	bool "DirectFB example df_texture has been removed"
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  The per-DirectFB example options have been removed. The
+	  BR2_PACKAGE_DIRECTFB_EXAMPLES option now installs all
+	  examples.
+
+config BR2_PACKAGE_DIRECTFB_EXAMPLES_VIDEO
+	bool "DirectFB example df_video has been removed"
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  The per-DirectFB example options have been removed. The
+	  BR2_PACKAGE_DIRECTFB_EXAMPLES option now installs all
+	  examples.
+
+config BR2_PACKAGE_DIRECTFB_EXAMPLES_VIDEO_PARTICLE
+	bool "DirectFB example df_video_particle has been removed"
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  The per-DirectFB example options have been removed. The
+	  BR2_PACKAGE_DIRECTFB_EXAMPLES option now installs all
+	  examples.
+
+config BR2_PACKAGE_DIRECTFB_EXAMPLES_WINDOW
+	bool "DirectFB example df_window has been removed"
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  The per-DirectFB example options have been removed. The
+	  BR2_PACKAGE_DIRECTFB_EXAMPLES option now installs all
+	  examples.
+
 config BR2_PACKAGE_SAWMAN
 	bool "sawman package removed"
 	select BR2_LEGACY
package/directfb-examples/Config.in +0 -151

154 lines not on this page · raw message

package/directfb-examples/directfb-examples.mk +0 -93

97 lines not on this page · raw message

Signature · 1 line
2.5.1
#26 lore raw

PATCH v3 14/15 directfb-examples: do not install to staging

In reply to Thomas Petazzoni

DirectFB examples are just examples, there is no reason to install them to the staging directory.

---
 package/directfb-examples/directfb-examples.mk | 1 -
 1 file changed, 1 deletion(-)
package/directfb-examples/directfb-examples.mk +0 -1
index f40a030..ac8e61c 100644
@@ -9,7 +9,6 @@ DIRECTFB_EXAMPLES_SITE = http://www.directfb.org/downloads/Extras
 DIRECTFB_EXAMPLES_SOURCE = DirectFB-examples-$(DIRECTFB_EXAMPLES_VERSION).tar.gz
 DIRECTFB_EXAMPLES_LICENSE = MIT
 DIRECTFB_EXAMPLES_LICENSE_FILES = COPYING
-DIRECTFB_EXAMPLES_INSTALL_STAGING = YES
 DIRECTFB_EXAMPLES_DEPENDENCIES = directfb
 
 ifeq ($(BR2_STATIC_LIBS),y)
Signature · 1 line
2.5.1
#27 lore raw

PATCH v3 15/15 directfb-examples: bump to 1.7.0

In reply to Thomas Petazzoni

This commit bumps the directfb-examples package to use the upstream 1.7.0 version.

---
 package/directfb-examples/directfb-examples.hash | 4 ++--
 package/directfb-examples/directfb-examples.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
package/directfb-examples/directfb-examples.hash +2 -2
index c647fca..9d59cfe 100644
@@ -1,2 +1,2 @@
-# Locally calculated
-sha256	b08293697c211b690856f76a25ad7acd4ca458b4132851e0a1e471d0bf23c821	DirectFB-examples-1.6.0.tar.gz
+# Locally computed
+sha256 9a2104cc4da8123c8371813551b66b943198979f745cbebc034bb5e10844122a DirectFB-examples-1.7.0.tar.gz
package/directfb-examples/directfb-examples.mk +1 -1
index ac8e61c..ee883f7 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DIRECTFB_EXAMPLES_VERSION = 1.6.0
+DIRECTFB_EXAMPLES_VERSION = 1.7.0
 DIRECTFB_EXAMPLES_SITE = http://www.directfb.org/downloads/Extras
 DIRECTFB_EXAMPLES_SOURCE = DirectFB-examples-$(DIRECTFB_EXAMPLES_VERSION).tar.gz
 DIRECTFB_EXAMPLES_LICENSE = MIT
Signature · 1 line
2.5.1
#28 lore raw

v3 cover DirectFB stack bump

In reply to Thomas Petazzoni
Quoted 30 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Hello,
Here is the third version of the DirectFB bump. The previous version was submitted in February by Peter Seiderer, so it's time to move forward on this topic. There are too many changes compared to Peter's version to really list all of them, it's better to think of this series almost as a new one: it combines changes from Peter with changes I had also prepared on my side.

The patch series bumps DirectFB, DirectFB-examples and linux-fusion, but also does a number of related cleanups (remove unused/useless options, simplify the DirectFB-examples package, remove no longer useful packages, etc.).

I did quite a bit of build testing: I built 10 different Buildroot configurations, to test each of the 10 direct reverse dependencies of DirectFB:

- Cairo
- EFL (libevas and libecore)
- GStreamer 0.10 DirectFB bad plugin
- Gstreamer 1.x DirectFB bad plugin
- Links with DirectFB support
- Lite
- Qt4 with DirectFB backend (required a patch)
- Qt5 with DirectFB backend
- SDL with DirectFB backend
- VLC with DirectFB backend

Quoted 1 line

All of them built successfully.

Great, thanks for all the testing. Committed series!

Signature · 1 line
Bye, Peter Korsgaard