summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch
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/recipes-qt/qt-apps/qmmp/no-host-paths.patch
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/recipes-qt/qt-apps/qmmp/no-host-paths.patch')
-rw-r--r--meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch25
1 files changed, 25 insertions, 0 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]+.*$")