* [Buildroot] [PATCH 1/2] qt5 add qmake.conf.in for eglfs
@ 2017-11-08 11:30 Giulio Benetti
2017-11-08 11:30 ` [Buildroot] [PATCH 2/2] add qmake.conf eglfs_mali option Giulio Benetti
2017-11-08 12:22 ` [Buildroot] [PATCH 1/2] qt5 add qmake.conf.in for eglfs Thomas Petazzoni
0 siblings, 2 replies; 4+ messages in thread
From: Giulio Benetti @ 2017-11-08 11:30 UTC (permalink / raw)
To: buildroot
EGLFS_DEVICE_INTEGRATION = eglfs_* doesn't work correctly with previous patch
EGLFS_DEVICE_INTEGRATION = eglfs_viv/eglfs_* must be written before include(../common/linux_device_post.conf)
On first patch, I've moved qmake.conf to qmake.conf.in suggested by Arnout,
tagging EGLFS_DEVICE_INTEGRATION = @EGLFS_DEVICE at .
Then with sed I substitute @EGLFS_DEVICE@ if any eglfs_* are possible,
otherwise I delete that line and the subsequent too.
On second patch, I add support for sunxi-mali and upcoming sunxi-mali-mainline.
In this way they behave the same way of vivante.
Hope I've done everything correctly.
I've had to used sed without $(SED) because of its argument,
to redirect to qmake.conf instead of changing qmake.conf.in.
After copied to qt5base build directory,
I remove qmake.conf to avoid problem with git.
Thanks in advance for any response.
Kind regard to everyone
Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
---
package/qt5/qt5base/{qmake.conf => qmake.conf.in} | 2 ++
package/qt5/qt5base/qt5base.mk | 12 +++++++++---
2 files changed, 11 insertions(+), 3 deletions(-)
rename package/qt5/qt5base/{qmake.conf => qmake.conf.in} (95%)
diff --git a/package/qt5/qt5base/qmake.conf b/package/qt5/qt5base/qmake.conf.in
similarity index 95%
rename from package/qt5/qt5base/qmake.conf
rename to package/qt5/qt5base/qmake.conf.in
index 8b6debe..fb698b9 100644
--- a/package/qt5/qt5base/qmake.conf
+++ b/package/qt5/qt5base/qmake.conf.in
@@ -24,5 +24,7 @@ QMAKE_CFLAGS_ISYSTEM =
# Architecturespecific configuration
include(arch.conf)
+EGLFS_DEVICE_INTEGRATION = @EGLFS_DEVICE@
+
include(../common/linux_device_post.conf)
load(qt_config)
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index b3f9c79..d58a58a 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -243,8 +243,13 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_DBUS) += Qt5DBus
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST)$(BR2_PACKAGE_IMX_GPU_VIV),yy)
# use vivante backend
define QT5BASE_CONFIGURE_QMAKE_CONFIG
- echo "EGLFS_DEVICE_INTEGRATION = eglfs_viv" >> \
- $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf
+ sed 's/@EGLFS_DEVICE@/eglfs_viv/g' $(QT5BASE_PKGDIR)/qmake.conf.in > \
+ $(QT5BASE_PKGDIR)/qmake.conf
+endef
+else
+define QT5BASE_CONFIGURE_QMAKE_CONFIG
+ sed '/@EGLFS_DEVICE@/,+1d' $(QT5BASE_PKGDIR)/qmake.conf.in > \
+ $(QT5BASE_PKGDIR)/qmake.conf
endef
endif
@@ -263,9 +268,10 @@ endef
endif
define QT5BASE_CONFIGURE_CMDS
+ $(QT5BASE_CONFIGURE_QMAKE_CONFIG)
$(INSTALL) -m 0644 -D $(QT5BASE_PKGDIR)/qmake.conf \
$(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf
- $(QT5BASE_CONFIGURE_QMAKE_CONFIG)
+ $(RM) $(QT5BASE_PKGDIR)/qmake.conf
$(INSTALL) -m 0644 -D $(QT5BASE_PKGDIR)/qplatformdefs.h \
$(@D)/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h
$(QT5BASE_CONFIGURE_CONFIG_FILE)
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 2/2] add qmake.conf eglfs_mali option
2017-11-08 11:30 [Buildroot] [PATCH 1/2] qt5 add qmake.conf.in for eglfs Giulio Benetti
@ 2017-11-08 11:30 ` Giulio Benetti
2017-11-08 12:22 ` [Buildroot] [PATCH 1/2] qt5 add qmake.conf.in for eglfs Thomas Petazzoni
1 sibling, 0 replies; 4+ messages in thread
From: Giulio Benetti @ 2017-11-08 11:30 UTC (permalink / raw)
To: buildroot
I didn't know I could annotate the subsequent patches.
Anyway, since eglfs_mali is not supported by EGLFS_DEVICE_INTEGRATION = @EGLFS_DEVICE@
I add it inserting same as vivante,
except I filter both sunxi-mali and upcoming sunxi-mali-mainline,
to maintain compatibility with legacy
Kind regards
Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
---
package/qt5/qt5base/qt5base.mk | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index d58a58a..23f5138 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -240,18 +240,27 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_PRINTSUPPORT) += Qt5PrintSupport
QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_DBUS) += Qt5DBus
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST)$(BR2_PACKAGE_IMX_GPU_VIV),yy)
-# use vivante backend
+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
+ifeq ($(BR2_PACKAGE_IMX_GPU_VIV),y)
+# use eglfs vivante backend
define QT5BASE_CONFIGURE_QMAKE_CONFIG
sed 's/@EGLFS_DEVICE@/eglfs_viv/g' $(QT5BASE_PKGDIR)/qmake.conf.in > \
$(QT5BASE_PKGDIR)/qmake.conf
endef
+else ifeq ($(filter y,$(BR2_PACKAGE_SUNXI_MALI) $(BR2_PACKAGE_SUNXI_MALI_MAINLINE)),y)
+# use eglfs mali backend
+define QT5BASE_CONFIGURE_QMAKE_CONFIG
+ sed 's/@EGLFS_DEVICE@/eglfs_mali/g' $(QT5BASE_PKGDIR)/qmake.conf.in > \
+ $(QT5BASE_PKGDIR)/qmake.conf
+endef
else
+# don't use any eglfs backend
define QT5BASE_CONFIGURE_QMAKE_CONFIG
sed '/@EGLFS_DEVICE@/,+1d' $(QT5BASE_PKGDIR)/qmake.conf.in > \
$(QT5BASE_PKGDIR)/qmake.conf
endef
endif
+endif
ifneq ($(QT5BASE_CONFIG_FILE),)
define QT5BASE_CONFIGURE_CONFIG_FILE
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/2] qt5 add qmake.conf.in for eglfs
2017-11-08 11:30 [Buildroot] [PATCH 1/2] qt5 add qmake.conf.in for eglfs Giulio Benetti
2017-11-08 11:30 ` [Buildroot] [PATCH 2/2] add qmake.conf eglfs_mali option Giulio Benetti
@ 2017-11-08 12:22 ` Thomas Petazzoni
2017-11-08 12:35 ` Giulio Benetti
1 sibling, 1 reply; 4+ messages in thread
From: Thomas Petazzoni @ 2017-11-08 12:22 UTC (permalink / raw)
To: buildroot
Hello,
Thanks for this new iteration. Sorry, but I have a lot of
pedantic/presentation comments, see below :)
On Wed, 8 Nov 2017 12:30:34 +0100, Giulio Benetti wrote:
> EGLFS_DEVICE_INTEGRATION = eglfs_* doesn't work correctly with previous patch
> EGLFS_DEVICE_INTEGRATION = eglfs_viv/eglfs_* must be written before include(../common/linux_device_post.conf)
>
> On first patch, I've moved qmake.conf to qmake.conf.in suggested by Arnout,
> tagging EGLFS_DEVICE_INTEGRATION = @EGLFS_DEVICE at .
> Then with sed I substitute @EGLFS_DEVICE@ if any eglfs_* are possible,
> otherwise I delete that line and the subsequent too.
>
> On second patch, I add support for sunxi-mali and upcoming sunxi-mali-mainline.
> In this way they behave the same way of vivante.
>
> Hope I've done everything correctly.
> I've had to used sed without $(SED) because of its argument,
> to redirect to qmake.conf instead of changing qmake.conf.in.
>
> After copied to qt5base build directory,
> I remove qmake.conf to avoid problem with git.
>
> Thanks in advance for any response.
>
> Kind regard to everyone
A commit log is not an e-mail, it is a text that describes the commit.
So:
- It should not be written at the first person
- It should not contain things like "Thanks in advance", "Kind
regards", etc.
- Also, things like "After copied to qt5base build directory, I remove
qmake.conf to avoid problem with git" sound weird.
- Don't talk about the second patch in the commit log of the first
patch!
Also, since this is a new version of patches you have already sent, it
should be sent as PATCHv2, and have a changelog that details the
changes since the first iteration.
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/2] qt5 add qmake.conf.in for eglfs
2017-11-08 12:22 ` [Buildroot] [PATCH 1/2] qt5 add qmake.conf.in for eglfs Thomas Petazzoni
@ 2017-11-08 12:35 ` Giulio Benetti
0 siblings, 0 replies; 4+ messages in thread
From: Giulio Benetti @ 2017-11-08 12:35 UTC (permalink / raw)
To: buildroot
Thank you Thomas,
I needed these instructions to send patches.
Do you want me to re-submit patchset as you described under?
Thank you very much again for teaching me.
Inviato da iPhone
> Il giorno 08 nov 2017, alle ore 13:22, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> ha scritto:
>
> Hello,
>
> Thanks for this new iteration. Sorry, but I have a lot of
> pedantic/presentation comments, see below :)
>
>> On Wed, 8 Nov 2017 12:30:34 +0100, Giulio Benetti wrote:
>> EGLFS_DEVICE_INTEGRATION = eglfs_* doesn't work correctly with previous patch
>> EGLFS_DEVICE_INTEGRATION = eglfs_viv/eglfs_* must be written before include(../common/linux_device_post.conf)
>>
>> On first patch, I've moved qmake.conf to qmake.conf.in suggested by Arnout,
>> tagging EGLFS_DEVICE_INTEGRATION = @EGLFS_DEVICE at .
>> Then with sed I substitute @EGLFS_DEVICE@ if any eglfs_* are possible,
>> otherwise I delete that line and the subsequent too.
>>
>> On second patch, I add support for sunxi-mali and upcoming sunxi-mali-mainline.
>> In this way they behave the same way of vivante.
>>
>> Hope I've done everything correctly.
>> I've had to used sed without $(SED) because of its argument,
>> to redirect to qmake.conf instead of changing qmake.conf.in.
>>
>> After copied to qt5base build directory,
>> I remove qmake.conf to avoid problem with git.
>>
>> Thanks in advance for any response.
>>
>> Kind regard to everyone
>
> A commit log is not an e-mail, it is a text that describes the commit.
> So:
>
> - It should not be written at the first person
>
> - It should not contain things like "Thanks in advance", "Kind
> regards", etc.
>
> - Also, things like "After copied to qt5base build directory, I remove
> qmake.conf to avoid problem with git" sound weird.
>
> - Don't talk about the second patch in the commit log of the first
> patch!
>
> Also, since this is a new version of patches you have already sent, it
> should be sent as PATCHv2, and have a changelog that details the
> changes since the first iteration.
>
> Best regards,
>
> Thomas
> --
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux and Kernel engineering
> http://free-electrons.com
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-11-08 12:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-08 11:30 [Buildroot] [PATCH 1/2] qt5 add qmake.conf.in for eglfs Giulio Benetti
2017-11-08 11:30 ` [Buildroot] [PATCH 2/2] add qmake.conf eglfs_mali option Giulio Benetti
2017-11-08 12:22 ` [Buildroot] [PATCH 1/2] qt5 add qmake.conf.in for eglfs Thomas Petazzoni
2017-11-08 12:35 ` Giulio Benetti
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.