* [Buildroot] [PATCH v2 1/2] qt5base: use system/buildroot provided freetype
@ 2017-02-13 22:34 Peter Seiderer
2017-02-13 22:34 ` [Buildroot] [PATCH v2 2/2] qt5base: make harfbuzz support selectable Peter Seiderer
2017-02-16 22:18 ` [Buildroot] [PATCH v2 1/2] qt5base: use system/buildroot provided freetype Arnout Vandecappelle
0 siblings, 2 replies; 6+ messages in thread
From: Peter Seiderer @ 2017-02-13 22:34 UTC (permalink / raw)
To: buildroot
Select (and use) builroot provided freetype in case qt5base gui is
selected (gui without freetype/font support makes not much sense
and gives compile errors).
Qt 5.6 needs some support to find the include headers, 5.8 is
clever enough inherently.
Fixes [1] (by avoiding the build-in freetype library which depends
on avtivated libpng support):
Project ERROR: Library 'libpng' is not defined.
make[3]: *** [sub-3rdparty-freetype-make_first] Error 3
[1] http://autobuild.buildroot.net/results/219162ba616289f799a5053c4dcc6b8574284283
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
Changes v1 -> v2:
- updated patch description
- checked and fixed for Qt 5.6
---
package/qt5/qt5base/Config.in | 1 +
package/qt5/qt5base/qt5base.mk | 5 +++++
2 files changed, 6 insertions(+)
diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
index f22e034b3..337dcf245 100644
--- a/package/qt5/qt5base/Config.in
+++ b/package/qt5/qt5base/Config.in
@@ -128,6 +128,7 @@ config BR2_PACKAGE_QT5BASE_XML
config BR2_PACKAGE_QT5BASE_GUI
bool "gui module"
+ select BR2_PACKAGE_FREETYPE
# At least one graphic backend must be enabled, so enable
# linuxfb if nothing is enabled.
select BR2_PACKAGE_QT5BASE_LINUXFB if \
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index 09bf5cf7b..3825f5bcc 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -100,6 +100,11 @@ endif
# We have to use --enable-linuxfb, otherwise Qt thinks that -linuxfb
# is to add a link against the "inuxfb" library.
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_GUI),-gui,-no-gui)
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_GUI),-system-freetype,-no-freetype)
+ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
+QT5BASE_CONFIGURE_OPTS += -I$(STAGING_DIR)/usr/include/freetype2
+endif
+QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_GUI),freetype)
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_WIDGETS),-widgets,-no-widgets)
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_LINUXFB),--enable-linuxfb,-no-linuxfb)
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-directfb)
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v2 2/2] qt5base: make harfbuzz support selectable
2017-02-13 22:34 [Buildroot] [PATCH v2 1/2] qt5base: use system/buildroot provided freetype Peter Seiderer
@ 2017-02-13 22:34 ` Peter Seiderer
2017-02-16 22:14 ` Arnout Vandecappelle
2017-02-16 22:18 ` [Buildroot] [PATCH v2 1/2] qt5base: use system/buildroot provided freetype Arnout Vandecappelle
1 sibling, 1 reply; 6+ messages in thread
From: Peter Seiderer @ 2017-02-13 22:34 UTC (permalink / raw)
To: buildroot
If selected use:
- system/buildroot harfbuzz in case __sync for 4 bytes is supported
- qt harfbuzz otherwise (using QAtomic instead)
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
Changes v1 -> v2:
- make harfbuzz support selectable, preferre the system provided
one, but fall back to qt provided one
---
package/qt5/qt5base/Config.in | 9 +++++++++
package/qt5/qt5base/qt5base.mk | 14 ++++++++++++++
2 files changed, 23 insertions(+)
diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
index 337dcf245..27f225026 100644
--- a/package/qt5/qt5base/Config.in
+++ b/package/qt5/qt5base/Config.in
@@ -239,6 +239,15 @@ config BR2_PACKAGE_QT5BASE_FONTCONFIG
This option enables Fontconfig and Freetype support using
the system fontconfig and freetype2 libraries.
+config BR2_PACKAGE_QT5BASE_HARFBUZZ
+ bool "harfbuzz support"
+ select BR2_PACKAGE_HARFBUZZ if BR2_TOOLCHAIN_HAS_SYNC_4
+ help
+ This option enables HarfBuzz support (either system
+ harfbuzz if the toolchain supports __sync for 4 bytes
+ or qt provided one which avoids this dependenc by using
+ QAtomic).
+
config BR2_PACKAGE_QT5BASE_GIF
bool "GIF support"
help
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index 3825f5bcc..187388e19 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -105,6 +105,20 @@ ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
QT5BASE_CONFIGURE_OPTS += -I$(STAGING_DIR)/usr/include/freetype2
endif
QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_GUI),freetype)
+ifeq ($(BR2_PACKAGE_QT5BASE_GUI)$(BR2_PACKAGE_QT5BASE_HARFBUZZ),yy)
+ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_4),y)
+# system harfbuzz in case __sync for 4 bytes is supported
+QT5BASE_CONFIGURE_OPTS += -system-harfbuzz
+QT5BASE_DEPENDENCIES += harfbuzz
+else
+# qt harfbuzz otherwise (using QAtomic instead)
+QT5BASE_CONFIGURE_OPTS += -qt-harfbuzz
+QT5BASE_LICENSE := $(QT5BASE_LICENSE), MIT (harfbuzz)
+QT5BASE_LICENSE_FILES += src/3rdparty/harfbuzz-ng/COPYING
+endif
+else
+QT5BASE_CONFIGURE_OPTS += -no-harfbuzz
+endif
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_WIDGETS),-widgets,-no-widgets)
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_LINUXFB),--enable-linuxfb,-no-linuxfb)
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-directfb)
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v2 2/2] qt5base: make harfbuzz support selectable
2017-02-13 22:34 ` [Buildroot] [PATCH v2 2/2] qt5base: make harfbuzz support selectable Peter Seiderer
@ 2017-02-16 22:14 ` Arnout Vandecappelle
2017-02-18 11:28 ` Peter Seiderer
0 siblings, 1 reply; 6+ messages in thread
From: Arnout Vandecappelle @ 2017-02-16 22:14 UTC (permalink / raw)
To: buildroot
On 13-02-17 23:34, Peter Seiderer wrote:
> If selected use:
>
> - system/buildroot harfbuzz in case __sync for 4 bytes is supported
> - qt harfbuzz otherwise (using QAtomic instead)
>
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> ---
> Changes v1 -> v2:
> - make harfbuzz support selectable, preferre the system provided
> one, but fall back to qt provided one
> ---
> package/qt5/qt5base/Config.in | 9 +++++++++
> package/qt5/qt5base/qt5base.mk | 14 ++++++++++++++
> 2 files changed, 23 insertions(+)
>
> diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
> index 337dcf245..27f225026 100644
> --- a/package/qt5/qt5base/Config.in
> +++ b/package/qt5/qt5base/Config.in
> @@ -239,6 +239,15 @@ config BR2_PACKAGE_QT5BASE_FONTCONFIG
> This option enables Fontconfig and Freetype support using
> the system fontconfig and freetype2 libraries.
>
> +config BR2_PACKAGE_QT5BASE_HARFBUZZ
> + bool "harfbuzz support"
> + select BR2_PACKAGE_HARFBUZZ if BR2_TOOLCHAIN_HAS_SYNC_4
I think we should automatically use system harfbuzz if it is selected, and only
offer this option if system harfbuzz is not available. So here 'depends on
!SYNC_4'...
> + help
> + This option enables HarfBuzz support (either system
> + harfbuzz if the toolchain supports __sync for 4 bytes
> + or qt provided one which avoids this dependenc by using
> + QAtomic).
> +
> config BR2_PACKAGE_QT5BASE_GIF
> bool "GIF support"
> help
> diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
> index 3825f5bcc..187388e19 100644
> --- a/package/qt5/qt5base/qt5base.mk
> +++ b/package/qt5/qt5base/qt5base.mk
> @@ -105,6 +105,20 @@ ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
> QT5BASE_CONFIGURE_OPTS += -I$(STAGING_DIR)/usr/include/freetype2
> endif
> QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_GUI),freetype)
> +ifeq ($(BR2_PACKAGE_QT5BASE_GUI)$(BR2_PACKAGE_QT5BASE_HARFBUZZ),yy)
> +ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_4),y)
> +# system harfbuzz in case __sync for 4 bytes is supported
... and here 'ifeq ($(BR2_PACKAGE_HARFBUZZ),y) ...
> +QT5BASE_CONFIGURE_OPTS += -system-harfbuzz
> +QT5BASE_DEPENDENCIES += harfbuzz
> +else
... and here 'else ifeq ($(BR2_PACKAGE_QT5BASE_HARFBUZZ),y) ...
> +# qt harfbuzz otherwise (using QAtomic instead)
> +QT5BASE_CONFIGURE_OPTS += -qt-harfbuzz
> +QT5BASE_LICENSE := $(QT5BASE_LICENSE), MIT (harfbuzz)
> +QT5BASE_LICENSE_FILES += src/3rdparty/harfbuzz-ng/COPYING
> +endif
> +else
> +QT5BASE_CONFIGURE_OPTS += -no-harfbuzz
> +endif
Leave an empty line below and above this conditional block.
Also, it would be more logical IMHO to put it close to openssl.
Regards,
Arnout
> QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_WIDGETS),-widgets,-no-widgets)
> QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_LINUXFB),--enable-linuxfb,-no-linuxfb)
> QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-directfb)
>
--
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v2 2/2] qt5base: make harfbuzz support selectable
2017-02-16 22:14 ` Arnout Vandecappelle
@ 2017-02-18 11:28 ` Peter Seiderer
0 siblings, 0 replies; 6+ messages in thread
From: Peter Seiderer @ 2017-02-18 11:28 UTC (permalink / raw)
To: buildroot
Hello Arnout,
On Thu, 16 Feb 2017 23:14:56 +0100, Arnout Vandecappelle <arnout@mind.be> wrote:
>
>
> On 13-02-17 23:34, Peter Seiderer wrote:
> > If selected use:
> >
> > - system/buildroot harfbuzz in case __sync for 4 bytes is supported
> > - qt harfbuzz otherwise (using QAtomic instead)
> >
> > Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> > ---
> > Changes v1 -> v2:
> > - make harfbuzz support selectable, preferre the system provided
> > one, but fall back to qt provided one
> > ---
> > package/qt5/qt5base/Config.in | 9 +++++++++
> > package/qt5/qt5base/qt5base.mk | 14 ++++++++++++++
> > 2 files changed, 23 insertions(+)
> >
> > diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
> > index 337dcf245..27f225026 100644
> > --- a/package/qt5/qt5base/Config.in
> > +++ b/package/qt5/qt5base/Config.in
> > @@ -239,6 +239,15 @@ config BR2_PACKAGE_QT5BASE_FONTCONFIG
> > This option enables Fontconfig and Freetype support using
> > the system fontconfig and freetype2 libraries.
> >
> > +config BR2_PACKAGE_QT5BASE_HARFBUZZ
> > + bool "harfbuzz support"
> > + select BR2_PACKAGE_HARFBUZZ if BR2_TOOLCHAIN_HAS_SYNC_4
>
> I think we should automatically use system harfbuzz if it is selected, and only
> offer this option if system harfbuzz is not available. So here 'depends on
> !SYNC_4'...
I know that is the buildroot style for many options, but my reasoning was that
it is a little complicated logic 'you can enable buildroot harfbuzz but in
case you have toolchain xy this one is not used and there is this special
qt5base config option for you (which is only visible depending on toolchain xy)'.
I think the solution 'do you want HarfBuzz support for qt5base' (and hide the
decision which one is used) is more undertandable...
>
> > + help
> > + This option enables HarfBuzz support (either system
> > + harfbuzz if the toolchain supports __sync for 4 bytes
> > + or qt provided one which avoids this dependenc by using
> > + QAtomic).
> > +
> > config BR2_PACKAGE_QT5BASE_GIF
> > bool "GIF support"
> > help
> > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
> > index 3825f5bcc..187388e19 100644
> > --- a/package/qt5/qt5base/qt5base.mk
> > +++ b/package/qt5/qt5base/qt5base.mk
> > @@ -105,6 +105,20 @@ ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
> > QT5BASE_CONFIGURE_OPTS += -I$(STAGING_DIR)/usr/include/freetype2
> > endif
> > QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_GUI),freetype)
> > +ifeq ($(BR2_PACKAGE_QT5BASE_GUI)$(BR2_PACKAGE_QT5BASE_HARFBUZZ),yy)
> > +ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_4),y)
> > +# system harfbuzz in case __sync for 4 bytes is supported
>
> ... and here 'ifeq ($(BR2_PACKAGE_HARFBUZZ),y) ...
>
> > +QT5BASE_CONFIGURE_OPTS += -system-harfbuzz
> > +QT5BASE_DEPENDENCIES += harfbuzz
> > +else
>
> ... and here 'else ifeq ($(BR2_PACKAGE_QT5BASE_HARFBUZZ),y) ...
>
> > +# qt harfbuzz otherwise (using QAtomic instead)
> > +QT5BASE_CONFIGURE_OPTS += -qt-harfbuzz
> > +QT5BASE_LICENSE := $(QT5BASE_LICENSE), MIT (harfbuzz)
> > +QT5BASE_LICENSE_FILES += src/3rdparty/harfbuzz-ng/COPYING
> > +endif
> > +else
> > +QT5BASE_CONFIGURE_OPTS += -no-harfbuzz
> > +endif
>
> Leave an empty line below and above this conditional block.
Empty lines added...
>
> Also, it would be more logical IMHO to put it close to openssl.
HarfBuzz support makes only sense with GUI selected (no standalone plugin),
it is a configure option of the freeetype support and belongs logically
to the font (and so fontconfig) support....
Regards,
Peter
>
> Regards,
> Arnout
>
> > QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_WIDGETS),-widgets,-no-widgets)
> > QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_LINUXFB),--enable-linuxfb,-no-linuxfb)
> > QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-directfb)
> >
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v2 1/2] qt5base: use system/buildroot provided freetype
2017-02-13 22:34 [Buildroot] [PATCH v2 1/2] qt5base: use system/buildroot provided freetype Peter Seiderer
2017-02-13 22:34 ` [Buildroot] [PATCH v2 2/2] qt5base: make harfbuzz support selectable Peter Seiderer
@ 2017-02-16 22:18 ` Arnout Vandecappelle
2017-02-18 11:18 ` Peter Seiderer
1 sibling, 1 reply; 6+ messages in thread
From: Arnout Vandecappelle @ 2017-02-16 22:18 UTC (permalink / raw)
To: buildroot
On 13-02-17 23:34, Peter Seiderer wrote:
> Select (and use) builroot provided freetype in case qt5base gui is
> selected (gui without freetype/font support makes not much sense
> and gives compile errors).
>
> Qt 5.6 needs some support to find the include headers, 5.8 is
> clever enough inherently.
>
> Fixes [1] (by avoiding the build-in freetype library which depends
> on avtivated libpng support):
^^^^^^^^^activated, I guess?
>
> Project ERROR: Library 'libpng' is not defined.
> make[3]: *** [sub-3rdparty-freetype-make_first] Error 3
>
> [1] http://autobuild.buildroot.net/results/219162ba616289f799a5053c4dcc6b8574284283
>
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> ---
> Changes v1 -> v2:
> - updated patch description
> - checked and fixed for Qt 5.6
> ---
> package/qt5/qt5base/Config.in | 1 +
> package/qt5/qt5base/qt5base.mk | 5 +++++
> 2 files changed, 6 insertions(+)
>
> diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
> index f22e034b3..337dcf245 100644
> --- a/package/qt5/qt5base/Config.in
> +++ b/package/qt5/qt5base/Config.in
> @@ -128,6 +128,7 @@ config BR2_PACKAGE_QT5BASE_XML
>
> config BR2_PACKAGE_QT5BASE_GUI
> bool "gui module"
> + select BR2_PACKAGE_FREETYPE
> # At least one graphic backend must be enabled, so enable
> # linuxfb if nothing is enabled.
> select BR2_PACKAGE_QT5BASE_LINUXFB if \
> diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
> index 09bf5cf7b..3825f5bcc 100644
> --- a/package/qt5/qt5base/qt5base.mk
> +++ b/package/qt5/qt5base/qt5base.mk
> @@ -100,6 +100,11 @@ endif
> # We have to use --enable-linuxfb, otherwise Qt thinks that -linuxfb
> # is to add a link against the "inuxfb" library.
> QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_GUI),-gui,-no-gui)
> +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_GUI),-system-freetype,-no-freetype)
> +ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
This should also only be enabled if BR2_PACKAGE_QT5BASE_GUI is y.
> +QT5BASE_CONFIGURE_OPTS += -I$(STAGING_DIR)/usr/include/freetype2
> +endif
> +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_GUI),freetype)
Since the condition becomes a bit complicated I'd use an ifeq instead of inline
condition.
With those small nits fixed you can add my
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Regards,
Arnout
> QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_WIDGETS),-widgets,-no-widgets)
> QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_LINUXFB),--enable-linuxfb,-no-linuxfb)
> QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-directfb)
>
--
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
^ permalink raw reply [flat|nested] 6+ messages in thread* [Buildroot] [PATCH v2 1/2] qt5base: use system/buildroot provided freetype
2017-02-16 22:18 ` [Buildroot] [PATCH v2 1/2] qt5base: use system/buildroot provided freetype Arnout Vandecappelle
@ 2017-02-18 11:18 ` Peter Seiderer
0 siblings, 0 replies; 6+ messages in thread
From: Peter Seiderer @ 2017-02-18 11:18 UTC (permalink / raw)
To: buildroot
Hello Arnout,
On Thu, 16 Feb 2017 23:18:21 +0100, Arnout Vandecappelle <arnout@mind.be> wrote:
>
>
> On 13-02-17 23:34, Peter Seiderer wrote:
> > Select (and use) builroot provided freetype in case qt5base gui is
> > selected (gui without freetype/font support makes not much sense
> > and gives compile errors).
> >
> > Qt 5.6 needs some support to find the include headers, 5.8 is
> > clever enough inherently.
> >
> > Fixes [1] (by avoiding the build-in freetype library which depends
> > on avtivated libpng support):
> ^^^^^^^^^activated, I guess?
Of course ;-), fixed...
>
> >
> > Project ERROR: Library 'libpng' is not defined.
> > make[3]: *** [sub-3rdparty-freetype-make_first] Error 3
> >
> > [1] http://autobuild.buildroot.net/results/219162ba616289f799a5053c4dcc6b8574284283
> >
> > Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> > ---
> > Changes v1 -> v2:
> > - updated patch description
> > - checked and fixed for Qt 5.6
> > ---
> > package/qt5/qt5base/Config.in | 1 +
> > package/qt5/qt5base/qt5base.mk | 5 +++++
> > 2 files changed, 6 insertions(+)
> >
> > diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
> > index f22e034b3..337dcf245 100644
> > --- a/package/qt5/qt5base/Config.in
> > +++ b/package/qt5/qt5base/Config.in
> > @@ -128,6 +128,7 @@ config BR2_PACKAGE_QT5BASE_XML
> >
> > config BR2_PACKAGE_QT5BASE_GUI
> > bool "gui module"
> > + select BR2_PACKAGE_FREETYPE
> > # At least one graphic backend must be enabled, so enable
> > # linuxfb if nothing is enabled.
> > select BR2_PACKAGE_QT5BASE_LINUXFB if \
> > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
> > index 09bf5cf7b..3825f5bcc 100644
> > --- a/package/qt5/qt5base/qt5base.mk
> > +++ b/package/qt5/qt5base/qt5base.mk
> > @@ -100,6 +100,11 @@ endif
> > # We have to use --enable-linuxfb, otherwise Qt thinks that -linuxfb
> > # is to add a link against the "inuxfb" library.
> > QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_GUI),-gui,-no-gui)
> > +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_GUI),-system-freetype,-no-freetype)
> > +ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
>
> This should also only be enabled if BR2_PACKAGE_QT5BASE_GUI is y.
O.k., fixed...
>
> > +QT5BASE_CONFIGURE_OPTS += -I$(STAGING_DIR)/usr/include/freetype2
> > +endif
> > +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_GUI),freetype)
>
> Since the condition becomes a bit complicated I'd use an ifeq instead of inline
> condition.
O.k., fixed...
Thanks for review.
Regards,
Peter
>
> With those small nits fixed you can add my
> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
>
> Regards,
> Arnout
>
>
> > QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_WIDGETS),-widgets,-no-widgets)
> > QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_LINUXFB),--enable-linuxfb,-no-linuxfb)
> > QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-directfb)
> >
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-02-18 11:28 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-13 22:34 [Buildroot] [PATCH v2 1/2] qt5base: use system/buildroot provided freetype Peter Seiderer
2017-02-13 22:34 ` [Buildroot] [PATCH v2 2/2] qt5base: make harfbuzz support selectable Peter Seiderer
2017-02-16 22:14 ` Arnout Vandecappelle
2017-02-18 11:28 ` Peter Seiderer
2017-02-16 22:18 ` [Buildroot] [PATCH v2 1/2] qt5base: use system/buildroot provided freetype Arnout Vandecappelle
2017-02-18 11:18 ` Peter Seiderer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox