Commit 2b266815 authored by Pierre Le Magourou's avatar Pierre Le Magourou Committed by Thomas Petazzoni
Browse files

qt5cinex: Add new Qt5CinematicExperience package. 



[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".]

Signed-off-by: default avatarPierre Le Magourou <pierre.lemagourou@openwide.fr>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent b1badd88

package/Config.in

+1 −0
Original line number Diff line number Diff line
@@ -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"

package/qt5cinex/0001-Fix-execution-problem-with-Qt5.3.patch

0 → 100644
+64 −0
Original line number Diff line number Diff line 
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

package/qt5cinex/CinematicExperience-demo

0 → 100755
+2 −0
Original line number Diff line number Diff line 
#!/bin/sh

exec /usr/share/Qt5/CinematicExperience/Qt5_CinematicExperience "$@"

package/qt5cinex/Config.in

0 → 100644
+33 −0
Original line number Diff line number Diff line 
comment "qt5cinex needs an OpenGL-capable backend"

	depends on BR2_PACKAGE_QT5

	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE

	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE



config BR2_PACKAGE_QT5CINEX

	bool "qt5cinex"

	depends on BR2_PACKAGE_QT5

	select BR2_PACKAGE_QT5BASE_NETWORK

	select BR2_PACKAGE_QT5BASE_PNG

	select BR2_PACKAGE_QT5BASE_WIDGETS

	select BR2_PACKAGE_QT5BASE_EGLFS

	select BR2_PACKAGE_QT5GRAPHICALEFFECTS

	depends on BR2_PACKAGE_QT5_GL_AVAILABLE

	# No comment needed for this option, it's an architecture

	# dependency.

	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE

	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 version (aka RPi Edition)"

	help

	  High definition version (1920x1080 resolution) of the

	  application, optimised for Raspberry PI cards. This version

	  can also be run on any platform supported by Qt5.



endif

package/qt5cinex/qt5cinex.hash

0 → 100644
+3 −0
Original line number Diff line number Diff line 
# Locally computed

sha256 0dd602983ced5f7c0cfd5ad0fbfe2b0b7e3c9ff715e4ef23eef818ccc2b6c60b Qt5_CinematicExperience_rpi_1.0.tgz

sha256 0e547e0259667915a24e84ade5efdcd0c553f81786734452c2c8dbce19a19f44 Qt5_CinematicExperience_1.0.tgz