[oe-commits] Paul Eggleton : fotowall: tidy up

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: e5e6a02923ca28dd6863dcf96c1d0619f049c64a
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=e5e6a02923ca28dd6863dcf96c1d0619f049c64a

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Wed Dec  5 13:28:31 2012 +0000

fotowall: tidy up

* 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 at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-qt/qt-apps/fotowall_0.9.bb |   10 +++++-----
 1 files 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"