From f798df217ff41b4edb2bc83dda2e02e112b9ead4 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Sun, 9 Aug 2015 22:29:29 +0300 Subject: qmmp: Upgrade 0.8.5 -> 0.8.6 Add a missing runtime dependency. Signed-off-by: Jussi Kukkonen Signed-off-by: Ross Burton --- meta/recipes-qt/qt-apps/qmmp_0.8.5.bb | 77 ----------------------------------- meta/recipes-qt/qt-apps/qmmp_0.8.6.bb | 76 ++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 77 deletions(-) delete mode 100644 meta/recipes-qt/qt-apps/qmmp_0.8.5.bb create mode 100644 meta/recipes-qt/qt-apps/qmmp_0.8.6.bb (limited to 'meta/recipes-qt') diff --git a/meta/recipes-qt/qt-apps/qmmp_0.8.5.bb b/meta/recipes-qt/qt-apps/qmmp_0.8.5.bb deleted file mode 100644 index aa84c4674b..0000000000 --- a/meta/recipes-qt/qt-apps/qmmp_0.8.5.bb +++ /dev/null @@ -1,77 +0,0 @@ -SUMMARY = "Qt-based Multimedia Player" -DESCRIPTION = "Qmmp is an audio player, written with the help of the Qt library. The user interface is similar to Winamp or XMMS." -HOMEPAGE = "http://qmmp.ylsoftware.com" -LICENSE = "GPLv2" -LICENSE_FLAGS = "commercial" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SECTION = "multimedia" - -DEPENDS = "taglib libmad libvorbis libogg alsa-lib libsndfile1 libsamplerate0 curl" - -SRC_URI = "http://qmmp.ylsoftware.com/files/${BP}.tar.bz2 \ - file://no-host-paths.patch \ - " - -SRC_URI[md5sum] = "c9347ad18913058e8a37b1e88b9c6ce2" -SRC_URI[sha256sum] = "7fe9347ad6c66e8013b73f2c5cf628037c58151e0cfcb926a8f27b93ad2d7c0d" - -inherit cmake qt4x11 - -QMMP_PLUGIN_OPTIONS ??= "\ - -DUSE_MMS:BOOL=FALSE \ - -DUSE_MPC:BOOL=FALSE \ - -DUSE_MODPLUG:BOOL=FALSE \ - -DUSE_WAVPACK:BOOL=FALSE \ - -DUSE_FFMPEG:BOOL=FALSE \ - -DUSE_AAC:BOOL=FALSE \ - -DUSE_CDA:BOOL=FALSE \ - -DUSE_MIDI:BOOL=FALSE \ - -DUSE_GME:BOOL=FALSE \ - -DUSE_OSS4:BOOL=FALSE \ - -DUSE_JACK:BOOL=FALSE \ - -DUSE_BS2B:BOOL=FALSE \ - -DUSE_PROJECTM:BOOL=FALSE \ - -DUSE_ENCA:BOOL=FALSE \ - " - -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 \ - ${QMMP_PLUGIN_OPTIONS} \ - " - -do_configure() { - # Ensure we get the cmake configure and not qmake - cmake_do_configure -} - -PACKAGES_DYNAMIC += "^qmmp-plugin-.* " - -python populate_packages_prepend () { - qmmp_libdir = d.expand('${libdir}/qmmp') - gd = d.expand('${D}/${libdir}/qmmp') - 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/* \ - " - -RDEPENDS_${PN} += "taglib alsa-lib libmad curl" diff --git a/meta/recipes-qt/qt-apps/qmmp_0.8.6.bb b/meta/recipes-qt/qt-apps/qmmp_0.8.6.bb new file mode 100644 index 0000000000..e68ad0f189 --- /dev/null +++ b/meta/recipes-qt/qt-apps/qmmp_0.8.6.bb @@ -0,0 +1,76 @@ +SUMMARY = "Qt-based Multimedia Player" +DESCRIPTION = "Qmmp is an audio player, written with the help of the Qt library. The user interface is similar to Winamp or XMMS." +HOMEPAGE = "http://qmmp.ylsoftware.com" +LICENSE = "GPLv2" +LICENSE_FLAGS = "commercial" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +SECTION = "multimedia" + +DEPENDS = "taglib libmad libvorbis libogg alsa-lib libsndfile1 libsamplerate0 curl" + +SRC_URI = "http://qmmp.ylsoftware.com/files/${BP}.tar.bz2 \ + file://no-host-paths.patch \ + " + +SRC_URI[md5sum] = "67e96e89c61b7432e5a12f555db702b1" +SRC_URI[sha256sum] = "0daea3f0a0df7b34089513c2c57413c82816ab8892bddabf49c18a7956255449" +inherit cmake qt4x11 + +QMMP_PLUGIN_OPTIONS ??= "\ + -DUSE_MMS:BOOL=FALSE \ + -DUSE_MPC:BOOL=FALSE \ + -DUSE_MODPLUG:BOOL=FALSE \ + -DUSE_WAVPACK:BOOL=FALSE \ + -DUSE_FFMPEG:BOOL=FALSE \ + -DUSE_AAC:BOOL=FALSE \ + -DUSE_CDA:BOOL=FALSE \ + -DUSE_MIDI:BOOL=FALSE \ + -DUSE_GME:BOOL=FALSE \ + -DUSE_OSS4:BOOL=FALSE \ + -DUSE_JACK:BOOL=FALSE \ + -DUSE_BS2B:BOOL=FALSE \ + -DUSE_PROJECTM:BOOL=FALSE \ + -DUSE_ENCA:BOOL=FALSE \ + " + +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 \ + ${QMMP_PLUGIN_OPTIONS} \ + " + +do_configure() { + # Ensure we get the cmake configure and not qmake + cmake_do_configure +} + +PACKAGES_DYNAMIC += "^qmmp-plugin-.* " + +python populate_packages_prepend () { + qmmp_libdir = d.expand('${libdir}/qmmp') + gd = d.expand('${D}/${libdir}/qmmp') + 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/* \ + " + +RDEPENDS_${PN} += "taglib alsa-lib libmad curl libicui18n" -- cgit 1.2.3-korg