summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt-apps
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2014-03-12 15:46:57 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-17 14:01:42 +0000
commit78565c81d0d1209f0e6ce7002e835ad8ce506bd1 (patch)
treec7d29eb774edd6dc72bd4f88f5576cfc62efd063 /meta/recipes-qt/qt-apps
parent3c70ad664685716d8d805aebf211daff4a062d1a (diff)
downloadpoky-78565c81d0d1209f0e6ce7002e835ad8ce506bd1.tar.gz
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 (From OE-Core rev: fa10bd5aed84768ded25cdba348ce197a5fdbf2a) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt-apps')
-rw-r--r--meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch13
-rw-r--r--meta/recipes-qt/qt-apps/qmmp/no-sessionmanager.patch21
-rw-r--r--meta/recipes-qt/qt-apps/qmmp_0.7.5.bb (renamed from meta/recipes-qt/qt-apps/qmmp_0.6.6.bb)6
3 files changed, 10 insertions, 30 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
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]
8 8
9Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> 9Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
10 10
11--- a/CMakeLists.txt 11Update patch for version 0.7.4.
12+++ b/CMakeLists.txt 12
13@@ -1,12 +1,5 @@ 13Signed-off-by: Kai Kang <kai.kang@windriver.com>
14
15--- qmmp-0.7.4/CMakeLists.txt 2014-01-10 09:59:44.971837746 +0800
16+++ qmmp-0.7.4/CMakeLists.txt.new 2014-01-10 10:24:51.855837566 +0800
17@@ -1,9 +1,5 @@
14 cmake_minimum_required(VERSION 2.6.0) 18 cmake_minimum_required(VERSION 2.6.0)
15 19
16-#freebsd support 20-#freebsd support
17-include_directories(SYSTEM /usr/local/include) 21-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-SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include)
22- 23-
23 #extract version from qmmp.h 24 #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 @@
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.6.bb b/meta/recipes-qt/qt-apps/qmmp_0.7.5.bb
index ddfdfdccc7..910e7c2b31 100644
--- a/meta/recipes-qt/qt-apps/qmmp_0.6.6.bb
+++ b/meta/recipes-qt/qt-apps/qmmp_0.7.5.bb
@@ -10,10 +10,10 @@ DEPENDS = "taglib libmad libvorbis libogg alsa-lib libsndfile1 libsamplerate0 cu
10 10
11SRC_URI = "http://qmmp.ylsoftware.com/files/${BPN}-${PV}.tar.bz2 \ 11SRC_URI = "http://qmmp.ylsoftware.com/files/${BPN}-${PV}.tar.bz2 \
12 file://no-host-paths.patch \ 12 file://no-host-paths.patch \
13 file://no-sessionmanager.patch" 13 "
14 14
15SRC_URI[md5sum] = "0131a9bf7b98737c1a6fd6e1a897e2b2" 15SRC_URI[md5sum] = "dcc3c9ecd4dfbf0ced91c59cb894d460"
16SRC_URI[sha256sum] = "dfa973cca80c020a85a11bb66701a3804f9fde326440abb179559c98bf3b5b99" 16SRC_URI[sha256sum] = "6066aea939813667dae7cf32ff1d6eb9913894977d132c2cd729fea22d24cf67"
17 17
18inherit cmake qt4x11 18inherit cmake qt4x11
19 19