From: | "Dominik Kapusta (ayoy)" <ayoy@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in dev-python/pyside/files: pyside-find-kde-phonon.patch pyside-qtscripttools.patch |
Date: | Wed, 25 Aug 2010 17:19:47 |
Message-Id: | 20100825171942.5BD6A20051@flycatcher.gentoo.org |
1 | ayoy 10/08/25 17:19:42 |
2 | |
3 | Added: pyside-find-kde-phonon.patch |
4 | Removed: pyside-qtscripttools.patch |
5 | Log: |
6 | Adding patch to find KDE phonon, removing obsolete qtscripttools patch. |
7 | (Portage version: 2.2_rc67/cvs/Linux x86_64) |
8 | |
9 | Revision Changes Path |
10 | 1.1 dev-python/pyside/files/pyside-find-kde-phonon.patch |
11 | |
12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyside/files/pyside-find-kde-phonon.patch?rev=1.1&view=markup |
13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyside/files/pyside-find-kde-phonon.patch?rev=1.1&content-type=text/plain |
14 | |
15 | Index: pyside-find-kde-phonon.patch |
16 | =================================================================== |
17 | diff --git a/PySide/CMakeLists.txt b/PySide/CMakeLists.txt |
18 | index b1b3286..0e45080 100644 |
19 | --- a/PySide/CMakeLists.txt |
20 | +++ b/PySide/CMakeLists.txt |
21 | @@ -79,6 +79,19 @@ if (NOT QT_QTDECLARATIVE_FOUND AND ${QTVERSION} VERSION_GREATER 4.6.0) |
22 | endif() |
23 | endif () |
24 | |
25 | +if (CMAKE_HOST_UNIX) |
26 | + # Try to find KDE Phonon |
27 | + if (NOT QT_PHONON_FOUND) |
28 | + find_path(QT_PHONON_INCLUDE_DIR audiooutput.h |
29 | + PATHS ${QT_HEADERS_DIR}/../phonon |
30 | + NO_DEFAULT_PATH) |
31 | + find_library(QT_PHONON_LIBRARY phonon PATHS ${QT_LIBRARY_DIR}/.. NO_DEFAULT_PATH) |
32 | + if (QT_PHONON_INCLUDE_DIR AND QT_PHONON_LIBRARY) |
33 | + set(QT_PHONON_FOUND ON) |
34 | + endif() |
35 | + endif () |
36 | +endif () |
37 | + |
38 | HAS_QT_MODULE(QT_QTCORE_FOUND QtCore) |
39 | HAS_QT_MODULE(QT_QTGUI_FOUND QtGui) |
40 | HAS_QT_MODULE(QT_QTNETWORK_FOUND QtNetwork) |