| Submitter | Saul Wold |
|---|---|
| Date | Oct. 16, 2011, 8:17 p.m. |
| Message ID | <d8bdf3a41a8a090bccb7ffdbe937d9a586876a59.1318796061.git.sgw@linux.intel.com> |
| Download | mbox | patch |
| Permalink | /patch/13311/ |
| State | New, archived |
| Headers | show |
Comments
On Sun, 2011-10-16 at 13:17 -0700, Saul Wold wrote: > Signed-off-by: Saul Wold <sgw@linux.intel.com> > --- > meta/recipes-qt/qt-apps/qmmp_0.5.1.bb | 36 +++++++++++++++++++++++++++----- > 1 files changed, 30 insertions(+), 6 deletions(-) > > diff --git a/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb b/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb > index 948c32a..3f710f5 100644 > --- a/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb > +++ b/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb > @@ -4,7 +4,7 @@ LICENSE = "GPLv2" > LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" > SECTION = "multimedia" > > -PR = "r0" > +PR = "r1" > > DEPENDS = "qt4-x11-free taglib libmad libvorbis libogg alsa-lib" > RDEPENDS_${PN} += "taglib alsa-lib curl" > @@ -29,16 +29,40 @@ export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \ > -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 \ > +FILES_${PN} = "${bindir}/qmmp ${libdir}/*${SOLIBS} \ > + ${libdir}/qmmp/PlaylistFormats/*${SOLIBS} \ > + ${libdir}/qmmp/Output/libalsa${SOLIBS} \ > + ${libdir}/qmmp/Transports/libhttp${SOLIBS} \ > + ${libdir}/qmmp/Visual/libanalyzer${SOLIBS} \ > ${datadir}/icons/* \ > ${datadir}/qmmp/images/* \ > ${datadir}/applications/qmmp.desktop \ > " > > +FILES_${PN}-dev += "${libdir}/qmmp/PlaylistFormats/*${SOLIBSDEV} \ > + ${libdir}/qmmp/Output/libalsa${SOLIBSDEV} \ > + ${libdir}/qmmp/Transports/libhttp${SOLIBSDEV} \ > + ${libdir}/qmmp/Visual/libanalyzer${SOLIBSDEV} \ > + " > + > +FILES_${PN}-dbg += "${libdir}/qmmp/PlaylistFormats/.debug \ > + ${libdir}/qmmp/Output/.debug/libalsa* \ > + ${libdir}/qmmp/Transports/.debug/libhttp* \ > + ${libdir}/qmmp/Visual/.debug/libanalyzer* \ > + " > + > +FILES_${PN}-others-dbg = "${libdir}/qmmp/PlaylistFormats/.debug \ > + ${libdir}/qmmp/General/.debug \ > + ${libdir}/qmmp/Input/.debug \ > + ${libdir}/qmmp/Output/.debug \ > + ${libdir}/qmmp/Effect/.debug \ > + ${libdir}/qmmp/Engines/.debug \ > + ${libdir}/qmmp/FileDialogs/.debug \ > + ${libdir}/qmmp/Transports/.debug \ > + ${libdir}/qmmp/Visual/.debug \ > + ${libdir}/qmmp/CommandLineOptions/.debug \ > + " What is FILES_${PN}-others-dbg? Shouldn't these be in the -dbg package? Is this package listed in PACKAGES? Cheers, Richard
Patch
diff --git a/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb b/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb index 948c32a..3f710f5 100644 --- a/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb +++ b/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" SECTION = "multimedia" -PR = "r0" +PR = "r1" DEPENDS = "qt4-x11-free taglib libmad libvorbis libogg alsa-lib" RDEPENDS_${PN} += "taglib alsa-lib curl" @@ -29,16 +29,40 @@ export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \ -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 \ +FILES_${PN} = "${bindir}/qmmp ${libdir}/*${SOLIBS} \ + ${libdir}/qmmp/PlaylistFormats/*${SOLIBS} \ + ${libdir}/qmmp/Output/libalsa${SOLIBS} \ + ${libdir}/qmmp/Transports/libhttp${SOLIBS} \ + ${libdir}/qmmp/Visual/libanalyzer${SOLIBS} \ ${datadir}/icons/* \ ${datadir}/qmmp/images/* \ ${datadir}/applications/qmmp.desktop \ " +FILES_${PN}-dev += "${libdir}/qmmp/PlaylistFormats/*${SOLIBSDEV} \ + ${libdir}/qmmp/Output/libalsa${SOLIBSDEV} \ + ${libdir}/qmmp/Transports/libhttp${SOLIBSDEV} \ + ${libdir}/qmmp/Visual/libanalyzer${SOLIBSDEV} \ + " + +FILES_${PN}-dbg += "${libdir}/qmmp/PlaylistFormats/.debug \ + ${libdir}/qmmp/Output/.debug/libalsa* \ + ${libdir}/qmmp/Transports/.debug/libhttp* \ + ${libdir}/qmmp/Visual/.debug/libanalyzer* \ + " + +FILES_${PN}-others-dbg = "${libdir}/qmmp/PlaylistFormats/.debug \ + ${libdir}/qmmp/General/.debug \ + ${libdir}/qmmp/Input/.debug \ + ${libdir}/qmmp/Output/.debug \ + ${libdir}/qmmp/Effect/.debug \ + ${libdir}/qmmp/Engines/.debug \ + ${libdir}/qmmp/FileDialogs/.debug \ + ${libdir}/qmmp/Transports/.debug \ + ${libdir}/qmmp/Visual/.debug \ + ${libdir}/qmmp/CommandLineOptions/.debug \ + " + PACKAGES += "${PN}-plugin-input-mad ${PN}-plugin-input-vorbis" FILES_${PN}-plugin-input-mad = "${libdir}/qmmp/Input/libmad.so"
Signed-off-by: Saul Wold <sgw@linux.intel.com> --- meta/recipes-qt/qt-apps/qmmp_0.5.1.bb | 36 +++++++++++++++++++++++++++----- 1 files changed, 30 insertions(+), 6 deletions(-)