From: Xiaofeng Yan <xiaofeng....@windriver.com> qmmp: remove old recipe and add new recipe
Use do_split_package for each grouping and name them correctly besides updating package. The format to name plugins of qmmp: qmmp-plugin-<group>-<library> with the Description: Qmmp<Group> plugin for %s" Signed-off-by: Xiaofeng Yan <xiaofeng....@windriver.com> Fix dESCRIPTION -> DESCRIPTION Signed-off-by: Saul Wold <s...@linux.intel.com> --- .../qt-apps/{qmmp_0.5.1.bb => qmmp_0.5.2.bb} | 51 +++++++++++-------- 1 files changed, 29 insertions(+), 22 deletions(-) rename meta/recipes-qt/qt-apps/{qmmp_0.5.1.bb => qmmp_0.5.2.bb} (48%) diff --git a/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb similarity index 48% rename from meta/recipes-qt/qt-apps/qmmp_0.5.1.bb rename to meta/recipes-qt/qt-apps/qmmp_0.5.2.bb index 948c32a..b3ecc45 100644 --- a/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb +++ b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb @@ -6,18 +6,15 @@ SECTION = "multimedia" PR = "r0" -DEPENDS = "qt4-x11-free taglib libmad libvorbis libogg alsa-lib" -RDEPENDS_${PN} += "taglib alsa-lib curl" +DEPENDS = "taglib libmad libvorbis libogg alsa-lib" SRC_URI = "http://qmmp.ylsoftware.com/files/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "7934c069256bf2fc4ab762ad2683db2f" -SRC_URI[sha256sum] = "16ab0334f368a5ef14d631a1d43d7cae876ee06b7185643377b5e9cfd6143099" +SRC_URI[md5sum] = "20852f3cce3471bfc5affa9b2e947dc6" +SRC_URI[sha256sum] = "6391dec020d2a381d7f4b7890fae6c49eadf88b3c9aef571fe3c5e96140822ec" -PARALLEL_MAKE = "" - -inherit qmake2 cmake +inherit qmake2 cmake qt4x11 export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \ -DQT_LRELEASE_EXECUTABLE=${OE_QMAKE_LRELEASE} \ @@ -28,20 +25,30 @@ export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \ -DQT_HEADERS_DIR=${OE_QMAKE_INCDIR_QT} \ -DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \ " - -FILES_${PN} = "${bindir}/qmmp ${libdir}/*.so* \ - ${libdir}/qmmp/PlaylistFormats/*.so \ - ${libdir}/qmmp/Output/libalsa.so \ - ${libdir}/qmmp/Transports/libhttp.so \ - ${libdir}/qmmp/Visual/libanalyzer.so \ - ${datadir}/icons/* \ - ${datadir}/qmmp/images/* \ - ${datadir}/applications/qmmp.desktop \ +PACKAGES_DYNAMIC = "qmmp-plugin-* " + + +python populate_packages_prepend () { + import os + qmmp_libdir = bb.data.expand('${libdir}/qmmp', d) + gd = bb.data.expand('${D}/${libdir}/qmmp', d) + plug_dirs = os.listdir(gd) + + for plug_dir in plug_dirs: + g_plug_dir = os.path.join(qmmp_libdir,plug_dir) + do_split_packages(d, g_plug_dir, '^lib(.*)\.so$', 'qmmp-plugin-' + plug_dir.lower() + '-%s', 'Qmmp' + plug_dir + 'plugin for %s') +} + +FILES_${PN} = "\ + ${bindir}/qmmp \ + ${libdir}/lib*${SOLIBS} \ + ${datadir}/icons/* \ + ${datadir}/qmmp/images/* \ + ${datadir}/applications/* \ + " + +FILES_${PN}-dbg += "\ + ${libdir}/qmmp/*/.debug/* \ " -PACKAGES += "${PN}-plugin-input-mad ${PN}-plugin-input-vorbis" - -FILES_${PN}-plugin-input-mad = "${libdir}/qmmp/Input/libmad.so" -RDEPENDS_${PN}-plugin-input-mad = "libmad" -FILES_${PN}-plugin-input-vorbis = "${libdir}/qmmp/Input/libvorbis.so" -RDEPENDS_${PN}-plugin-input-vorbis = "libvorbis libogg" +RDEPENDS_${PN} += "taglib alsa-lib libmad curl" -- 1.7.6.4 _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core