Commit dd595e6e authored by Nicolas Ferre's avatar Nicolas Ferre
Browse files

Merge branch 'fido' of git://github.com/alexandrebelloni/meta-atmel into fido

parents 8599b407 c12027cf
......@@ -12,5 +12,5 @@ LICENSE_PATH += "${LAYERDIR}/licenses"
BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.bbappend' % layer \
for layer in BBFILE_COLLECTIONS.split())}"
BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/images/*.bb' % layer \
BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.bb' % layer \
for layer in BBFILE_COLLECTIONS.split())}"
DESCRIPTION = "Atmel QT home automation demo"
LICENSE = "ATMEL_LLA"
LIC_FILES_CHKSUM = "file://main.cpp;endline=144;md5=f329c5ddb6ba9266deb58683468d316d"
PR = "r1"
DEPENDS = "qt4-embedded"
SRC_URI = "ftp://ftp.linux4sam.org/pub/demo/qtdemo/application-launcher-${PV}.tar.gz"
SRC_URI[md5sum] = "4a1ab26622e8b22459b4e587a140eb33"
SRC_URI[sha256sum] = "e754e248875c4e3b76415514b48ccaaa12ad77a8cd25722ac7582ac5c8c14fb0"
S = "${WORKDIR}/application-launcher-${PV}"
inherit qt4e pkgconfig
PACKAGES = "${PN}-dbg ${PN}"
FILES_${PN}-dbg = " \
/opt/ApplicationLauncher/bin/.debug \
/opt/ApplicationLauncher/bin/.debug/ApplicationLauncher \
/usr/src/debug/* \
"
FILES_${PN} = " \
/opt \
/opt/ApplicationLauncher \
/opt/ApplicationLauncher/bin \
/opt/ApplicationLauncher/resources \
/opt/ApplicationLauncher/qml \
/opt/ApplicationLauncher/bin/ApplicationLauncher \
/opt/ApplicationLauncher/resources/halt.jpg \
/opt/ApplicationLauncher/resources/halt.sh \
/opt/ApplicationLauncher/resources/shadow.png \
/opt/ApplicationLauncher/resources/background.jpg \
/opt/ApplicationLauncher/resources/busy.png \
/opt/ApplicationLauncher/resources/ApplicationLauncher.sh \
/opt/ApplicationLauncher/resources/arrow-left.png \
/opt/ApplicationLauncher/resources/background-1.png \
/opt/ApplicationLauncher/resources/applications_list.xml \
/opt/ApplicationLauncher/resources/arrow-right.png \
/opt/ApplicationLauncher/resources/applications \
/opt/ApplicationLauncher/resources/applications/resources \
/opt/ApplicationLauncher/resources/applications/resources/same-game.png \
/opt/ApplicationLauncher/resources/applications/resources/about-atmel.png \
/opt/ApplicationLauncher/resources/applications/resources/shadow.png \
/opt/ApplicationLauncher/resources/applications/resources/app-4.png \
/opt/ApplicationLauncher/resources/applications/resources/web-browser.png \
/opt/ApplicationLauncher/resources/applications/resources/picture-viewer.png \
/opt/ApplicationLauncher/resources/applications/resources/home-automation.png \
/opt/ApplicationLauncher/resources/applications/resources/busy.png \
/opt/ApplicationLauncher/resources/applications/resources/minehunter-game.png \
/opt/ApplicationLauncher/resources/applications/resources/medical-app.png \
/opt/ApplicationLauncher/resources/applications/resources/about-timesys.png \
/opt/ApplicationLauncher/qml/ApplicationLauncher \
/opt/ApplicationLauncher/qml/ApplicationLauncher/ApplicationDelegate.qml \
/opt/ApplicationLauncher/qml/ApplicationLauncher/Page.qml \
/opt/ApplicationLauncher/qml/ApplicationLauncher/Busy.qml \
/opt/ApplicationLauncher/qml/ApplicationLauncher/main.qml \
/opt/ApplicationLauncher/qml/ApplicationLauncher/RssModel.qml \
"
do_install() {
make INSTALL_ROOT=${D} install
}
DESCRIPTION = "Atmel QT home automation demo"
LICENSE = "ATMEL_LLA"
LIC_FILES_CHKSUM = "file://main.cpp;endline=144;md5=f329c5ddb6ba9266deb58683468d316d"
PR = "r1"
DEPENDS = "qt4-embedded"
SRC_URI = "ftp://ftp.linux4sam.org/pub/demo/qtdemo/application-launcher-${PV}.tar.gz"
SRC_URI[md5sum] = "8f6a9e7753c6f198eb901f6cec11c5d3"
SRC_URI[sha256sum] = "eab548a4a9911a66f786206ce621ef8d855e2ee8be2beda5a5d4fa3ca5a70111"
S = "${WORKDIR}/application-launcher-${PV}"
inherit qt4e pkgconfig
PACKAGES = "${PN}-dbg ${PN}"
FILES_${PN}-dbg = " \
/opt/ApplicationLauncher/bin/.debug \
/opt/ApplicationLauncher/bin/.debug/ApplicationLauncher \
/usr/src/debug/* \
"
FILES_${PN} = " \
/opt \
/opt/ApplicationLauncher \
/opt/ApplicationLauncher/bin \
/opt/ApplicationLauncher/resources \
/opt/ApplicationLauncher/qml \
/opt/ApplicationLauncher/bin/ApplicationLauncher \
/opt/ApplicationLauncher/resources/halt.jpg \
/opt/ApplicationLauncher/resources/halt.sh \
/opt/ApplicationLauncher/resources/shadow.png \
/opt/ApplicationLauncher/resources/background.jpg \
/opt/ApplicationLauncher/resources/busy.png \
/opt/ApplicationLauncher/resources/ApplicationLauncher.sh \
/opt/ApplicationLauncher/resources/arrow-left.png \
/opt/ApplicationLauncher/resources/background-1.png \
/opt/ApplicationLauncher/resources/applications_list.xml \
/opt/ApplicationLauncher/resources/arrow-right.png \
/opt/ApplicationLauncher/resources/applications \
/opt/ApplicationLauncher/resources/applications/resources \
/opt/ApplicationLauncher/resources/applications/resources/same-game.png \
/opt/ApplicationLauncher/resources/applications/resources/about-atmel.png \
/opt/ApplicationLauncher/resources/applications/resources/shadow.png \
/opt/ApplicationLauncher/resources/applications/resources/app-4.png \
/opt/ApplicationLauncher/resources/applications/resources/web-browser.png \
/opt/ApplicationLauncher/resources/applications/resources/picture-viewer.png \
/opt/ApplicationLauncher/resources/applications/resources/home-automation.png \
/opt/ApplicationLauncher/resources/applications/resources/busy.png \
/opt/ApplicationLauncher/resources/applications/resources/minehunter-game.png \
/opt/ApplicationLauncher/resources/applications/resources/medical-app.png \
/opt/ApplicationLauncher/resources/applications/resources/about-timesys.png \
/opt/ApplicationLauncher/qml/ApplicationLauncher \
/opt/ApplicationLauncher/qml/ApplicationLauncher/ApplicationDelegate.qml \
/opt/ApplicationLauncher/qml/ApplicationLauncher/Page.qml \
/opt/ApplicationLauncher/qml/ApplicationLauncher/Busy.qml \
/opt/ApplicationLauncher/qml/ApplicationLauncher/main.qml \
/opt/ApplicationLauncher/qml/ApplicationLauncher/RssModel.qml \
"
do_install() {
make INSTALL_ROOT=${D} install
}
DESCRIPTION = "Atmel QT5 Application Launcher demo"
LICENSE = "ATMEL_LLA"
LIC_FILES_CHKSUM = "file://main.cpp;endline=144;md5=f329c5ddb6ba9266deb58683468d316d"
PR = "r3"
SRC_URI = "ftp://ftp.linux4sam.org/pub/demo/qtdemo/application-launcher-${PV}.tar.gz"
SRC_URI += "file://applicationlauncher_adaptor_screen.patch"
SRC_URI[md5sum] = "1ba89fbe0d2416a2e012581921d8a61a"
SRC_URI[sha256sum] = "0eece411beb8b01323f105fd8f3a8bf1193c455ea1517a233063c14ebae958ee"
S = "${WORKDIR}/application-launcher-${PV}"
DEPENDS = "qtbase qtdeclarative qtwebkit qtquick1"
#RDEPENDS_${PN} = "qtdeclarative-qmlplugins qtdeclarative-plugins"
inherit qmake5
inherit pkgconfig
PACKAGES = "${PN}-dbg ${PN}"
FILES_${PN}-dbg = " \
/opt/ApplicationLauncher/bin/.debug \
/opt/ApplicationLauncher/bin/.debug/ApplicationLauncher \
/usr/src/debug/* \
/opt/ApplicationLauncher/applications/resources/same-game.png \
/opt/ApplicationLauncher/applications/resources/about-atmel.png \
/opt/ApplicationLauncher/applications/resources/web-browser.png \
/opt/ApplicationLauncher/applications/resources/picture-viewer.png \
/opt/ApplicationLauncher/applications/resources/home-automation.png \
/opt/ApplicationLauncher/applications/resources/minehunter-game.png \
/opt/ApplicationLauncher/applications/resources/medical-app.png \
/opt/ApplicationLauncher/applications/resources/about-timesys.png \
"
FILES_${PN} = " \
/opt \
/opt/ApplicationLauncher \
/opt/ApplicationLauncher/applications_list.xml \
"
do_install() {
make INSTALL_ROOT=${D} install
cp ${S}/applications_list.xml ${D}/opt/ApplicationLauncher/
}
From b687f4ede4c620854d940a9f788971b1ae32195c Mon Sep 17 00:00:00 2001
From: Josh Wu <josh.wu@atmel.com>
Date: Fri, 26 Sep 2014 18:12:45 +0800
Subject: [PATCH] qt-apps: applicationlauncher: adapter to the screen's
resolution
If it's 480x272 then launch the small resolution version.
Otherwise launch the general version (800x480).
Signed-off-by: Josh Wu <josh.wu@atmel.com>
---
launch.sh | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/launch.sh b/launch.sh
index 70b6fdb..a477311 100755
--- a/launch.sh
+++ b/launch.sh
@@ -3,4 +3,14 @@
# when eval returns.
eval "$@"
-/opt/ApplicationLauncher/ApplicationLauncher.sh
+
+resolution=`fbset | grep mode | awk -F '"' '{print $2}' | awk -F "-" '{print $1}'`
+
+case "$resolution" in
+ "480x272")
+ /opt/ApplicationLauncher/ApplicationLauncher-small.sh
+ ;;
+ *)
+ /opt/ApplicationLauncher/ApplicationLauncher.sh
+ ;;
+esac
--
1.9.1
From 2d7fe2062a52c9e837548059978d92b39b8e9b74 Mon Sep 17 00:00:00 2001
From: Josh Wu <josh.wu@atmel.com>
Date: Fri, 17 Oct 2014 15:10:02 +0800
Subject: [PATCH] videoplayer: change the resolution to 480x272
For pda4 screen, we need change to resolution 480x272.
Signed-off-by: Josh Wu <josh.wu@atmel.com>
---
main.cpp | 4 ++--
videoplayer.cpp | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/main.cpp b/main.cpp
index 5799eb8..f0fc5d4 100644
--- a/main.cpp
+++ b/main.cpp
@@ -32,8 +32,8 @@
#include <QApplication>
#include <QThread>
-#define LCD_WIDTH 800
-#define LCD_HEIGHT 480
+#define LCD_WIDTH 480
+#define LCD_HEIGHT 272
#define LAYER 1
class GMainLoopThread : public QThread
diff --git a/videoplayer.cpp b/videoplayer.cpp
index 7ed91ad..58aed5a 100644
--- a/videoplayer.cpp
+++ b/videoplayer.cpp
@@ -39,7 +39,7 @@
#if defined PLANA || defined PLANC
#define PIPE "uridecodebin expose-all-streams=false name=" SRC_NAME " \
caps=video/x-h264;audio/x-raw " SRC_NAME ". ! queue ! h264parse ! \
-queue ! g1h264dec ! video/x-raw,width=800,height=480 ! \
+queue ! g1h264dec ! video/x-raw,width=480,height=272 ! \
progressreport silent=true do-query=true update-freq=1 format=time \
name=" PROGRESS_NAME " ! perf name=" PERF_NAME " ! \
g1fbdevsink zero-memcpy=true max-lateness=-1 async=false \
@@ -49,7 +49,7 @@ alsasink async=false enable-last-sample=false"
#else
#define PIPE "uridecodebin expose-all-streams=false name=" SRC_NAME " \
caps=video/x-h264;audio/x-raw " SRC_NAME ". ! queue ! h264parse ! \
-queue ! g1h264dec ! video/x-raw,width=800,height=480 ! \
+queue ! g1h264dec ! video/x-raw,width=480,height=272 ! \
progressreport silent=true do-query=true update-freq=1 format=time \
name=" PROGRESS_NAME " ! perf name=" PERF_NAME " ! \
g1fbdevsink zero-memcpy=true max-lateness=-1 async=false \
--
1.9.1
From a1d5a77dbeee1692ea457ed7525189d25e040478 Mon Sep 17 00:00:00 2001
From: Josh Wu <josh.wu@atmel.com>
Date: Wed, 22 Oct 2014 10:25:02 +0800
Subject: [PATCH] use PLAN_B version
Signed-off-by: Josh Wu <josh.wu@atmel.com>
---
player.pro | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/player.pro b/player.pro
index f407ebf..dd25b84 100644
--- a/player.pro
+++ b/player.pro
@@ -11,7 +11,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = player
TEMPLATE = app
-DEFINES += PLANC
+DEFINES += PLANB
SOURCES += main.cpp\
player.cpp \
--
1.9.1
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment