[PATCH 0/3] Tidy up Qt example application recipes

[PATCH 0/3] Tidy up Qt example application recipes

[Paul Eggleton]

Tidy up a few things I noticed when looking through these recipes for
Nitin's Qt Dev Days talk.


The following changes since commit b7c010e4603c33b1d3e3fcaf99a9375585471ec5:

  libxkbcommon: make the build do something (2012-12-04 20:51:36 +0000)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib paule/qt-apps-tidy
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/qt-apps-tidy

Paul Eggleton (3):
  fotowall: tidy up
  qmmp: remove qmake2 from inherit
  quicky: tidy up inherit

 meta/recipes-qt/qt-apps/fotowall_0.9.bb |   10 +++++-----
 meta/recipes-qt/qt-apps/qmmp_0.6.1.bb   |    5 ++---
 meta/recipes-qt/qt-apps/quicky_0.4.bb   |    6 ++----
 3 files changed, 9 insertions(+), 12 deletions(-)

-- 
1.7.10.4

[PATCH 1/3] fotowall: tidy up

[Paul Eggleton]

* inherit qt4x11 which inherits qmake2 and sets DEPENDS already
* Remove pkgconfig from inherit since quicky doesn't actually use
  pkg-config nor does it produce a .pc file
* Move packaging definitions to the end

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/recipes-qt/qt-apps/fotowall_0.9.bb |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-qt/qt-apps/fotowall_0.9.bb b/meta/recipes-qt/qt-apps/fotowall_0.9.bb
index 3cb79a3..2e1fbaa 100644
--- a/meta/recipes-qt/qt-apps/fotowall_0.9.bb
+++ b/meta/recipes-qt/qt-apps/fotowall_0.9.bb
@@ -7,10 +7,7 @@ LIC_FILES_CHKSUM = "file://GPL_V2;md5=79808397c3355f163c012616125c9e26 \
                     file://main.cpp;beginline=6;endline=11;md5=b569acc2bf8974a3082b58fc53b9d8dc"
 SECTION = "x11/apps"
 
-PR = "r3"
-
-DEPENDS = "qt4-x11-free"
-RRECOMMENDS_${PN} += "qt4-plugin-imageformat-gif qt4-plugin-imageformat-jpeg qt4-plugin-imageformat-tiff"
+PR = "r4"
 
 SRC_URI = "http://qt-apps.org/CONTENT/content-files/71316-Fotowall-0.9.tar.bz2 \
            file://ExportWizard-depends-on-ui_wizard.patch \
@@ -21,10 +18,13 @@ SRC_URI[sha256sum] = "e4d0c005d2cb1d7c09438bfc3098eadebc08946e4fbc0655b7fc8b046d
 
 S = "${WORKDIR}/Fotowall-${PV}"
 
-inherit qmake2 pkgconfig
+inherit qt4x11
 
 EXTRA_QMAKEVARS_PRE = "CONFIG+=no-webcam"
 
 do_install() {
 	oe_runmake INSTALL_ROOT=${D} install
 }
+
+# Ensure we have some plugins for some useful image formats
+RRECOMMENDS_${PN} += "qt4-plugin-imageformat-gif qt4-plugin-imageformat-jpeg qt4-plugin-imageformat-tiff"
-- 
1.7.10.4

[PATCH 2/3] qmmp: remove qmake2 from inherit

[Paul Eggleton]

qt4x11 already inherits qmake2 so it doesn't need to be inherited again.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/recipes-qt/qt-apps/qmmp_0.6.1.bb |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-qt/qt-apps/qmmp_0.6.1.bb b/meta/recipes-qt/qt-apps/qmmp_0.6.1.bb
index 9068025..ed096e9 100644
--- a/meta/recipes-qt/qt-apps/qmmp_0.6.1.bb
+++ b/meta/recipes-qt/qt-apps/qmmp_0.6.1.bb
@@ -5,7 +5,7 @@ LICENSE_FLAGS = "commercial"
 LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
 SECTION = "multimedia"
 
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "taglib libmad libvorbis libogg alsa-lib"
 
@@ -14,8 +14,7 @@ SRC_URI = "http://qmmp.ylsoftware.com/files/${BPN}-${PV}.tar.bz2"
 SRC_URI[md5sum] = "23a1a3aa924da901ebc8327ea76135d4"
 SRC_URI[sha256sum] = "b48be8c0e3882088919a77ce7b619cfc99d32af29cc688ba8749a58cbb25fb6f"
 
-
-inherit qmake2 cmake qt4x11
+inherit cmake qt4x11
 
 export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \
                         -DQT_LRELEASE_EXECUTABLE=${OE_QMAKE_LRELEASE} \
-- 
1.7.10.4

[PATCH 3/3] quicky: tidy up inherit

[Paul Eggleton]

* inherit qt4x11 which inherits qmake2 and sets DEPENDS already.
* Remove pkgconfig from inherit since quicky doesn't actually use
  pkg-config nor does it produce a .pc file

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/recipes-qt/qt-apps/quicky_0.4.bb |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-qt/qt-apps/quicky_0.4.bb b/meta/recipes-qt/qt-apps/quicky_0.4.bb
index 73d3e99..acacd8e 100644
--- a/meta/recipes-qt/qt-apps/quicky_0.4.bb
+++ b/meta/recipes-qt/qt-apps/quicky_0.4.bb
@@ -4,16 +4,14 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://version.h;endline=19;md5=878bdaff438dab86298301fd1a210e14"
 SECTION = "x11/apps"
 
-PR = "r1"
-
-DEPENDS = "qt4-x11-free"
+PR = "r2"
 
 SRC_URI = "http://qt-apps.org/CONTENT/content-files/80325-quicky-0.4.tar.gz"
 
 SRC_URI[md5sum] = "824d9e477ee9c4994f73a3cb215161d9"
 SRC_URI[sha256sum] = "9c66376e0035d44547612bf629890769a6178c3e7eafbcf95f1c6207ac0f352a"
 
-inherit qmake2 pkgconfig
+inherit qt4x11
 
 do_install() {
 	install -d ${D}${bindir}
-- 
1.7.10.4