From 8d4656a978b22a35811d25a4db52204b53ef164d Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 17 Sep 2014 20:07:03 +0200 Subject: [PATCH] qt4: integrate deprecated fsl-gui-extrafiles package This package was used in 'meta-fsl-demos' layer, but was deprecated and removed. It includes desktop launchers for QT4 demo/example apps. We still show those demo apps, so integrate the launchers directly into a qt4 bbappend. https://jira.digi.com/browse/DEL-1164 Signed-off-by: Javier Viguera --- .../fsl-gui-extrafiles/fsl-gui-extrafiles.bb | 32 --------- .../fsl-gui-extrafiles/LICENSE | 1 - .../packagegroups/packagegroup-dey-qt.bb | 1 - .../qt4/qt4-x11-free}/hellogl_es2.png | Bin .../qt4/qt4-x11-free}/qtbrowser.desktop | 0 .../qt4/qt4-x11-free}/qtdemo.desktop | 2 +- .../qt4/qt4-x11-free}/qtdemo.png | Bin .../qt4/qt4-x11-free}/qthellogles2.desktop | 0 .../qt4/qt4-x11-free}/qtmediaplayer.desktop | 0 .../qt4/qt4-x11-free}/qtmediaplayer.png | Bin .../qt4/qt4-x11-free}/webkit.png | Bin .../recipes-qt/qt4/qt4-x11-free_%.bbappend | 62 ++++++++++++++++++ 12 files changed, 63 insertions(+), 35 deletions(-) delete mode 100644 meta-digi-dey/recipes-graphics/fsl-gui-extrafiles/fsl-gui-extrafiles.bb delete mode 100644 meta-digi-dey/recipes-graphics/fsl-gui-extrafiles/fsl-gui-extrafiles/LICENSE rename meta-digi-dey/{recipes-graphics/fsl-gui-extrafiles/fsl-gui-extrafiles => recipes-qt/qt4/qt4-x11-free}/hellogl_es2.png (100%) rename meta-digi-dey/{recipes-graphics/fsl-gui-extrafiles/fsl-gui-extrafiles => recipes-qt/qt4/qt4-x11-free}/qtbrowser.desktop (100%) rename meta-digi-dey/{recipes-graphics/fsl-gui-extrafiles/fsl-gui-extrafiles => recipes-qt/qt4/qt4-x11-free}/qtdemo.desktop (86%) rename meta-digi-dey/{recipes-graphics/fsl-gui-extrafiles/fsl-gui-extrafiles => recipes-qt/qt4/qt4-x11-free}/qtdemo.png (100%) rename meta-digi-dey/{recipes-graphics/fsl-gui-extrafiles/fsl-gui-extrafiles => recipes-qt/qt4/qt4-x11-free}/qthellogles2.desktop (100%) rename meta-digi-dey/{recipes-graphics/fsl-gui-extrafiles/fsl-gui-extrafiles => recipes-qt/qt4/qt4-x11-free}/qtmediaplayer.desktop (100%) rename meta-digi-dey/{recipes-graphics/fsl-gui-extrafiles/fsl-gui-extrafiles => recipes-qt/qt4/qt4-x11-free}/qtmediaplayer.png (100%) rename meta-digi-dey/{recipes-graphics/fsl-gui-extrafiles/fsl-gui-extrafiles => recipes-qt/qt4/qt4-x11-free}/webkit.png (100%) create mode 100644 meta-digi-dey/recipes-qt/qt4/qt4-x11-free_%.bbappend diff --git a/meta-digi-dey/recipes-graphics/fsl-gui-extrafiles/fsl-gui-extrafiles.bb b/meta-digi-dey/recipes-graphics/fsl-gui-extrafiles/fsl-gui-extrafiles.bb deleted file mode 100644 index 4a059e12d..000000000 --- a/meta-digi-dey/recipes-graphics/fsl-gui-extrafiles/fsl-gui-extrafiles.bb +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (C) 2012-2013 Freescale Semiconductor - -DESCRIPTION = "Extra files for fsl-gui-image" -LICENSE = "LGPLv2" -PR = "r6" -S="${WORKDIR}" -LIC_FILES_CHKSUM = "file://LICENSE;md5=dfb0b24e10ca72d739b14d769d91cf9b" - -SRC_URI += "file://qtbrowser.desktop \ - file://webkit.png \ - file://qtmediaplayer.desktop \ - file://qtmediaplayer.png \ - file://qtdemo.desktop \ - file://qtdemo.png \ - file://qthellogles2.desktop \ - file://hellogl_es2.png \ - file://LICENSE" - -inherit allarch - -do_install () { - install -d ${D}/${datadir}/pixmaps - install -d ${D}/${datadir}/applications - install -m 0644 ${WORKDIR}/webkit.png ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/qtbrowser.desktop ${D}/${datadir}/applications - install -m 0644 ${WORKDIR}/qtmediaplayer.png ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/qtmediaplayer.desktop ${D}/${datadir}/applications - install -m 0644 ${WORKDIR}/qtdemo.png ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/qtdemo.desktop ${D}/${datadir}/applications - install -m 0644 ${WORKDIR}/hellogl_es2.png ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/qthellogles2.desktop ${D}/${datadir}/applications -} diff --git a/meta-digi-dey/recipes-graphics/fsl-gui-extrafiles/fsl-gui-extrafiles/LICENSE b/meta-digi-dey/recipes-graphics/fsl-gui-extrafiles/fsl-gui-extrafiles/LICENSE deleted file mode 100644 index 771ce7a21..000000000 --- a/meta-digi-dey/recipes-graphics/fsl-gui-extrafiles/fsl-gui-extrafiles/LICENSE +++ /dev/null @@ -1 +0,0 @@ -All content inside fsl-gui-extrafiles package are distributed under GPLv2 license diff --git a/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb b/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb index ad1930f21..9c8089475 100644 --- a/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb +++ b/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb @@ -15,5 +15,4 @@ RDEPENDS_${PN} = "\ qt4-plugin-phonon-backend-gstreamer \ qt4-demos \ qt4-examples \ - fsl-gui-extrafiles \ " diff --git a/meta-digi-dey/recipes-graphics/fsl-gui-extrafiles/fsl-gui-extrafiles/hellogl_es2.png b/meta-digi-dey/recipes-qt/qt4/qt4-x11-free/hellogl_es2.png similarity index 100% rename from meta-digi-dey/recipes-graphics/fsl-gui-extrafiles/fsl-gui-extrafiles/hellogl_es2.png rename to meta-digi-dey/recipes-qt/qt4/qt4-x11-free/hellogl_es2.png diff --git a/meta-digi-dey/recipes-graphics/fsl-gui-extrafiles/fsl-gui-extrafiles/qtbrowser.desktop b/meta-digi-dey/recipes-qt/qt4/qt4-x11-free/qtbrowser.desktop similarity index 100% rename from meta-digi-dey/recipes-graphics/fsl-gui-extrafiles/fsl-gui-extrafiles/qtbrowser.desktop rename to meta-digi-dey/recipes-qt/qt4/qt4-x11-free/qtbrowser.desktop diff --git a/meta-digi-dey/recipes-graphics/fsl-gui-extrafiles/fsl-gui-extrafiles/qtdemo.desktop b/meta-digi-dey/recipes-qt/qt4/qt4-x11-free/qtdemo.desktop similarity index 86% rename from meta-digi-dey/recipes-graphics/fsl-gui-extrafiles/fsl-gui-extrafiles/qtdemo.desktop rename to meta-digi-dey/recipes-qt/qt4/qt4-x11-free/qtdemo.desktop index 141c63de6..39e227965 100644 --- a/meta-digi-dey/recipes-graphics/fsl-gui-extrafiles/fsl-gui-extrafiles/qtdemo.desktop +++ b/meta-digi-dey/recipes-qt/qt4/qt4-x11-free/qtdemo.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Name=QT Demo Launcher +Name=QT Demo Launcher Exec=/usr/bin/qtdemo Icon=qtdemo Terminal=false diff --git a/meta-digi-dey/recipes-graphics/fsl-gui-extrafiles/fsl-gui-extrafiles/qtdemo.png b/meta-digi-dey/recipes-qt/qt4/qt4-x11-free/qtdemo.png similarity index 100% rename from meta-digi-dey/recipes-graphics/fsl-gui-extrafiles/fsl-gui-extrafiles/qtdemo.png rename to meta-digi-dey/recipes-qt/qt4/qt4-x11-free/qtdemo.png diff --git a/meta-digi-dey/recipes-graphics/fsl-gui-extrafiles/fsl-gui-extrafiles/qthellogles2.desktop b/meta-digi-dey/recipes-qt/qt4/qt4-x11-free/qthellogles2.desktop similarity index 100% rename from meta-digi-dey/recipes-graphics/fsl-gui-extrafiles/fsl-gui-extrafiles/qthellogles2.desktop rename to meta-digi-dey/recipes-qt/qt4/qt4-x11-free/qthellogles2.desktop diff --git a/meta-digi-dey/recipes-graphics/fsl-gui-extrafiles/fsl-gui-extrafiles/qtmediaplayer.desktop b/meta-digi-dey/recipes-qt/qt4/qt4-x11-free/qtmediaplayer.desktop similarity index 100% rename from meta-digi-dey/recipes-graphics/fsl-gui-extrafiles/fsl-gui-extrafiles/qtmediaplayer.desktop rename to meta-digi-dey/recipes-qt/qt4/qt4-x11-free/qtmediaplayer.desktop diff --git a/meta-digi-dey/recipes-graphics/fsl-gui-extrafiles/fsl-gui-extrafiles/qtmediaplayer.png b/meta-digi-dey/recipes-qt/qt4/qt4-x11-free/qtmediaplayer.png similarity index 100% rename from meta-digi-dey/recipes-graphics/fsl-gui-extrafiles/fsl-gui-extrafiles/qtmediaplayer.png rename to meta-digi-dey/recipes-qt/qt4/qt4-x11-free/qtmediaplayer.png diff --git a/meta-digi-dey/recipes-graphics/fsl-gui-extrafiles/fsl-gui-extrafiles/webkit.png b/meta-digi-dey/recipes-qt/qt4/qt4-x11-free/webkit.png similarity index 100% rename from meta-digi-dey/recipes-graphics/fsl-gui-extrafiles/fsl-gui-extrafiles/webkit.png rename to meta-digi-dey/recipes-qt/qt4/qt4-x11-free/webkit.png diff --git a/meta-digi-dey/recipes-qt/qt4/qt4-x11-free_%.bbappend b/meta-digi-dey/recipes-qt/qt4/qt4-x11-free_%.bbappend new file mode 100644 index 000000000..4a6ab9711 --- /dev/null +++ b/meta-digi-dey/recipes-qt/qt4/qt4-x11-free_%.bbappend @@ -0,0 +1,62 @@ +# Copyright (C) 2014 Digi International +# +# Desktop launchers for QT4 demo/example apps +# +# Origin: fsl-gui-extrafiles package (which was removed from meta-fsl-demos) + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += " \ + file://qtbrowser.desktop \ + file://qtdemo.desktop \ + file://qthellogles2.desktop \ + file://qtmediaplayer.desktop \ + file://hellogl_es2.png \ + file://qtdemo.png \ + file://qtmediaplayer.png \ + file://webkit.png \ +" + +# Disable OpenGL for ccardimx28 +QT_GLFLAGS_ccardimx28 = "-no-opengl" + +do_install_append() { + install -d ${D}${datadir}/applications ${D}${datadir}/pixmaps + install -m 0644 ${WORKDIR}/qtbrowser.desktop ${D}${datadir}/applications + install -m 0644 ${WORKDIR}/qtdemo.desktop ${D}${datadir}/applications + install -m 0644 ${WORKDIR}/qtmediaplayer.desktop ${D}${datadir}/applications + install -m 0644 ${WORKDIR}/qtdemo.png ${D}${datadir}/pixmaps + install -m 0644 ${WORKDIR}/qtmediaplayer.png ${D}${datadir}/pixmaps + install -m 0644 ${WORKDIR}/webkit.png ${D}${datadir}/pixmaps +} + +do_install_append_ccimx5() { + install -m 0644 ${WORKDIR}/qthellogles2.desktop ${D}${datadir}/applications + install -m 0644 ${WORKDIR}/hellogl_es2.png ${D}${datadir}/pixmaps +} + +do_install_append_ccimx6() { + install -m 0644 ${WORKDIR}/qthellogles2.desktop ${D}${datadir}/applications + install -m 0644 ${WORKDIR}/hellogl_es2.png ${D}${datadir}/pixmaps +} + +FILES_${QT_BASE_NAME}-demos += " \ + ${datadir}/applications/qtbrowser.desktop \ + ${datadir}/applications/qtdemo.desktop \ + ${datadir}/applications/qtmediaplayer.desktop \ + ${datadir}/pixmaps/qtdemo.png \ + ${datadir}/pixmaps/qtmediaplayer.png \ + ${datadir}/pixmaps/webkit.png \ +" + +FILES_${QT_BASE_NAME}-examples_append_ccimx5 = " \ + ${datadir}/applications/qthellogles2.desktop \ + ${datadir}/pixmaps/hellogl_es2.png \ +" + +FILES_${QT_BASE_NAME}-examples_append_ccimx6 = " \ + ${datadir}/applications/qthellogles2.desktop \ + ${datadir}/pixmaps/hellogl_es2.png \ +" + +PACKAGE_ARCH = "${MACHINE_ARCH}"