[Buildroot] [PATCH 1/2] package/qwt : prepared package for other versions of Qt.

[Buildroot] [PATCH 1/2] package/qwt : prepared package for other versions of Qt.

[David Picard]

Reformatted the package configuration to make it more generic. It will thus be
easier to handle more than one version of Qt. Indeed, multiple versions of Qt
are compatible with the current Qwt. Dropped comment, considered uninformative.

Signed-off-by: David Picard <davepiq@yahoo.fr>
---
 package/qwt/Config.in | 10 +++-------
 package/qwt/qwt.mk    |  5 ++++-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/package/qwt/Config.in b/package/qwt/Config.in
index 8c7bc56..876d465 100644
--- a/package/qwt/Config.in
+++ b/package/qwt/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_QWT
 	bool "qwt"
 	depends on BR2_PACKAGE_QT
-	depends on BR2_PACKAGE_QT_GUI_MODULE
+	select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT
 	help
 	  Qwt is a graphics extension to the Qt GUI application
 	  framework. It provides a 2D plotting widget and more.
@@ -12,7 +12,7 @@ if BR2_PACKAGE_QWT
 
 config BR2_PACKAGE_QWT_SVG
 	bool "SVG support"
-	select BR2_PACKAGE_QT_SVG
+	select BR2_PACKAGE_QT_SVG if BR2_PACKAGE_QT
 
 config BR2_PACKAGE_QWT_MATHML
 	bool "MathML support"
@@ -21,10 +21,6 @@ config BR2_PACKAGE_QWT_OPENGL
 	bool "OpenGL support"
 	depends on BR2_PACKAGE_HAS_LIBGLES
 	depends on BR2_PACKAGE_HAS_LIBEGL
-	select BR2_PACKAGE_QT_OPENGL_ES
+	select BR2_PACKAGE_QT_OPENGL_ES if BR2_PACKAGE_QT
 
 endif
-
-comment "qwt depends on QT gui module"
-	depends on BR2_PACKAGE_QT
-	depends on !BR2_PACKAGE_QT_GUI_MODULE
diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk
index 8a46c25..4d481fb 100644
--- a/package/qwt/qwt.mk
+++ b/package/qwt/qwt.mk
@@ -8,7 +8,10 @@ QWT_VERSION = 6.1.2
 QWT_SOURCE = qwt-$(QWT_VERSION).tar.bz2
 QWT_SITE = http://downloads.sourceforge.net/project/qwt/qwt/$(QWT_VERSION)
 QWT_INSTALL_STAGING = YES
+ifeq ($(BR2_PACKAGE_QT),y)
 QWT_DEPENDENCIES = qt
+QWT_QMAKE = $(QT_QMAKE)
+endif
 
 QWT_LICENSE = LGPLv2.1 with exceptions
 QWT_LICENSE_FILES = COPYING
@@ -37,7 +40,7 @@ endif
 
 define QWT_CONFIGURE_CMDS
 	$(SED) $(QWT_CONFIG) $(@D)/qwtconfig.pri
-	(cd $(@D); $(TARGET_MAKE_ENV) $(QT_QMAKE))
+	(cd $(@D); $(TARGET_MAKE_ENV) $(QWT_QMAKE))
 endef
 
 define QWT_BUILD_CMDS
-- 
1.9.1

[Buildroot] [PATCH 2/2] package/qwt : added support for Qt5.

[David Picard]

This version of Qwt is compatible with both Qt and Qt5. This patch adds the
option to compile it for Qt5.

Signed-off-by: David Picard <davepiq@yahoo.fr>
---
 package/qwt/Config.in | 10 +++++++---
 package/qwt/qwt.mk    |  3 +++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/package/qwt/Config.in b/package/qwt/Config.in
index 876d465..05d5253 100644
--- a/package/qwt/Config.in
+++ b/package/qwt/Config.in
@@ -1,7 +1,9 @@
 config BR2_PACKAGE_QWT
 	bool "qwt"
-	depends on BR2_PACKAGE_QT
+	depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5
 	select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT
+	select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5
+	select BR2_PACKAGE_QT5BASE_CONCURRENT if BR2_PACKAGE_QT5
 	help
 	  Qwt is a graphics extension to the Qt GUI application
 	  framework. It provides a 2D plotting widget and more.
@@ -13,14 +15,16 @@ if BR2_PACKAGE_QWT
 config BR2_PACKAGE_QWT_SVG
 	bool "SVG support"
 	select BR2_PACKAGE_QT_SVG if BR2_PACKAGE_QT
+	select BR2_PACKAGE_QT5SVG if BR2_PACKAGE_QT5
 
 config BR2_PACKAGE_QWT_MATHML
 	bool "MathML support"
 
 config BR2_PACKAGE_QWT_OPENGL
 	bool "OpenGL support"
-	depends on BR2_PACKAGE_HAS_LIBGLES
-	depends on BR2_PACKAGE_HAS_LIBEGL
+	depends on (BR2_PACKAGE_HAS_LIBGLES && BR2_PACKAGE_HAS_LIBEG) || \
+		BR2_PACKAGE_QT5_GL_AVAILABLE
 	select BR2_PACKAGE_QT_OPENGL_ES if BR2_PACKAGE_QT
+	select BR2_PACKAGE_QT5BASE_OPENGL_LIB if BR2_PACKAGE_QT5
 
 endif
diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk
index 4d481fb..594b141 100644
--- a/package/qwt/qwt.mk
+++ b/package/qwt/qwt.mk
@@ -11,6 +11,9 @@ QWT_INSTALL_STAGING = YES
 ifeq ($(BR2_PACKAGE_QT),y)
 QWT_DEPENDENCIES = qt
 QWT_QMAKE = $(QT_QMAKE)
+else ifeq ($(BR2_PACKAGE_QT5),y)
+QWT_DEPENDENCIES += qt5
+QWT_QMAKE = $(QT5_QMAKE)
 endif
 
 QWT_LICENSE = LGPLv2.1 with exceptions
-- 
1.9.1

[Buildroot] [PATCH 2/2] package/qwt : added support for Qt5.

[Thomas Petazzoni]

Hello,

On Thu, 24 Mar 2016 21:19:51 +0100, David Picard wrote:

> +	depends on (BR2_PACKAGE_HAS_LIBGLES && BR2_PACKAGE_HAS_LIBEG) || \
> +		BR2_PACKAGE_QT5_GL_AVAILABLE

I know I told you to use this, but in fact I think a more correct
dependency is:

	(BR2_PACKAGE_HAS_LIBGLES && BR2_PACKAGE_HAS_LIBEGL && BR2_PACKAGE_QT) || \
	(BR2_PACKAGE_QT5_GL_AVAILABLE && BR2_PACKAGE_QT5)

so that we are sure that if we're using Qt, we have the dependencies
that are needed to have OpenGL support in Qt, and if we have Qt5, we
have the dependencies that are needed to have OpenGL support in Qt5.

I've applied after fixing this.

Also, after applying, I noticed there was a typo: BR2_PACKAGE_HAS_LIBEG
in your patch should have been BR2_PACKAGE_HAS_LIBEGL. I've fixed that
up with a following commit, as I only noticed while replying to this
e-mail.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 2/2] package/qwt : added support for Qt5.

[David Picard]

Hello,

OK, thanks for your help and patience. It was very instructive.

Cheers,
David.


Le 25/03/2016 10:51, Thomas Petazzoni a ?crit :
> Hello,
>
> On Thu, 24 Mar 2016 21:19:51 +0100, David Picard wrote:
>
>> +	depends on (BR2_PACKAGE_HAS_LIBGLES && BR2_PACKAGE_HAS_LIBEG) || \
>> +		BR2_PACKAGE_QT5_GL_AVAILABLE
>
> I know I told you to use this, but in fact I think a more correct
> dependency is:
>
> 	(BR2_PACKAGE_HAS_LIBGLES && BR2_PACKAGE_HAS_LIBEGL && BR2_PACKAGE_QT) || \
> 	(BR2_PACKAGE_QT5_GL_AVAILABLE && BR2_PACKAGE_QT5)
>
> so that we are sure that if we're using Qt, we have the dependencies
> that are needed to have OpenGL support in Qt, and if we have Qt5, we
> have the dependencies that are needed to have OpenGL support in Qt5.
>
> I've applied after fixing this.
>
> Also, after applying, I noticed there was a typo: BR2_PACKAGE_HAS_LIBEG
> in your patch should have been BR2_PACKAGE_HAS_LIBEGL. I've fixed that
> up with a following commit, as I only noticed while replying to this
> e-mail.
>
> Thanks!
>
> Thomas
>

[Buildroot] [PATCH 1/2] package/qwt : prepared package for other versions of Qt.

[Thomas Petazzoni]

Hello,

On Thu, 24 Mar 2016 21:19:50 +0100, David Picard wrote:
> Reformatted the package configuration to make it more generic. It will thus be
> easier to handle more than one version of Qt. Indeed, multiple versions of Qt
> are compatible with the current Qwt. Dropped comment, considered uninformative.
> 
> Signed-off-by: David Picard <davepiq@yahoo.fr>
> ---
>  package/qwt/Config.in | 10 +++-------
>  package/qwt/qwt.mk    |  5 ++++-
>  2 files changed, 7 insertions(+), 8 deletions(-)

I've tweaked the commit log to explain a bit more that we are switching
to use "select" rather than "depends on" for the Qt sub-options, and
applied. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 1/2] package/qwt : prepared package for other versions of Qt.

[David Picard]

Hi,

I get an error like :
make[1]: *** no rule to make target "qt5", needed by 
"<BASEDIR>/build/qwt-6.1.2/.stamp_configured". Stopping.

Wouldn't it be because of line 15 in package/qwt/qwt.mk ?
https://git.buildroot.net/buildroot/tree/package/qwt/qwt.mk?id=a976ee0dc834c56e67e1c832ded00ce23b5ccdb0

I changed it from :
QWT_DEPENDENCIES += qt5
to :
QWT_DEPENDENCIES += qt5base
and then I could build on. It seems like "qt5" is not a valid target 
name. By the way, where can you find what are the valid values ?




Le 25/03/2016 10:48, Thomas Petazzoni a ?crit :
> Hello,
>
> On Thu, 24 Mar 2016 21:19:50 +0100, David Picard wrote:
>> Reformatted the package configuration to make it more generic. It will thus be
>> easier to handle more than one version of Qt. Indeed, multiple versions of Qt
>> are compatible with the current Qwt. Dropped comment, considered uninformative.
>>
>> Signed-off-by: David Picard <davepiq@yahoo.fr>
>> ---
>>   package/qwt/Config.in | 10 +++-------
>>   package/qwt/qwt.mk    |  5 ++++-
>>   2 files changed, 7 insertions(+), 8 deletions(-)
>
> I've tweaked the commit log to explain a bit more that we are switching
> to use "select" rather than "depends on" for the Qt sub-options, and
> applied. Thanks!
>
> Thomas
>

[Buildroot] [PATCH 1/2] package/qwt : prepared package for other versions of Qt.

[Thomas Petazzoni]

Hello,

On Fri, 25 Mar 2016 15:46:59 +0100, David Picard wrote:

> I get an error like :
> make[1]: *** no rule to make target "qt5", needed by 
> "<BASEDIR>/build/qwt-6.1.2/.stamp_configured". Stopping.
> 
> Wouldn't it be because of line 15 in package/qwt/qwt.mk ?
> https://git.buildroot.net/buildroot/tree/package/qwt/qwt.mk?id=a976ee0dc834c56e67e1c832ded00ce23b5ccdb0
> 
> I changed it from :
> QWT_DEPENDENCIES += qt5
> to :
> QWT_DEPENDENCIES += qt5base

Correct. Can you send a new patch to fix this?

> and then I could build on. It seems like "qt5" is not a valid target 
> name. By the way, where can you find what are the valid values ?

The possible values are the list of all packages in Buildroot. Whenever
you have a .mk file that calls one of the generic-package,
autotools-package, *-package macro, then there is a make target with
the same name.

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 1/2] package/qwt : prepared package for other versions of Qt.

[David Picard]

Hi,

I saw you merged the patches into the master branch. So should I make a 
new patch based on the current master, or issue a new version of the 2 
previous patches ?

David.

Le 25/03/2016 16:30, Thomas Petazzoni a ?crit :
> Hello,
>
> On Fri, 25 Mar 2016 15:46:59 +0100, David Picard wrote:
>
>> I get an error like :
>> make[1]: *** no rule to make target "qt5", needed by
>> "<BASEDIR>/build/qwt-6.1.2/.stamp_configured". Stopping.
>>
>> Wouldn't it be because of line 15 in package/qwt/qwt.mk ?
>> https://git.buildroot.net/buildroot/tree/package/qwt/qwt.mk?id=a976ee0dc834c56e67e1c832ded00ce23b5ccdb0
>>
>> I changed it from :
>> QWT_DEPENDENCIES += qt5
>> to :
>> QWT_DEPENDENCIES += qt5base
>
> Correct. Can you send a new patch to fix this?
>
>> and then I could build on. It seems like "qt5" is not a valid target
>> name. By the way, where can you find what are the valid values ?
>
> The possible values are the list of all packages in Buildroot. Whenever
> you have a .mk file that calls one of the generic-package,
> autotools-package, *-package macro, then there is a make target with
> the same name.
>
> Best regards,
>
> Thomas
>

[Buildroot] [PATCH 1/2] package/qwt : prepared package for other versions of Qt.

[Arnout Vandecappelle]

On 03/25/16 17:16, David Picard wrote:
> I saw you merged the patches into the master branch. So should I make a new
> patch based on the current master, or issue a new version of the 2 previous
> patches ?

  A new patch based on the master.

  How else could it be applied? If you create a new version of the previous 
patches, the ones that are already committed would have to be reverted first, 
making things unnecessarily complicated.

  Regards,
  Arnout

-- 
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

[Buildroot] [PATCH 1/2] package/qwt : prepared package for other versions of Qt.

[David Picard]

Reformatted the package configuration to make it more generic. It will thus be
easier to handle more than one version of Qt. Indeed, multiple versions of Qt
are compatible with the current Qwt. Dropped comment, considered uninformative.

Signed-off-by: David Picard <davepiq@yahoo.fr>
---
 package/qwt/Config.in | 10 +++-------
 package/qwt/qwt.mk    |  3 +++
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/package/qwt/Config.in b/package/qwt/Config.in
index 8c7bc56..876d465 100644
--- a/package/qwt/Config.in
+++ b/package/qwt/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_QWT
 	bool "qwt"
 	depends on BR2_PACKAGE_QT
-	depends on BR2_PACKAGE_QT_GUI_MODULE
+	select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT
 	help
 	  Qwt is a graphics extension to the Qt GUI application
 	  framework. It provides a 2D plotting widget and more.
@@ -12,7 +12,7 @@ if BR2_PACKAGE_QWT
 
 config BR2_PACKAGE_QWT_SVG
 	bool "SVG support"
-	select BR2_PACKAGE_QT_SVG
+	select BR2_PACKAGE_QT_SVG if BR2_PACKAGE_QT
 
 config BR2_PACKAGE_QWT_MATHML
 	bool "MathML support"
@@ -21,10 +21,6 @@ config BR2_PACKAGE_QWT_OPENGL
 	bool "OpenGL support"
 	depends on BR2_PACKAGE_HAS_LIBGLES
 	depends on BR2_PACKAGE_HAS_LIBEGL
-	select BR2_PACKAGE_QT_OPENGL_ES
+	select BR2_PACKAGE_QT_OPENGL_ES if BR2_PACKAGE_QT
 
 endif
-
-comment "qwt depends on QT gui module"
-	depends on BR2_PACKAGE_QT
-	depends on !BR2_PACKAGE_QT_GUI_MODULE
diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk
index 8a46c25..6c17ae2 100644
--- a/package/qwt/qwt.mk
+++ b/package/qwt/qwt.mk
@@ -8,7 +8,10 @@ QWT_VERSION = 6.1.2
 QWT_SOURCE = qwt-$(QWT_VERSION).tar.bz2
 QWT_SITE = http://downloads.sourceforge.net/project/qwt/qwt/$(QWT_VERSION)
 QWT_INSTALL_STAGING = YES
+ifeq ($(BR2_PACKAGE_QT),y)
 QWT_DEPENDENCIES = qt
+QWT_QMAKE = $(QT_QMAKE)
+endif
 
 QWT_LICENSE = LGPLv2.1 with exceptions
 QWT_LICENSE_FILES = COPYING
-- 
1.9.1

[Buildroot] [PATCH 2/2] package/qwt : added support for Qt5.

[David Picard]

This version of Qwt is compatible with both Qt and Qt5. This patch adds the
option to compile it for Qt5.

Signed-off-by: David Picard <davepiq@yahoo.fr>
---
 package/qwt/Config.in | 10 +++++++---
 package/qwt/qwt.mk    |  3 +++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/package/qwt/Config.in b/package/qwt/Config.in
index 876d465..05d5253 100644
--- a/package/qwt/Config.in
+++ b/package/qwt/Config.in
@@ -1,7 +1,9 @@
 config BR2_PACKAGE_QWT
 	bool "qwt"
-	depends on BR2_PACKAGE_QT
+	depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5
 	select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT
+	select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5
+	select BR2_PACKAGE_QT5BASE_CONCURRENT if BR2_PACKAGE_QT5
 	help
 	  Qwt is a graphics extension to the Qt GUI application
 	  framework. It provides a 2D plotting widget and more.
@@ -13,14 +15,16 @@ if BR2_PACKAGE_QWT
 config BR2_PACKAGE_QWT_SVG
 	bool "SVG support"
 	select BR2_PACKAGE_QT_SVG if BR2_PACKAGE_QT
+	select BR2_PACKAGE_QT5SVG if BR2_PACKAGE_QT5
 
 config BR2_PACKAGE_QWT_MATHML
 	bool "MathML support"
 
 config BR2_PACKAGE_QWT_OPENGL
 	bool "OpenGL support"
-	depends on BR2_PACKAGE_HAS_LIBGLES
-	depends on BR2_PACKAGE_HAS_LIBEGL
+	depends on (BR2_PACKAGE_HAS_LIBGLES && BR2_PACKAGE_HAS_LIBEG) || \
+		BR2_PACKAGE_QT5_GL_AVAILABLE
 	select BR2_PACKAGE_QT_OPENGL_ES if BR2_PACKAGE_QT
+	select BR2_PACKAGE_QT5BASE_OPENGL_LIB if BR2_PACKAGE_QT5
 
 endif
diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk
index 6c17ae2..595f231 100644
--- a/package/qwt/qwt.mk
+++ b/package/qwt/qwt.mk
@@ -11,6 +11,9 @@ QWT_INSTALL_STAGING = YES
 ifeq ($(BR2_PACKAGE_QT),y)
 QWT_DEPENDENCIES = qt
 QWT_QMAKE = $(QT_QMAKE)
+else ifeq ($(BR2_PACKAGE_QT5),y)
+QWT_DEPENDENCIES += qt5
+QWT_QMAKE = $(QT5_QMAKE)
 endif
 
 QWT_LICENSE = LGPLv2.1 with exceptions
-- 
1.9.1

[Buildroot] [PATCH 1/2] package/qwt : prepared package for other versions of Qt.

[David Picard]

Reformatted the package configuration to make it more generic. It will thus be
easier to handle more than one version of Qt. Indeed, multiple versions of Qt
are compatible with the current Qwt.

Signed-off-by: David Picard <davepiq@yahoo.fr>
---
 package/qwt/Config.in |  9 ++++-----
 package/qwt/qwt.mk    | 10 ++++++++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/package/qwt/Config.in b/package/qwt/Config.in
index 8c7bc56..e72db31 100644
--- a/package/qwt/Config.in
+++ b/package/qwt/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_QWT
 	bool "qwt"
 	depends on BR2_PACKAGE_QT
-	depends on BR2_PACKAGE_QT_GUI_MODULE
+	select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT
 	help
 	  Qwt is a graphics extension to the Qt GUI application
 	  framework. It provides a 2D plotting widget and more.
@@ -12,16 +12,15 @@ if BR2_PACKAGE_QWT
 
 config BR2_PACKAGE_QWT_SVG
 	bool "SVG support"
-	select BR2_PACKAGE_QT_SVG
+	select BR2_PACKAGE_QT_SVG if BR2_PACKAGE_QT
 
 config BR2_PACKAGE_QWT_MATHML
 	bool "MathML support"
 
 config BR2_PACKAGE_QWT_OPENGL
 	bool "OpenGL support"
-	depends on BR2_PACKAGE_HAS_LIBGLES
-	depends on BR2_PACKAGE_HAS_LIBEGL
-	select BR2_PACKAGE_QT_OPENGL_ES
+	select BR2_PACKAGE_QT_OPENGL_ES if \
+	    BR2_PACKAGE_QT && BR2_PACKAGE_HAS_LIBGLES && BR2_PACKAGE_HAS_LIBEGL
 
 endif
 
diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk
index 8a46c25..afd0ffb 100644
--- a/package/qwt/qwt.mk
+++ b/package/qwt/qwt.mk
@@ -8,7 +8,9 @@ QWT_VERSION = 6.1.2
 QWT_SOURCE = qwt-$(QWT_VERSION).tar.bz2
 QWT_SITE = http://downloads.sourceforge.net/project/qwt/qwt/$(QWT_VERSION)
 QWT_INSTALL_STAGING = YES
-QWT_DEPENDENCIES = qt
+ifeq ($(BR2_PACKAGE_QT),y)
+QWT_DEPENDENCIES = qt libgles libegl
+endif
 
 QWT_LICENSE = LGPLv2.1 with exceptions
 QWT_LICENSE_FILES = COPYING
@@ -35,9 +37,13 @@ else
 QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtOpenGL.*$$/\# QWT_CONFIG += QwtOpenGL/'
 endif
 
+ifeq ($(BR2_PACKAGE_QT),y)
+    QWT_QMAKE = $(QT_QMAKE)
+endif
+
 define QWT_CONFIGURE_CMDS
 	$(SED) $(QWT_CONFIG) $(@D)/qwtconfig.pri
-	(cd $(@D); $(TARGET_MAKE_ENV) $(QT_QMAKE))
+	(cd $(@D); $(TARGET_MAKE_ENV) $(QWT_QMAKE))
 endef
 
 define QWT_BUILD_CMDS
-- 
1.9.1

[Buildroot] [PATCH 2/2] package/qwt : added support for Qt5.

[David Picard]

This version of Qwt is compatible with both Qt and Qt5. This patch adds the
option to compile it for Qt5.

Signed-off-by: David Picard <davepiq@yahoo.fr>
---
 package/qwt/Config.in | 14 +++++++++-----
 package/qwt/qwt.mk    |  5 +++++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/package/qwt/Config.in b/package/qwt/Config.in
index e72db31..9dca8ed 100644
--- a/package/qwt/Config.in
+++ b/package/qwt/Config.in
@@ -1,7 +1,9 @@
 config BR2_PACKAGE_QWT
 	bool "qwt"
-	depends on BR2_PACKAGE_QT
+	depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5
 	select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT
+	select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5
+	select BR2_PACKAGE_QT5BASE_CONCURRENT if BR2_PACKAGE_QT5
 	help
 	  Qwt is a graphics extension to the Qt GUI application
 	  framework. It provides a 2D plotting widget and more.
@@ -13,6 +15,7 @@ if BR2_PACKAGE_QWT
 config BR2_PACKAGE_QWT_SVG
 	bool "SVG support"
 	select BR2_PACKAGE_QT_SVG if BR2_PACKAGE_QT
+	select BR2_PACKAGE_QT5SVG if BR2_PACKAGE_QT5
 
 config BR2_PACKAGE_QWT_MATHML
 	bool "MathML support"
@@ -20,10 +23,11 @@ config BR2_PACKAGE_QWT_MATHML
 config BR2_PACKAGE_QWT_OPENGL
 	bool "OpenGL support"
 	select BR2_PACKAGE_QT_OPENGL_ES if \
-	    BR2_PACKAGE_QT && BR2_PACKAGE_HAS_LIBGLES && BR2_PACKAGE_HAS_LIBEGL
+		BR2_PACKAGE_QT && BR2_PACKAGE_HAS_LIBGLES && BR2_PACKAGE_HAS_LIBEGL
+	select BR2_PACKAGE_QT5BASE_OPENGL_LIB if \
+		BR2_PACKAGE_QT5BASE && BR2_PACKAGE_QT5_GL_AVAILABLE
 
 endif
 
-comment "qwt depends on QT gui module"
-	depends on BR2_PACKAGE_QT
-	depends on !BR2_PACKAGE_QT_GUI_MODULE
+comment "qwt needs Qt or Qt5"
+	depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5
diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk
index afd0ffb..8fbde32 100644
--- a/package/qwt/qwt.mk
+++ b/package/qwt/qwt.mk
@@ -11,6 +11,9 @@ QWT_INSTALL_STAGING = YES
 ifeq ($(BR2_PACKAGE_QT),y)
 QWT_DEPENDENCIES = qt libgles libegl
 endif
+ifeq ($(BR2_PACKAGE_QT5BASE),y)
+QWT_DEPENDENCIES += qt5base libgles
+endif
 
 QWT_LICENSE = LGPLv2.1 with exceptions
 QWT_LICENSE_FILES = COPYING
@@ -39,6 +42,8 @@ endif
 
 ifeq ($(BR2_PACKAGE_QT),y)
     QWT_QMAKE = $(QT_QMAKE)
+else
+	QWT_QMAKE = $(QT5_QMAKE)
 endif
 
 define QWT_CONFIGURE_CMDS
-- 
1.9.1

[Buildroot] [PATCH 2/2] package/qwt : added support for Qt5.

[Thomas Petazzoni]

Hello,

On Wed, 16 Mar 2016 18:37:05 +0100, David Picard wrote:

> diff --git a/package/qwt/Config.in b/package/qwt/Config.in
> index e72db31..9dca8ed 100644
> --- a/package/qwt/Config.in
> +++ b/package/qwt/Config.in
> @@ -1,7 +1,9 @@
>  config BR2_PACKAGE_QWT
>  	bool "qwt"
> -	depends on BR2_PACKAGE_QT
> +	depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5
>  	select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT
> +	select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5
> +	select BR2_PACKAGE_QT5BASE_CONCURRENT if BR2_PACKAGE_QT5

OK.

>  	help
>  	  Qwt is a graphics extension to the Qt GUI application
>  	  framework. It provides a 2D plotting widget and more.
> @@ -13,6 +15,7 @@ if BR2_PACKAGE_QWT
>  config BR2_PACKAGE_QWT_SVG
>  	bool "SVG support"
>  	select BR2_PACKAGE_QT_SVG if BR2_PACKAGE_QT
> +	select BR2_PACKAGE_QT5SVG if BR2_PACKAGE_QT5

OK.

>  
>  config BR2_PACKAGE_QWT_MATHML
>  	bool "MathML support"
> @@ -20,10 +23,11 @@ config BR2_PACKAGE_QWT_MATHML
>  config BR2_PACKAGE_QWT_OPENGL
>  	bool "OpenGL support"
>  	select BR2_PACKAGE_QT_OPENGL_ES if \
> -	    BR2_PACKAGE_QT && BR2_PACKAGE_HAS_LIBGLES && BR2_PACKAGE_HAS_LIBEGL
> +		BR2_PACKAGE_QT && BR2_PACKAGE_HAS_LIBGLES && BR2_PACKAGE_HAS_LIBEGL
> +	select BR2_PACKAGE_QT5BASE_OPENGL_LIB if \
> +		BR2_PACKAGE_QT5BASE && BR2_PACKAGE_QT5_GL_AVAILABLE

As said for the previous commit, this is also not good. At the end, you
should have:

	depends on (BR2_PACKAGE_HAS_LIBGLES && BR2_PACKAGE_HAS_LIBEGL) || \
		BR2_PACKAGE_QT5_GL_AVAILABLE
	select BR2_PACKAGE_QT_OPENGL_ES if BR2_PACKAGE_QT
	select BR2_PACKAGE_QT5BASE_OPENGL_LIB if BR2_PACKAGE_QT5

> -comment "qwt depends on QT gui module"
> -	depends on BR2_PACKAGE_QT
> -	depends on !BR2_PACKAGE_QT_GUI_MODULE

This comment should have been removed as part of the previous commit,
since in the previous commit, you changed the "depends on
BR2_PACKAGE_QT_GUI_MODULE" into a "select".

> +comment "qwt needs Qt or Qt5"
> +	depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5

To be honest, I am not sure such a comment is needed. I believe it is
completely obvious for the user that a library like Qwt needs Qt.

> diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk
> index afd0ffb..8fbde32 100644
> --- a/package/qwt/qwt.mk
> +++ b/package/qwt/qwt.mk
> @@ -11,6 +11,9 @@ QWT_INSTALL_STAGING = YES
>  ifeq ($(BR2_PACKAGE_QT),y)
>  QWT_DEPENDENCIES = qt libgles libegl
>  endif
> +ifeq ($(BR2_PACKAGE_QT5BASE),y)
> +QWT_DEPENDENCIES += qt5base libgles
> +endif

In fact, now that I think of it, my suggestion in the previous patch to
add a dependency on libgles and libegl is wrong. This is not needed,
since qt/qt5 will already depend on them.

So, you should just have:

ifeq ($(BR2_PACKAGE_QT),y)
QWT_DEPENDENCIES += qt
QWT_QMAKE = $(QT_MAKE)
else ifeq ($(BR2_PACKAGE_QT5),y)
QWT_DEPENDENCIES += qt5
QWT_QMAKE = $(QT5_QMAKE)
endif

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com