summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2010-12-22 18:22:13 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-23 16:15:05 +0000
commitd21090934d64ae04b0362eb55ecfac1ea72a797e (patch)
tree9ac93487455435bda1db7e60b6cd5d91ae15468a
parentdb2389ef78c1004d0ddc081e4c67f60232b9d294 (diff)
downloadpoky-d21090934d64ae04b0362eb55ecfac1ea72a797e.tar.gz
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.bb54
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"
4LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" 4LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
5SECTION = "multimedia" 5SECTION = "multimedia"
6 6
7PR = "r1" 7PR = "r2"
8 8
9DEPENDS = "qt4-x11-free taglib" 9DEPENDS = "qt4-x11-free taglib libmad libvorbis libogg alsa-lib"
10RDEPENDS = "qt4-x11-free libmad libvorbis libogg taglib alsa-lib curl" 10RDEPENDS_${PN} += "taglib alsa-lib curl"
11 11
12SRC_URI = "http://qmmp.ylsoftware.com/files/qmmp-0.4.1.tar.bz2" 12SRC_URI = "http://qmmp.ylsoftware.com/files/qmmp-0.4.1.tar.bz2"
13 13
14PARALLEL_MAKE = "" 14PARALLEL_MAKE = ""
15 15
16inherit qmake2 pkgconfig 16inherit qmake2 cmake
17 17
18do_configure_prepend() { 18export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \
19 # fix qt4 lrelease name 19 -DQT_LRELEASE_EXECUTABLE=${OE_QMAKE_LRELEASE} \
20 sed -i -e 's/lrelease-qt4/lrelease4/' ${S}/qmmp.pro 20 -DQT_MOC_EXECUTABLE=${OE_QMAKE_MOC} \
21 21 -DQT_UIC_EXECUTABLE=${OE_QMAKE_UIC} \
22 # disable the unsupported plugin 22 -DQT_RCC_EXECUTABLE=${OE_QMAKE_RCC} \
23 for plugin in sndfile wavpack ; do 23 -DQT_LIBRARY_DIR=${OE_QMAKE_LIBDIR_QT} \
24 sed -i -e "s/$plugin//" ${S}/src/plugins/Input/Input.pro 24 -DQT_HEADERS_DIR=${OE_QMAKE_INCDIR_QT} \
25 done 25 -DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \
26 sed -i -e 's/mms//' ${S}/src/plugins/Transports/Transports.pro 26 "
27 sed -i -e 's/srconverter//' ${S}/src/plugins/Effect/Effect.pro 27
28 28FILES_${PN} = "${bindir}/qmmp ${libdir}/*.so* \
29 sed -i -e 's/^CONFIG/#CONFIG/' ${S}/qmmp.pri 29 ${libdir}/qmmp/PlaylistFormats/*.so \
30 sed -i -e 's/CONFIG += WITH_ENCA/#CONFIG += WITH_ENCA/' ${S}/qmmp.pri 30 ${libdir}/qmmp/Output/libalsa.so \
31} 31 ${libdir}/qmmp/Transports/libhttp.so \
32 32 ${libdir}/qmmp/Visual/libanalyzer.so \
33do_install() { 33 ${datadir}/icons/* \
34 oe_runmake INSTALL_ROOT=${D} install 34 ${datadir}/qmmp/images/* \
35} 35 ${datadir}/applications/qmmp.desktop \
36 "
37
38PACKAGES += "${PN}-plugin-input-mad ${PN}-plugin-input-vorbis"
39
40FILES_${PN}-plugin-input-mad = "${libdir}/qmmp/Input/libmad.so"
41RDEPENDS_${PN}-plugin-input-mad = "libmad"
42FILES_${PN}-plugin-input-vorbis = "${libdir}/qmmp/Input/libvorbis.so"
43RDEPENDS_${PN}-plugin-input-vorbis = "libvorbis libogg"