From fa10bd5aed84768ded25cdba348ce197a5fdbf2a Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Wed, 12 Mar 2014 15:46:57 +0800 Subject: qmmp: update to 0.7.5 Update qmmp to 0.7.5 version * update no-host-paths.patch * remove no-sessionmanager.patch which is merged Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch | 13 ++-- .../qt-apps/qmmp/no-sessionmanager.patch | 21 ------ meta/recipes-qt/qt-apps/qmmp_0.6.6.bb | 77 ---------------------- meta/recipes-qt/qt-apps/qmmp_0.7.5.bb | 77 ++++++++++++++++++++++ 4 files changed, 84 insertions(+), 104 deletions(-) delete mode 100644 meta/recipes-qt/qt-apps/qmmp/no-sessionmanager.patch delete mode 100644 meta/recipes-qt/qt-apps/qmmp_0.6.6.bb create mode 100644 meta/recipes-qt/qt-apps/qmmp_0.7.5.bb (limited to 'meta/recipes-qt/qt-apps') diff --git a/meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch b/meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch index de17b4ef0b..2bb5bb11cc 100644 --- a/meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch +++ b/meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch @@ -8,16 +8,17 @@ Upstream-Status: Inappropriate [cross] Signed-off-by: Paul Eggleton ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,12 +1,5 @@ +Update patch for version 0.7.4. + +Signed-off-by: Kai Kang + +--- qmmp-0.7.4/CMakeLists.txt 2014-01-10 09:59:44.971837746 +0800 ++++ qmmp-0.7.4/CMakeLists.txt.new 2014-01-10 10:24:51.855837566 +0800 +@@ -1,9 +1,5 @@ cmake_minimum_required(VERSION 2.6.0) -#freebsd support -include_directories(SYSTEM /usr/local/include) --link_directories(/usr/local/lib) --link_directories(/usr/local/lib32) --link_directories(/usr/local/lib64) -SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include) - #extract version from qmmp.h diff --git a/meta/recipes-qt/qt-apps/qmmp/no-sessionmanager.patch b/meta/recipes-qt/qt-apps/qmmp/no-sessionmanager.patch deleted file mode 100644 index 5e2978b658..0000000000 --- a/meta/recipes-qt/qt-apps/qmmp/no-sessionmanager.patch +++ /dev/null @@ -1,21 +0,0 @@ -Don't call session manager function if not enabled - -If session management has been disabled we will get a compilation -failure if we try to call QApplication::commitData() so don't do so if -it is disabled. - -Upstream-Status: Pending - -Signed-off-by: Paul Eggleton - ---- a/src/app/qmmpapplication.cpp -+++ b/src/app/qmmpapplication.cpp -@@ -29,6 +29,8 @@ void QmmpApplication::commitData(QSessionManager &manager) - { - if(UiHelper::instance()) - UiHelper::instance()->exit(); -+#ifndef QT_NO_SESSIONMANAGER - else - QApplication::commitData(manager); -+#endif - } diff --git a/meta/recipes-qt/qt-apps/qmmp_0.6.6.bb b/meta/recipes-qt/qt-apps/qmmp_0.6.6.bb deleted file mode 100644 index ddfdfdccc7..0000000000 --- a/meta/recipes-qt/qt-apps/qmmp_0.6.6.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/${BPN}-${PV}.tar.bz2 \ - file://no-host-paths.patch \ - file://no-sessionmanager.patch" - -SRC_URI[md5sum] = "0131a9bf7b98737c1a6fd6e1a897e2b2" -SRC_URI[sha256sum] = "dfa973cca80c020a85a11bb66701a3804f9fde326440abb179559c98bf3b5b99" - -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.7.5.bb b/meta/recipes-qt/qt-apps/qmmp_0.7.5.bb new file mode 100644 index 0000000000..910e7c2b31 --- /dev/null +++ b/meta/recipes-qt/qt-apps/qmmp_0.7.5.bb @@ -0,0 +1,77 @@ +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/${BPN}-${PV}.tar.bz2 \ + file://no-host-paths.patch \ + " + +SRC_URI[md5sum] = "dcc3c9ecd4dfbf0ced91c59cb894d460" +SRC_URI[sha256sum] = "6066aea939813667dae7cf32ff1d6eb9913894977d132c2cd729fea22d24cf67" + +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" -- cgit 1.2.3-korg