diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2010-12-22 18:22:13 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-12-23 16:15:05 +0000 |
| commit | d21090934d64ae04b0362eb55ecfac1ea72a797e (patch) | |
| tree | 9ac93487455435bda1db7e60b6cd5d91ae15468a | |
| parent | db2389ef78c1004d0ddc081e4c67f60232b9d294 (diff) | |
| download | openembedded-core-d21090934d64ae04b0362eb55ecfac1ea72a797e.tar.gz openembedded-core-d21090934d64ae04b0362eb55ecfac1ea72a797e.tar.bz2 openembedded-core-d21090934d64ae04b0362eb55ecfac1ea72a797e.zip | |
qmmp: fix dependencies and packaging
* Don't drag in all of Qt as runtime dependencies
* Use cmake instead of qmake. This ensures plugins are configured correctly.
* Split out vorbis and mad input plugins into separate packages
* Fix main package to include an output plugin and various other base files.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
| -rw-r--r-- | meta/recipes-qt/qt-apps/qmmp_0.4.1.bb | 54 |
1 files changed, 31 insertions, 23 deletions
diff --git a/meta/recipes-qt/qt-apps/qmmp_0.4.1.bb b/meta/recipes-qt/qt-apps/qmmp_0.4.1.bb index c5afd91ea7..bf99697aa6 100644 --- a/meta/recipes-qt/qt-apps/qmmp_0.4.1.bb +++ b/meta/recipes-qt/qt-apps/qmmp_0.4.1.bb @@ -4,32 +4,40 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" SECTION = "multimedia" -PR = "r1" +PR = "r2" -DEPENDS = "qt4-x11-free taglib" -RDEPENDS = "qt4-x11-free libmad libvorbis libogg taglib alsa-lib curl" +DEPENDS = "qt4-x11-free taglib libmad libvorbis libogg alsa-lib" +RDEPENDS_${PN} += "taglib alsa-lib curl" SRC_URI = "http://qmmp.ylsoftware.com/files/qmmp-0.4.1.tar.bz2" PARALLEL_MAKE = "" -inherit qmake2 pkgconfig - -do_configure_prepend() { - # fix qt4 lrelease name - sed -i -e 's/lrelease-qt4/lrelease4/' ${S}/qmmp.pro - - # disable the unsupported plugin - for plugin in sndfile wavpack ; do - sed -i -e "s/$plugin//" ${S}/src/plugins/Input/Input.pro - done - sed -i -e 's/mms//' ${S}/src/plugins/Transports/Transports.pro - sed -i -e 's/srconverter//' ${S}/src/plugins/Effect/Effect.pro - - sed -i -e 's/^CONFIG/#CONFIG/' ${S}/qmmp.pri - sed -i -e 's/CONFIG += WITH_ENCA/#CONFIG += WITH_ENCA/' ${S}/qmmp.pri -} - -do_install() { - oe_runmake INSTALL_ROOT=${D} install -} +inherit qmake2 cmake + +export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \ + -DQT_LRELEASE_EXECUTABLE=${OE_QMAKE_LRELEASE} \ + -DQT_MOC_EXECUTABLE=${OE_QMAKE_MOC} \ + -DQT_UIC_EXECUTABLE=${OE_QMAKE_UIC} \ + -DQT_RCC_EXECUTABLE=${OE_QMAKE_RCC} \ + -DQT_LIBRARY_DIR=${OE_QMAKE_LIBDIR_QT} \ + -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 += "${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" |