phonon: Update to 4.9.0

Update phonon to the latest version and fix build with Qt 5.8.

Signed-off-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
This commit is contained in:
Pier Luigi Fiorini
2016-12-03 09:38:30 +01:00
committed by Andreas Müller
parent 01ad942b92
commit 0ed33d5164
3 changed files with 52 additions and 36 deletions

View File

@@ -1,32 +0,0 @@
From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
Date: Tue, 26 May 2015 18:43:05 +0000
Subject: Fix build with Qt >= 5.4.2
X-Git-Url: http://quickgit.kde.org/?p=phonon.git&a=commitdiff&h=e5b7ede37a9c89b0ec69ee2be7c219a79e836fe1
---
Fix build with Qt >= 5.4.2
Or with commit 3eca75d cherry picked. Qt will now require using
-fPIC flag for it's consumers. For cmake Qt5Core exports the flag in
it's public interface, but since visibility try_compile test
does not link against any lib, we need to pass collected CMAKE_CXX_FLAGS
(which have gathered -fPIC flag at that phase)
This, for now only resolves the issue with gcc builds.
Other compilers will need to be checked.
REVIEW: 123874
---
Upstream-Status: Backport [4.8.4]
--- a/cmake/FindPhononInternal.cmake
+++ b/cmake/FindPhononInternal.cmake
@@ -409,7 +409,7 @@
file(WRITE "${_source_file}" "${_source}")
set(_include_dirs "-DINCLUDE_DIRECTORIES:STRING=${QT_INCLUDES}")
- try_compile(_compile_result ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${_include_dirs}" OUTPUT_VARIABLE _compile_output_var)
+ try_compile(_compile_result ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${CMAKE_CXX_FLAGS} ${_include_dirs}" OUTPUT_VARIABLE _compile_output_var)
if(NOT _compile_result)
message("${_compile_output_var}")

View File

@@ -0,0 +1,47 @@
From 3f10bfe169b6ad2dcde4a1e71ddec69cd0abdecd Mon Sep 17 00:00:00 2001
From: Takahiro Hashimoto <kenya888@gmail.com>
Date: Tue, 25 Oct 2016 09:22:35 +0900
Subject: use cmake variables to check if QtDbus is enabled
BUG: 368948
REVIEW: 129256
---
phonon/CMakeLists.txt | 2 +-
phonon/phononconfig_p.h.in | 7 -------
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/phonon/CMakeLists.txt b/phonon/CMakeLists.txt
index e6dfcb7..f9ae09e 100644
--- a/phonon/CMakeLists.txt
+++ b/phonon/CMakeLists.txt
@@ -12,7 +12,7 @@ endif (PHONON_BUILD_EXPERIMENTAL)
# ------------------------ Configure File QMake Style ------------------------ #
-if (PHONON_NO_DBUS)
+if (PHONON_NO_DBUS OR NOT QT_QTDBUS_FOUND)
set(PHONON_NO_DBUS_DEFINE "#define PHONON_NO_DBUS")
else()
set(PHONON_NO_DBUS_DEFINE "/* #undef PHONON_NO_DBUS */")
diff --git a/phonon/phononconfig_p.h.in b/phonon/phononconfig_p.h.in
index 63f2305..b397626 100644
--- a/phonon/phononconfig_p.h.in
+++ b/phonon/phononconfig_p.h.in
@@ -3,14 +3,7 @@
#ifndef PHONONCONFIG_H_P
#define PHONONCONFIG_H_P
-#include <QtCore/qfeatures.h>
-
/** Whether to build with D-Bus support */
$${PHONON_NO_DBUS_DEFINE}
-/** If QT_NO_DBUS is defined, always set PHONON_NO_DBUS */
-#if !defined(PHONON_NO_DBUS) && defined(QT_NO_DBUS)
-#define PHONON_NO_DBUS 1
-#endif
-
#endif // PHONONCONFIG_H_P
--
cgit v0.11.2

View File

@@ -6,12 +6,13 @@ LIC_FILES_CHKSUM = " \
inherit kde-base
SRC_URI = "${KDE_MIRROR}/stable/${BPN}/${PV}/${BPN}-${PV}.tar.xz"
SRC_URI += " \
file://0001-fix-PHONON_LIBRARY_PATH-was-usr-usr-lib-qt5-plugins.patch \
file://fix-qt-5.4.2-or-newer.patch \
file://fix-qt-5.8-build.patch \
"
SRC_URI[md5sum] = "88bb9867261803eed61ff53a7c026338"
SRC_URI[sha256sum] = "a1149c961ca1570968d070bbd23671e614aa506f847ca93748960e309f85da16"
SRC_URI[md5sum] = "8abeb7b1eaf4935668c7fb441fc2491a"
SRC_URI[sha256sum] = "bb74b40f18ade1d9ab89ffcd7aeb7555be797ca395f1224c488b394da6deb0e0"
EXTRA_OECMAKE += "-DPHONON_BUILD_DEMOS=ON -DPHONON_BUILD_PHONON4QT5=ON -D__KDE_HAVE_GCC_VISIBILITY=NO"
@@ -26,4 +27,4 @@ FILES_${PN}-designer-plugin = "${OE_QMAKE_PATH_PLUGINS}/designer"
FILES_${PN}-designer-plugin-dbg = "${OE_QMAKE_PATH_PLUGINS}/designer/.debug"
FILES_${PN} += "${datadir}/dbus-1"
FILES_${PN}-dev += "${datadir}${QT_DIR_NAME}/mkspecs ${datadir}/phonon4qt5/buildsystem"
FILES_${PN}-dev += "${datadir}/qt5/mkspecs ${OE_QMAKE_PATH_ARCHDATA}/mkspecs ${datadir}/phonon4qt5/buildsystem"