summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-02-05 15:55:46 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-06 09:37:21 +0000
commit4296d65a68719507272c368e83bf1f6fb8125d82 (patch)
tree5862764924d5b331f4b8978403728242e57d31f0 /meta
parente2ade5e836bd0b899ffc6fde509402586e246e6f (diff)
downloadpoky-4296d65a68719507272c368e83bf1f6fb8125d82.tar.gz
qmmp: update to 0.6.6 and fix
* Update to 0.6.6 * Fix compilation failure due to unconditional call to QApplication::commitData() * Disable /usr/local host paths to avoid compilation warnings * Force use of the cmake configure instead of qmake as the latter is not dynamic with Qmmp and doesn't let you disable certain dependencies (e.g. enca) * Add libsndfile1, libsamplerate0 and curl to DEPENDS since their use will be non-deterministic otherwise * Explicitly disable library-requiring options that we don't have available in OE-Core so that they don't get used if they happen to be in the sysroot * Update LIC_FILES_CHKSUM since there were cosmetic changes to the license file (mostly reformatting and change of references to LGPL from "Library" to "Lesser".) Fixes [YOCTO #3822]. (From OE-Core rev: 12484dca3bf09dd9a03442a223885deb7472a6cd) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch25
-rw-r--r--meta/recipes-qt/qt-apps/qmmp/no-sessionmanager.patch21
-rw-r--r--meta/recipes-qt/qt-apps/qmmp_0.6.6.bb (renamed from meta/recipes-qt/qt-apps/qmmp_0.6.1.bb)39
3 files changed, 77 insertions, 8 deletions
diff --git a/meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch b/meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch
new file mode 100644
index 0000000000..de17b4ef0b
--- /dev/null
+++ b/meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch
@@ -0,0 +1,25 @@
1Do not include /usr/include host paths
2
3These were added upstream apparently for freebsd support, but trigger
4compiler warnings during the build and could be dangerous, so remove
5them.
6
7Upstream-Status: Inappropriate [cross]
8
9Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
10
11--- a/CMakeLists.txt
12+++ b/CMakeLists.txt
13@@ -1,12 +1,5 @@
14 cmake_minimum_required(VERSION 2.6.0)
15
16-#freebsd support
17-include_directories(SYSTEM /usr/local/include)
18-link_directories(/usr/local/lib)
19-link_directories(/usr/local/lib32)
20-link_directories(/usr/local/lib64)
21-SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include)
22-
23 #extract version from qmmp.h
24 FILE(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/src/qmmp/qmmp.h"
25 QMMP_VERSION_DATA REGEX "^#define[ \t]+QMMP_VERSION_[A-Z]+[ \t]+[0-9]+.*$")
diff --git a/meta/recipes-qt/qt-apps/qmmp/no-sessionmanager.patch b/meta/recipes-qt/qt-apps/qmmp/no-sessionmanager.patch
new file mode 100644
index 0000000000..5e2978b658
--- /dev/null
+++ b/meta/recipes-qt/qt-apps/qmmp/no-sessionmanager.patch
@@ -0,0 +1,21 @@
1Don't call session manager function if not enabled
2
3If session management has been disabled we will get a compilation
4failure if we try to call QApplication::commitData() so don't do so if
5it is disabled.
6
7Upstream-Status: Pending
8
9Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
10
11--- a/src/app/qmmpapplication.cpp
12+++ b/src/app/qmmpapplication.cpp
13@@ -29,6 +29,8 @@ void QmmpApplication::commitData(QSessionManager &manager)
14 {
15 if(UiHelper::instance())
16 UiHelper::instance()->exit();
17+#ifndef QT_NO_SESSIONMANAGER
18 else
19 QApplication::commitData(manager);
20+#endif
21 }
diff --git a/meta/recipes-qt/qt-apps/qmmp_0.6.1.bb b/meta/recipes-qt/qt-apps/qmmp_0.6.6.bb
index ed096e9ef4..2f5e0d5830 100644
--- a/meta/recipes-qt/qt-apps/qmmp_0.6.1.bb
+++ b/meta/recipes-qt/qt-apps/qmmp_0.6.6.bb
@@ -2,20 +2,37 @@ DESCRIPTION = "Qmmp (Qt-based Multimedia Player) is an audio-player, written wit
2HOMEPAGE = "http://qmmp.ylsoftware.com" 2HOMEPAGE = "http://qmmp.ylsoftware.com"
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4LICENSE_FLAGS = "commercial" 4LICENSE_FLAGS = "commercial"
5LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" 5LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
6SECTION = "multimedia" 6SECTION = "multimedia"
7 7
8PR = "r1" 8DEPENDS = "taglib libmad libvorbis libogg alsa-lib libsndfile1 libsamplerate0 curl"
9 9
10DEPENDS = "taglib libmad libvorbis libogg alsa-lib" 10SRC_URI = "http://qmmp.ylsoftware.com/files/${BPN}-${PV}.tar.bz2 \
11 file://no-host-paths.patch \
12 file://no-sessionmanager.patch"
11 13
12SRC_URI = "http://qmmp.ylsoftware.com/files/${BPN}-${PV}.tar.bz2" 14SRC_URI[md5sum] = "0131a9bf7b98737c1a6fd6e1a897e2b2"
13 15SRC_URI[sha256sum] = "dfa973cca80c020a85a11bb66701a3804f9fde326440abb179559c98bf3b5b99"
14SRC_URI[md5sum] = "23a1a3aa924da901ebc8327ea76135d4"
15SRC_URI[sha256sum] = "b48be8c0e3882088919a77ce7b619cfc99d32af29cc688ba8749a58cbb25fb6f"
16 16
17inherit cmake qt4x11 17inherit cmake qt4x11
18 18
19QMMP_PLUGIN_OPTIONS ??= "\
20 -DUSE_MMS:BOOL=FALSE \
21 -DUSE_MPC:BOOL=FALSE \
22 -DUSE_MODPLUG:BOOL=FALSE \
23 -DUSE_WAVPACK:BOOL=FALSE \
24 -DUSE_FFMPEG:BOOL=FALSE \
25 -DUSE_AAC:BOOL=FALSE \
26 -DUSE_CDA:BOOL=FALSE \
27 -DUSE_MIDI:BOOL=FALSE \
28 -DUSE_GME:BOOL=FALSE \
29 -DUSE_OSS4:BOOL=FALSE \
30 -DUSE_JACK:BOOL=FALSE \
31 -DUSE_BS2B:BOOL=FALSE \
32 -DUSE_PROJECTM:BOOL=FALSE \
33 -DUSE_ENCA:BOOL=FALSE \
34 "
35
19export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \ 36export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \
20 -DQT_LRELEASE_EXECUTABLE=${OE_QMAKE_LRELEASE} \ 37 -DQT_LRELEASE_EXECUTABLE=${OE_QMAKE_LRELEASE} \
21 -DQT_MOC_EXECUTABLE=${OE_QMAKE_MOC} \ 38 -DQT_MOC_EXECUTABLE=${OE_QMAKE_MOC} \
@@ -24,9 +41,15 @@ export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \
24 -DQT_LIBRARY_DIR=${OE_QMAKE_LIBDIR_QT} \ 41 -DQT_LIBRARY_DIR=${OE_QMAKE_LIBDIR_QT} \
25 -DQT_HEADERS_DIR=${OE_QMAKE_INCDIR_QT} \ 42 -DQT_HEADERS_DIR=${OE_QMAKE_INCDIR_QT} \
26 -DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \ 43 -DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \
44 ${QMMP_PLUGIN_OPTIONS} \
27 " 45 "
28PACKAGES_DYNAMIC += "^qmmp-plugin-.* "
29 46
47do_configure() {
48 # Ensure we get the cmake configure and not qmake
49 cmake_do_configure
50}
51
52PACKAGES_DYNAMIC += "^qmmp-plugin-.* "
30 53
31python populate_packages_prepend () { 54python populate_packages_prepend () {
32 qmmp_libdir = d.expand('${libdir}/qmmp') 55 qmmp_libdir = d.expand('${libdir}/qmmp')