Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] qt5cinex: Add new Qt5CinematicExperience package.
@ 2014-11-04 10:05 pierre.lemagourou at openwide.fr
  2014-12-14 23:02 ` Yann E. MORIN
  0 siblings, 1 reply; 6+ messages in thread
From: pierre.lemagourou at openwide.fr @ 2014-11-04 10:05 UTC (permalink / raw)
  To: buildroot

From: Pierre Le Magourou <pierre.lemagourou@openwide.fr>

Signed-off-by: Pierre Le Magourou <pierre.lemagourou@openwide.fr>
---
v0: Initial commit
 qt5cinex is a package for Qt5 Cinematic Experience demo. This
 application demonstrates the power of Qt5 and few of the new additions
 available in QtQuick 2.0.
---
 package/Config.in                                  |  1 +
 package/qt5cinex/Config.in                         | 26 +++++++++
 ...nex-0001-Fix-execution-problem-with-Qt5.3.patch | 62 ++++++++++++++++++++++
 package/qt5cinex/qt5cinex.hash                     |  8 +++
 package/qt5cinex/qt5cinex.mk                       | 37 +++++++++++++
 5 files changed, 134 insertions(+)
 create mode 100644 package/qt5cinex/Config.in
 create mode 100644 package/qt5cinex/qt5cinex-0001-Fix-execution-problem-with-Qt5.3.patch
 create mode 100644 package/qt5cinex/qt5cinex.hash
 create mode 100644 package/qt5cinex/qt5cinex.mk

diff --git a/package/Config.in b/package/Config.in
index 28cf703..d91860c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -190,6 +190,7 @@ comment "Graphic applications"
 	source "package/gnuplot/Config.in"
 	source "package/jhead/Config.in"
 	source "package/mesa3d-demos/Config.in"
+	source "package/qt5cinex/Config.in"
 	source "package/rrdtool/Config.in"
 
 comment "Graphic libraries"
diff --git a/package/qt5cinex/Config.in b/package/qt5cinex/Config.in
new file mode 100644
index 0000000..4490bcd
--- /dev/null
+++ b/package/qt5cinex/Config.in
@@ -0,0 +1,26 @@
+comment "Qt5 Cinematic Experience needs Qt5 graphical effects"
+	depends on !BR2_PACKAGE_QT5GRAPHICALEFFECTS
+
+config BR2_PACKAGE_QT5CINEX
+	bool "Qt5 Cinematic Experience"
+	depends on BR2_PACKAGE_QT5GRAPHICALEFFECTS
+	select BR2_PACKAGE_QT5BASE_NETWORK
+	select BR2_PACKAGE_QT5BASE_PNG
+	select BR2_PACKAGE_QT5BASE_WIDGETS
+	select BR2_PACKAGE_QT5BASE_EGLFS
+
+	help
+	  UX demo application that shows some graphical features of Qt5.
+	  The name 'Cinematic Experience' reflects how it's possible to build
+	  user interfaces with increased dynamics.
+
+	  http://quitcoding.com/?page=work#cinex
+
+if BR2_PACKAGE_QT5CINEX
+
+config BR2_PACKAGE_QT5CINEX_RPI
+	bool "RaspberryPI Edition"
+	help
+	  High definifition version of the application optimised for Raspberry PI cards.
+
+endif
diff --git a/package/qt5cinex/qt5cinex-0001-Fix-execution-problem-with-Qt5.3.patch b/package/qt5cinex/qt5cinex-0001-Fix-execution-problem-with-Qt5.3.patch
new file mode 100644
index 0000000..48e0c83
--- /dev/null
+++ b/package/qt5cinex/qt5cinex-0001-Fix-execution-problem-with-Qt5.3.patch
@@ -0,0 +1,62 @@
+From 6ecfcf724522fa37a695a4612f4638c2890d29f9 Mon Sep 17 00:00:00 2001
+From: Pierre Le Magourou <pierre.lemagourou@openwide.fr>
+Date: Thu, 23 Oct 2014 17:41:08 +0200
+Subject: [PATCH] Fix execution problem with Qt5.3.
+
+This patch has been inspired from Open Embedded meta-qt5.
+---
+ content/SettingsView.qml | 4 ++--
+ content/Switch.qml       | 8 ++++----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/content/SettingsView.qml b/content/SettingsView.qml
+index 7944803..a0ddcc8 100644
+--- a/content/SettingsView.qml
++++ b/content/SettingsView.qml
+@@ -127,8 +127,8 @@ Item {
+             Switch {
+                 text: "Do you l-o-v-e colors?"
+                 checked: settings.showColors
+-                onText: "Yes"
+-                offText: "No!"
++                textON: "Yes"
++                textOFF: "No!"
+                 onCheckedChanged: {
+                     settings.showColors = checked;
+                 }
+diff --git a/content/Switch.qml b/content/Switch.qml
+index 967c03f..66955fc 100644
+--- a/content/Switch.qml
++++ b/content/Switch.qml
+@@ -6,8 +6,8 @@ Item {
+ 
+     property alias text: textItem.text
+     property bool checked: false
+-    property string onText: "On"
+-    property string offText: "Off"
++    property string textON: "On"
++    property string textOFF: "Off"
+ 
+     QtObject {
+         id: priv
+@@ -120,7 +120,7 @@ Item {
+             color: "#000000"
+             font.pixelSize: 18
+             font.bold: true
+-            text: onText
++            text: textON
+         }
+         Text {
+             anchors.verticalCenter: parent.verticalCenter
+@@ -129,7 +129,7 @@ Item {
+             color: "#ffffff"
+             font.pixelSize: 18
+             font.bold: true
+-            text: offText
++            text: textOFF
+         }
+ 
+         Image {
+-- 
+2.1.1
+
diff --git a/package/qt5cinex/qt5cinex.hash b/package/qt5cinex/qt5cinex.hash
new file mode 100644
index 0000000..e84c31d
--- /dev/null
+++ b/package/qt5cinex/qt5cinex.hash
@@ -0,0 +1,8 @@
+# No upstream hashes for this file.
+sha256 0dd602983ced5f7c0cfd5ad0fbfe2b0b7e3c9ff715e4ef23eef818ccc2b6c60b Qt5_CinematicExperience_rpi_1.0.tgz
+sha1   a68d7c5f133d380f9a8b85cfd617deb6b8cc99e2                         Qt5_CinematicExperience_rpi_1.0.tgz
+md5    935a5db0a6b2a72c67236e72f52be7d1                                 Qt5_CinematicExperience_rpi_1.0.tgz
+
+sha256 0e547e0259667915a24e84ade5efdcd0c553f81786734452c2c8dbce19a19f44 Qt5_CinematicExperience_1.0.tgz
+sha1   8c746a64c458b5c9ff3c6d01f284875d3aa11dcb                         Qt5_CinematicExperience_1.0.tgz
+md5    1c4f9bf5411c985fc5d3dbfc5d826a29                                 Qt5_CinematicExperience_1.0.tgz
diff --git a/package/qt5cinex/qt5cinex.mk b/package/qt5cinex/qt5cinex.mk
new file mode 100644
index 0000000..3bedf9c
--- /dev/null
+++ b/package/qt5cinex/qt5cinex.mk
@@ -0,0 +1,37 @@
+################################################################################
+#
+# qt5cinex
+#
+################################################################################
+
+QT5CINEX_VERSION = 1.0
+QT5CINEX_RPI = ""
+QT5CINEX_SITE = http://quitcoding.com/download/
+
+ifeq ($(BR2_PACKAGE_QT5CINEX_RPI),y)
+	QT5CINEX_RPI = "rpi_"
+endif
+
+QT5CINEX_SOURCE = Qt5_CinematicExperience_$(QT5CINEX_RPI)$(QT5CINEX_VERSION).tgz
+QT5CINEX_DEPENDENCIES = qt5base qt5declarative
+
+QT5CINEX_LICENSE = CC-BY-3.0
+QT5CINEX_LICENSE_FILE = README
+
+define QT5CINEX_CONFIGURE_CMDS
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+endef
+
+define QT5CINEX_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define QT5CINEX_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/Qt5_CinematicExperience \
+	  $(TARGET_DIR)/opt/Qt5_CinematicExperience/Qt5_CinematicExperience
+	$(INSTALL) -D -m 0664 $(@D)/Qt5_CinematicExperience.qml \
+	  $(TARGET_DIR)/opt/Qt5_CinematicExperience/Qt5_CinematicExperience.qml
+	cp -dpfr $(@D)/content $(TARGET_DIR)/opt/Qt5_CinematicExperience/content
+endef
+
+$(eval $(generic-package))
-- 
2.1.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/1] qt5cinex: Add new Qt5CinematicExperience package.
  2014-11-04 10:05 [Buildroot] [PATCH 1/1] qt5cinex: Add new Qt5CinematicExperience package pierre.lemagourou at openwide.fr
@ 2014-12-14 23:02 ` Yann E. MORIN
  2014-12-17  9:37   ` Pierre Le Magourou
  0 siblings, 1 reply; 6+ messages in thread
From: Yann E. MORIN @ 2014-12-14 23:02 UTC (permalink / raw)
  To: buildroot

Pierre, All,

(Thomas, a question for you toward the end.)

On 2014-11-04 11:05 +0100, pierre.lemagourou at openwide.fr spake thusly:
> From: Pierre Le Magourou <pierre.lemagourou@openwide.fr>

Thank you for your contribution. Sorry for the delay in reviewing this
patch; here is my review...

Mostly eye-candy, but I have not done a build-time test so far.

> Signed-off-by: Pierre Le Magourou <pierre.lemagourou@openwide.fr>
> ---
> v0: Initial commit
>  qt5cinex is a package for Qt5 Cinematic Experience demo. This
>  application demonstrates the power of Qt5 and few of the new additions
>  available in QtQuick 2.0.

A changelog for the first submission is not ncessary. But what you wrote
could well have gone either in the commit log itself, or even in the
help entry, especially since that's the introductory sentence on the
upstream website.

> ---
>  package/Config.in                                  |  1 +
>  package/qt5cinex/Config.in                         | 26 +++++++++
>  ...nex-0001-Fix-execution-problem-with-Qt5.3.patch | 62 ++++++++++++++++++++++
>  package/qt5cinex/qt5cinex.hash                     |  8 +++
>  package/qt5cinex/qt5cinex.mk                       | 37 +++++++++++++
>  5 files changed, 134 insertions(+)
>  create mode 100644 package/qt5cinex/Config.in
>  create mode 100644 package/qt5cinex/qt5cinex-0001-Fix-execution-problem-with-Qt5.3.patch
>  create mode 100644 package/qt5cinex/qt5cinex.hash
>  create mode 100644 package/qt5cinex/qt5cinex.mk
> 
> diff --git a/package/Config.in b/package/Config.in
> index 28cf703..d91860c 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -190,6 +190,7 @@ comment "Graphic applications"
>  	source "package/gnuplot/Config.in"
>  	source "package/jhead/Config.in"
>  	source "package/mesa3d-demos/Config.in"
> +	source "package/qt5cinex/Config.in"
>  	source "package/rrdtool/Config.in"
>  
>  comment "Graphic libraries"
> diff --git a/package/qt5cinex/Config.in b/package/qt5cinex/Config.in
> new file mode 100644
> index 0000000..4490bcd
> --- /dev/null
> +++ b/package/qt5cinex/Config.in
> @@ -0,0 +1,26 @@
> +comment "Qt5 Cinematic Experience needs Qt5 graphical effects"
> +	depends on !BR2_PACKAGE_QT5GRAPHICALEFFECTS
> +
> +config BR2_PACKAGE_QT5CINEX
> +	bool "Qt5 Cinematic Experience"
> +	depends on BR2_PACKAGE_QT5GRAPHICALEFFECTS
> +	select BR2_PACKAGE_QT5BASE_NETWORK
> +	select BR2_PACKAGE_QT5BASE_PNG
> +	select BR2_PACKAGE_QT5BASE_WIDGETS
> +	select BR2_PACKAGE_QT5BASE_EGLFS

You need to propagate the dependencies of EGLFS, like so:

    depends on BR2_PACKAGE_HAS_LIBEGL # eglfs
    depends on BR2_PACKAGE_QT5_GL_AVAILABLE # eglfs

> +

No empty line.

> +	help
> +	  UX demo application that shows some graphical features of Qt5.
> +	  The name 'Cinematic Experience' reflects how it's possible to build
> +	  user interfaces with increased dynamics.
> +
> +	  http://quitcoding.com/?page=work#cinex

As said above, we like to replicate whatever first few sentences are on
the upstream website, so you could just replicate it here, like so:

    help
      This application demonstrates the power of Qt5 and few of the new
      additions available in QtQuick 2.0.

      http://quitcoding.com/?page=work#cinex

> +if BR2_PACKAGE_QT5CINEX
> +
> +config BR2_PACKAGE_QT5CINEX_RPI
> +	bool "RaspberryPI Edition"

This should at least "depends on BR2_arm".

Also, does it use either or both of rpi-userland or rpi-firmware at
build time or at runtime?

If so, you should add proper dependencies, for example:

- if build or runtime dependency, add in Config.in:
    config BR2_PACKAGE_QT5CINEX_RPI
        bool "RaspberryPI Edition"
        depends on BR2_PACKAGE_RPI_USERLAND

- if runtime dependency, add in qt5cinex.mk:
    QT5CINEX_RPI_DEPENDENCIES += rpi-userland

(but that's just an example.)

> +	help
> +	  High definifition version of the application optimised for Raspberry PI cards.

Keep lines below ~72 chars.

> +endif
> diff --git a/package/qt5cinex/qt5cinex-0001-Fix-execution-problem-with-Qt5.3.patch b/package/qt5cinex/qt5cinex-0001-Fix-execution-problem-with-Qt5.3.patch
> new file mode 100644
> index 0000000..48e0c83
> --- /dev/null
> +++ b/package/qt5cinex/qt5cinex-0001-Fix-execution-problem-with-Qt5.3.patch

Not your fault, but we now mandate patches to be named like git patches,
i.e.: 0001-Fix-execution-problem-with-Qt5.3.patch        

> @@ -0,0 +1,62 @@
> +From 6ecfcf724522fa37a695a4612f4638c2890d29f9 Mon Sep 17 00:00:00 2001
> +From: Pierre Le Magourou <pierre.lemagourou@openwide.fr>
> +Date: Thu, 23 Oct 2014 17:41:08 +0200
> +Subject: [PATCH] Fix execution problem with Qt5.3.
> +
> +This patch has been inspired from Open Embedded meta-qt5.

You should also SoB your patches.

[--SNIP--]
> diff --git a/package/qt5cinex/qt5cinex.hash b/package/qt5cinex/qt5cinex.hash
> new file mode 100644
> index 0000000..e84c31d
> --- /dev/null
> +++ b/package/qt5cinex/qt5cinex.hash
> @@ -0,0 +1,8 @@
> +# No upstream hashes for this file.
> +sha256 0dd602983ced5f7c0cfd5ad0fbfe2b0b7e3c9ff715e4ef23eef818ccc2b6c60b Qt5_CinematicExperience_rpi_1.0.tgz
> +sha1   a68d7c5f133d380f9a8b85cfd617deb6b8cc99e2                         Qt5_CinematicExperience_rpi_1.0.tgz
> +md5    935a5db0a6b2a72c67236e72f52be7d1                                 Qt5_CinematicExperience_rpi_1.0.tgz
> +
> +sha256 0e547e0259667915a24e84ade5efdcd0c553f81786734452c2c8dbce19a19f44 Qt5_CinematicExperience_1.0.tgz
> +sha1   8c746a64c458b5c9ff3c6d01f284875d3aa11dcb                         Qt5_CinematicExperience_1.0.tgz
> +md5    1c4f9bf5411c985fc5d3dbfc5d826a29                                 Qt5_CinematicExperience_1.0.tgz

So, does the comment "No upstream hashes for this file." applies to both
editions, or just the RPi one? The fact that the lines are spearated
seem to imply it's only for the RPi, but upstream really has no hash for
either that I could find. Can you reword this so it is obvious the
comment applies to both, please?

> diff --git a/package/qt5cinex/qt5cinex.mk b/package/qt5cinex/qt5cinex.mk
> new file mode 100644
> index 0000000..3bedf9c
> --- /dev/null
> +++ b/package/qt5cinex/qt5cinex.mk
> @@ -0,0 +1,37 @@
> +################################################################################
> +#
> +# qt5cinex
> +#
> +################################################################################
> +
> +QT5CINEX_VERSION = 1.0
> +QT5CINEX_RPI = ""

No need to initialise to empty, that's the default.

> +QT5CINEX_SITE = http://quitcoding.com/download/
> +
> +ifeq ($(BR2_PACKAGE_QT5CINEX_RPI),y)
> +	QT5CINEX_RPI = "rpi_"

No indentation.

> +endif
> +
> +QT5CINEX_SOURCE = Qt5_CinematicExperience_$(QT5CINEX_RPI)$(QT5CINEX_VERSION).tgz
> +QT5CINEX_DEPENDENCIES = qt5base qt5declarative
> +
> +QT5CINEX_LICENSE = CC-BY-3.0
> +QT5CINEX_LICENSE_FILE = README
> +
> +define QT5CINEX_CONFIGURE_CMDS
> +	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)

No need for putting the command between parenthesis.
Note: indentation here is OK.)

> +endef
> +
> +define QT5CINEX_BUILD_CMDS
> +	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
> +endef
> +
> +define QT5CINEX_INSTALL_TARGET_CMDS
> +	$(INSTALL) -D -m 0755 $(@D)/Qt5_CinematicExperience \
> +	  $(TARGET_DIR)/opt/Qt5_CinematicExperience/Qt5_CinematicExperience

We install nothing in /opt. Just install executables in /usr/bin.

> +	$(INSTALL) -D -m 0664 $(@D)/Qt5_CinematicExperience.qml \
> +	  $(TARGET_DIR)/opt/Qt5_CinematicExperience/Qt5_CinematicExperience.qml
> +	cp -dpfr $(@D)/content $(TARGET_DIR)/opt/Qt5_CinematicExperience/content

Well, I'm no Qt guy, but from the above I guess the content/ dir and
the qml file have to be in the same place as the excutable, right?

If so, I would suggest you install all them (content, qml and
executable) somewhere in /usr/share/Qt5/Qt5Cinex  (use your imagination
to find a better name if you can think of one ;-) ), and add a small
script in /usr/bin/qt5cinex-demo (ditto for the name) whith just his:

    #!/bin/sh
    exec /usr/share/Qt5/Qt5Cinex/Qt5_CinematicExperience "$@"

(and chnod it 755. of course.)

But hold on before doing it, I'd like another Qt guy some feedback on
this. Thomas?

Regards,
Yann E. MORIN.

> +endef
> +
> +$(eval $(generic-package))
> -- 
> 2.1.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/1] qt5cinex: Add new Qt5CinematicExperience package.
  2014-12-14 23:02 ` Yann E. MORIN
@ 2014-12-17  9:37   ` Pierre Le Magourou
  2014-12-17 18:12     ` Yann E. MORIN
  0 siblings, 1 reply; 6+ messages in thread
From: Pierre Le Magourou @ 2014-12-17  9:37 UTC (permalink / raw)
  To: buildroot

Yann,

> Thank you for your contribution. Sorry for the delay in reviewing this
> patch; here is my review...
> 

I have modified my patch taking into account what you said in your
review. I will send a new patch once I received feedback concerning
where to put the Qt binary file, but I have to clarify something
concerning arm dependency before.

[--SNIP--]

>> +if BR2_PACKAGE_QT5CINEX
>> +
>> +config BR2_PACKAGE_QT5CINEX_RPI
>> +	bool "RaspberryPI Edition"
> 
> This should at least "depends on BR2_arm".

The name of the upstream software is confusing here, it is called
"RaspberryPI edition" but it can also be run on any other platform
that have Qt5 installed. I run it on my laptop without any problem.
So I would say that this package does not need to depend on BR2_arm.

I decided to modify the name of this option to "High Definition
Edition" instead because the difference with the first option is
mainly the 1920x1080 resolution.

> 
> Also, does it use either or both of rpi-userland or rpi-firmware at
> build time or at runtime?

In my understanding, this application is platform independent. It
only needs a functional Qt5 framework installed with
QT5GRAPHICALEFFECTS and does not use rpi-firmware nor rpi-userland.

The dependency to rpi-userland comes from the Qt5GraphicalEffect
package that needs BR2_PACKAGE_QT5_GL_AVAILABLE that will ask for
rpi-userland package to provide GLESv2 on RaspberryPi platform.

> 
> If so, you should add proper dependencies, for example:
> 
> - if build or runtime dependency, add in Config.in:
>     config BR2_PACKAGE_QT5CINEX_RPI
>         bool "RaspberryPI Edition"
>         depends on BR2_PACKAGE_RPI_USERLAND
> 
> - if runtime dependency, add in qt5cinex.mk:
>     QT5CINEX_RPI_DEPENDENCIES += rpi-userland
> 
> (but that's just an example.)
> 

Regards.

-- 
Pierre Le Magourou

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/1] qt5cinex: Add new Qt5CinematicExperience package.
  2014-12-17  9:37   ` Pierre Le Magourou
@ 2014-12-17 18:12     ` Yann E. MORIN
  0 siblings, 0 replies; 6+ messages in thread
From: Yann E. MORIN @ 2014-12-17 18:12 UTC (permalink / raw)
  To: buildroot

Pierre, All,

On 2014-12-17 10:37 +0100, Pierre Le Magourou spake thusly:
[--SNIP--]
> >> +if BR2_PACKAGE_QT5CINEX
> >> +
> >> +config BR2_PACKAGE_QT5CINEX_RPI
> >> +	bool "RaspberryPI Edition"
> > 
> > This should at least "depends on BR2_arm".
> 
> The name of the upstream software is confusing here, it is called
> "RaspberryPI edition" but it can also be run on any other platform
> that have Qt5 installed. I run it on my laptop without any problem.
> So I would say that this package does not need to depend on BR2_arm.
> 
> I decided to modify the name of this option to "High Definition
> Edition" instead because the difference with the first option is
> mainly the 1920x1080 resolution.

Ah yes, in this case, it makes sense to rename the option and chage the
prompt. But still keep it somewhat aligned to what upstream names it,
maybe something like:

    prompt BR2_PACKAGE_QT5CINEX_HD
        bool "high-definition support (aka RPi Edition)"
        help
          Some blabla about what you explained above. ;-)

> > Also, does it use either or both of rpi-userland or rpi-firmware at
> > build time or at runtime?
> 
> In my understanding, this application is platform independent. It
> only needs a functional Qt5 framework installed with
> QT5GRAPHICALEFFECTS and does not use rpi-firmware nor rpi-userland.
> 
> The dependency to rpi-userland comes from the Qt5GraphicalEffect
> package that needs BR2_PACKAGE_QT5_GL_AVAILABLE that will ask for
> rpi-userland package to provide GLESv2 on RaspberryPi platform.

Indeed, with what you explained, rpi-userland or rpi-firmware is an
indirect dependency, only true when the target in indeed an RPi, but for
other platforms, it could well be another GL provider.

Thank you for the explanations, be sure to include them in some form or
another in the next iteration of the patch.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/1] qt5cinex: Add new Qt5CinematicExperience package.
@ 2015-01-07 14:22 pierre.lemagourou at openwide.fr
  2015-01-07 20:39 ` Thomas Petazzoni
  0 siblings, 1 reply; 6+ messages in thread
From: pierre.lemagourou at openwide.fr @ 2015-01-07 14:22 UTC (permalink / raw)
  To: buildroot

From: Pierre Le Magourou <pierre.lemagourou@openwide.fr>

Signed-off-by: Pierre Le Magourou <pierre.lemagourou@openwide.fr>
---
v1: added suggestions by Yann E. Morin <yann.morin.1998@free.fr>.

Despite the name (RPi Edition), the HD option of this package is not
Raspberry Pi specific. It can be run on any platform that supports Qt5
with QT5GRAPHICALEFFECTS (Qt5 graphicaleffects module provides GL
stuff).

I have also added a /usr/bin/CinematicExperience-demo script that
calls the Qt5_CinematicExperience binary in
/usr/share/Qt5/CinematicExperience/ because some qml files needed to
be in a sub-directory of the binary file location and I didn' t want to
put this in /usr/bin/.

Signed-off-by: Pierre Le Magourou <pierre.lemagourou@openwide.fr>
---
 package/Config.in                                  |  1 +
 .../0001-Fix-execution-problem-with-Qt5.3.patch    | 64 ++++++++++++++++++++++
 package/qt5cinex/CinematicExperience-demo          |  2 +
 package/qt5cinex/Config.in                         | 28 ++++++++++
 package/qt5cinex/qt5cinex.hash                     |  9 +++
 package/qt5cinex/qt5cinex.mk                       | 38 +++++++++++++
 6 files changed, 142 insertions(+)
 create mode 100644 package/qt5cinex/0001-Fix-execution-problem-with-Qt5.3.patch
 create mode 100755 package/qt5cinex/CinematicExperience-demo
 create mode 100644 package/qt5cinex/Config.in
 create mode 100644 package/qt5cinex/qt5cinex.hash
 create mode 100644 package/qt5cinex/qt5cinex.mk

diff --git a/package/Config.in b/package/Config.in
index 8d91b04..cab8f2f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -193,6 +193,7 @@ comment "Graphic applications"
 	source "package/gnuplot/Config.in"
 	source "package/jhead/Config.in"
 	source "package/mesa3d-demos/Config.in"
+	source "package/qt5cinex/Config.in"
 	source "package/rrdtool/Config.in"
 
 comment "Graphic libraries"
diff --git a/package/qt5cinex/0001-Fix-execution-problem-with-Qt5.3.patch b/package/qt5cinex/0001-Fix-execution-problem-with-Qt5.3.patch
new file mode 100644
index 0000000..ceae8cc
--- /dev/null
+++ b/package/qt5cinex/0001-Fix-execution-problem-with-Qt5.3.patch
@@ -0,0 +1,64 @@
+From 9b045ee7988daf3bb4c7cbe1ed1b9d744820e82b Mon Sep 17 00:00:00 2001
+From: Pierre Le Magourou <pierre.lemagourou@openwide.fr>
+Date: Mon, 15 Dec 2014 11:54:51 +0100
+Subject: [PATCH] Fix execution problem with Qt5.3.
+
+This patch has been inspired from Open Embedded meta-qt5.
+
+Signed-off-by: Pierre Le Magourou <pierre.lemagourou@openwide.fr>
+---
+ content/SettingsView.qml | 4 ++--
+ content/Switch.qml       | 8 ++++----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/content/SettingsView.qml b/content/SettingsView.qml
+index 7944803..a0ddcc8 100644
+--- a/content/SettingsView.qml
++++ b/content/SettingsView.qml
+@@ -127,8 +127,8 @@ Item {
+             Switch {
+                 text: "Do you l-o-v-e colors?"
+                 checked: settings.showColors
+-                onText: "Yes"
+-                offText: "No!"
++                textON: "Yes"
++                textOFF: "No!"
+                 onCheckedChanged: {
+                     settings.showColors = checked;
+                 }
+diff --git a/content/Switch.qml b/content/Switch.qml
+index 967c03f..66955fc 100644
+--- a/content/Switch.qml
++++ b/content/Switch.qml
+@@ -6,8 +6,8 @@ Item {
+ 
+     property alias text: textItem.text
+     property bool checked: false
+-    property string onText: "On"
+-    property string offText: "Off"
++    property string textON: "On"
++    property string textOFF: "Off"
+ 
+     QtObject {
+         id: priv
+@@ -120,7 +120,7 @@ Item {
+             color: "#000000"
+             font.pixelSize: 18
+             font.bold: true
+-            text: onText
++            text: textON
+         }
+         Text {
+             anchors.verticalCenter: parent.verticalCenter
+@@ -129,7 +129,7 @@ Item {
+             color: "#ffffff"
+             font.pixelSize: 18
+             font.bold: true
+-            text: offText
++            text: textOFF
+         }
+ 
+         Image {
+-- 
+2.1.3
+
diff --git a/package/qt5cinex/CinematicExperience-demo b/package/qt5cinex/CinematicExperience-demo
new file mode 100755
index 0000000..919958f
--- /dev/null
+++ b/package/qt5cinex/CinematicExperience-demo
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/share/Qt5/CinematicExperience/Qt5_CinematicExperience "$@"
diff --git a/package/qt5cinex/Config.in b/package/qt5cinex/Config.in
new file mode 100644
index 0000000..c6a4f38
--- /dev/null
+++ b/package/qt5cinex/Config.in
@@ -0,0 +1,28 @@
+comment "Qt5 Cinematic Experience needs Qt5 graphical effects"
+	depends on !BR2_PACKAGE_QT5GRAPHICALEFFECTS
+
+config BR2_PACKAGE_QT5CINEX
+	bool "Qt5 Cinematic Experience"
+	depends on BR2_PACKAGE_QT5GRAPHICALEFFECTS
+	select BR2_PACKAGE_QT5BASE_NETWORK
+	select BR2_PACKAGE_QT5BASE_PNG
+	select BR2_PACKAGE_QT5BASE_WIDGETS
+	select BR2_PACKAGE_QT5BASE_EGLFS
+	depends on BR2_PACKAGE_HAS_LIBEGL # eglfs
+	depends on BR2_PACKAGE_QT5_GL_AVAILABLE # eglfs
+	help
+	  This application demonstrates the power of Qt5 and few of the new
+	  additions available in QtQuick 2.0.
+
+	  http://quitcoding.com/?page=work#cinex
+
+if BR2_PACKAGE_QT5CINEX
+
+config BR2_PACKAGE_QT5CINEX_HD
+	bool "High-definition support (aka RPi Edition)"
+	help
+	  High definifition version (1920x1080 resolution) of the
+	  application, optimised for Raspberry PI cards. This version can
+	  also be run on any platform supported by Qt5.
+
+endif
diff --git a/package/qt5cinex/qt5cinex.hash b/package/qt5cinex/qt5cinex.hash
new file mode 100644
index 0000000..aec4b70
--- /dev/null
+++ b/package/qt5cinex/qt5cinex.hash
@@ -0,0 +1,9 @@
+# No upstream hashes for this file.
+sha256 0dd602983ced5f7c0cfd5ad0fbfe2b0b7e3c9ff715e4ef23eef818ccc2b6c60b Qt5_CinematicExperience_rpi_1.0.tgz
+sha1   a68d7c5f133d380f9a8b85cfd617deb6b8cc99e2                         Qt5_CinematicExperience_rpi_1.0.tgz
+md5    935a5db0a6b2a72c67236e72f52be7d1                                 Qt5_CinematicExperience_rpi_1.0.tgz
+
+# No upstream hashes for this file.
+sha256 0e547e0259667915a24e84ade5efdcd0c553f81786734452c2c8dbce19a19f44 Qt5_CinematicExperience_1.0.tgz
+sha1   8c746a64c458b5c9ff3c6d01f284875d3aa11dcb                         Qt5_CinematicExperience_1.0.tgz
+md5    1c4f9bf5411c985fc5d3dbfc5d826a29                                 Qt5_CinematicExperience_1.0.tgz
diff --git a/package/qt5cinex/qt5cinex.mk b/package/qt5cinex/qt5cinex.mk
new file mode 100644
index 0000000..031a673
--- /dev/null
+++ b/package/qt5cinex/qt5cinex.mk
@@ -0,0 +1,38 @@
+################################################################################
+#
+# qt5cinex
+#
+################################################################################
+
+QT5CINEX_VERSION = 1.0
+QT5CINEX_SITE = http://quitcoding.com/download/
+
+ifeq ($(BR2_PACKAGE_QT5CINEX_HD),y)
+QT5CINEX_HD = "rpi_"
+endif
+
+QT5CINEX_SOURCE = Qt5_CinematicExperience_$(QT5CINEX_HD)$(QT5CINEX_VERSION).tgz
+QT5CINEX_DEPENDENCIES = qt5base qt5declarative
+
+QT5CINEX_LICENSE = CC-BY-3.0
+QT5CINEX_LICENSE_FILE = README
+
+define QT5CINEX_CONFIGURE_CMDS
+	cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake
+endef
+
+define QT5CINEX_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define QT5CINEX_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/Qt5_CinematicExperience \
+	  $(TARGET_DIR)/usr/share/Qt5/CinematicExperience/Qt5_CinematicExperience
+	$(INSTALL) -D -m 0664 $(@D)/Qt5_CinematicExperience.qml \
+	  $(TARGET_DIR)/usr/share/Qt5/CinematicExperience/Qt5_CinematicExperience.qml
+	cp -dpfr $(@D)/content $(TARGET_DIR)/usr/share/Qt5/CinematicExperience/content
+	$(INSTALL) -m 0755 -D package/qt5cinex/CinematicExperience-demo \
+	  $(TARGET_DIR)/usr/bin/CinematicExperience-demo
+endef
+
+$(eval $(generic-package))
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/1] qt5cinex: Add new Qt5CinematicExperience package.
  2015-01-07 14:22 pierre.lemagourou at openwide.fr
@ 2015-01-07 20:39 ` Thomas Petazzoni
  0 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2015-01-07 20:39 UTC (permalink / raw)
  To: buildroot

Hello,

On Wed,  7 Jan 2015 15:22:21 +0100, pierre.lemagourou at openwide.fr wrote:
> From: Pierre Le Magourou <pierre.lemagourou@openwide.fr>
> 
> Signed-off-by: Pierre Le Magourou <pierre.lemagourou@openwide.fr>

Thanks, applied, after doing a number of additional changes:

    [Thomas:
     - Change the dependency logic in the Config.in file. We don't want to
       have a 'depends on BR2_PACKAGE_QT5GRAPHICALEFFECTS': it should be
       selected automatically. Instead, let's have a dependency on Qt5 and
       OpenGL, and select everything else automatically. A comment is
       added, shown only when Qt5 is available, on the right platforms
       (which have JSCore support), to explain that we need an OpenGL
       backend.
     - Change the prompt of the package to be qt5cinex, to match the
       package name.
     - Replace "High-definition support" by "High-definition version".
     - Fix a typo in the Config.in help text: definifition -> definition.
     - Add a comment in the .mk file explaining why we install a wrapper
       shell script (explanation taken from Pierre's e-mail).
     - Fix indentation in the install target commands.
     - Keep only sha256 hashes, those are sufficient. Replace the comment
       in the hash file by the more traditional "Locally computed".]

If you could test the latest Buildroot master (which has your patch
applied) and check that everything works fine, it would be great.

Thanks,

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

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-01-07 20:39 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-04 10:05 [Buildroot] [PATCH 1/1] qt5cinex: Add new Qt5CinematicExperience package pierre.lemagourou at openwide.fr
2014-12-14 23:02 ` Yann E. MORIN
2014-12-17  9:37   ` Pierre Le Magourou
2014-12-17 18:12     ` Yann E. MORIN
  -- strict thread matches above, loose matches on Subject: below --
2015-01-07 14:22 pierre.lemagourou at openwide.fr
2015-01-07 20:39 ` Thomas Petazzoni

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox