From ed96c0a6a5a394842777a1413b89d3ea3aabb532 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 5 Dec 2012 13:28:32 +0000 Subject: qmmp: remove qmake2 from inherit qt4x11 already inherits qmake2 so it doesn't need to be inherited again. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/recipes-qt/qt-apps/qmmp_0.6.1.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'meta/recipes-qt/qt-apps') 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 906802555a..ed096e9ef4 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} \ -- cgit 1.2.3-korg