rev 12697 - in branches/kde4/packages/phonon/debian: . patches
Sune Vuorela
pusling-guest at alioth.debian.org
Fri Nov 21 09:47:54 UTC 2008
Author: pusling-guest
Date: 2008-11-21 09:47:53 +0000 (Fri, 21 Nov 2008)
New Revision: 12697
Added:
branches/kde4/packages/phonon/debian/libphonon-dev.links
branches/kde4/packages/phonon/debian/patches/
branches/kde4/packages/phonon/debian/patches/phonon-inc.patch
branches/kde4/packages/phonon/debian/patches/phonon-libraryPaths.patch
branches/kde4/packages/phonon/debian/patches/series
Modified:
branches/kde4/packages/phonon/debian/changelog
Log:
* Make phonon find its backends. (Closes: 498573)
Thanks to Vincent Fourmond for tracking down the cause and Matthias Kretz
for the fix.
* Create a magic phonon header (thanks to Matthias Kretz) and as the Qt
documentation is unclear, symlink Phonon to the phonon header.
Also create a symlink from /usr/include/qt4/phonon to /usr/include/phonon
so that application using qmake can use it.
Modified: branches/kde4/packages/phonon/debian/changelog
===================================================================
--- branches/kde4/packages/phonon/debian/changelog 2008-11-20 22:57:31 UTC (rev 12696)
+++ branches/kde4/packages/phonon/debian/changelog 2008-11-21 09:47:53 UTC (rev 12697)
@@ -1,3 +1,15 @@
+phonon (4:4.2.0-2) unstable; urgency=low
+
+ * Make phonon find its backends. (Closes: 498573)
+ Thanks to Vincent Fourmond for tracking down the cause and Matthias Kretz
+ for the fix.
+ * Create a magic phonon header (thanks to Matthias Kretz) and as the Qt
+ documentation is unclear, symlink Phonon to the phonon header.
+ Also create a symlink from /usr/include/qt4/phonon to /usr/include/phonon
+ so that application using qmake can use it.
+
+ -- Sune Vuorela <debian at pusling.com> Thu, 20 Nov 2008 20:06:34 +0100
+
phonon (4:4.2.0-1) unstable; urgency=low
* New upstream release.
Added: branches/kde4/packages/phonon/debian/libphonon-dev.links
===================================================================
--- branches/kde4/packages/phonon/debian/libphonon-dev.links (rev 0)
+++ branches/kde4/packages/phonon/debian/libphonon-dev.links 2008-11-21 09:47:53 UTC (rev 12697)
@@ -0,0 +1,2 @@
+usr/include/phonon usr/include/qt4/phonon
+usr/include/phonon/phonon usr/include/phonon/Phonon
Added: branches/kde4/packages/phonon/debian/patches/phonon-inc.patch
===================================================================
--- branches/kde4/packages/phonon/debian/patches/phonon-inc.patch (rev 0)
+++ branches/kde4/packages/phonon/debian/patches/phonon-inc.patch 2008-11-21 09:47:53 UTC (rev 12697)
@@ -0,0 +1,48 @@
+Index: b/phonon/phonon
+===================================================================
+--- /dev/null
++++ b/phonon/phonon
+@@ -0,0 +1,31 @@
++#include "abstractaudiooutput.h"
++#include "abstractmediastream.h"
++#include "abstractvideooutput.h"
++#include "addoninterface.h"
++#include "audiooutput.h"
++#include "audiooutputinterface.h"
++#include "backendcapabilities.h"
++#include "backendinterface.h"
++#include "effect.h"
++#include "effectinterface.h"
++#include "effectparameter.h"
++#include "effectwidget.h"
++#include "mediacontroller.h"
++#include "medianode.h"
++#include "mediaobject.h"
++#include "mediaobjectinterface.h"
++#include "mediasource.h"
++#include "objectdescription.h"
++#include "objectdescriptionmodel.h"
++#include "path.h"
++#include "phonondefs.h"
++#include "phononnamespace.h"
++#include "platformplugin.h"
++#include "seekslider.h"
++#include "streaminterface.h"
++#include "videoplayer.h"
++#include "videowidget.h"
++#include "videowidgetinterface.h"
++#include "volumefadereffect.h"
++#include "volumefaderinterface.h"
++#include "volumeslider.h"
+Index: b/phonon/CMakeLists.txt
+===================================================================
+--- a/phonon/CMakeLists.txt
++++ b/phonon/CMakeLists.txt
+@@ -92,3 +92,7 @@
+ DESTINATION ${INCLUDE_INSTALL_DIR}/phonon COMPONENT Devel)
+
+ install(FILES org.kde.Phonon.AudioOutput.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
++
++install(FILES
++ phonon
++DESTINATION ${INCLUDE_INSTALL_DIR}/phonon)
Added: branches/kde4/packages/phonon/debian/patches/phonon-libraryPaths.patch
===================================================================
--- branches/kde4/packages/phonon/debian/patches/phonon-libraryPaths.patch (rev 0)
+++ branches/kde4/packages/phonon/debian/patches/phonon-libraryPaths.patch 2008-11-21 09:47:53 UTC (rev 12697)
@@ -0,0 +1,91 @@
+Patch from upstream to make sure that phonon finds its backends
+Index: b/phonon/factory.cpp
+===================================================================
+--- a/phonon/factory.cpp
++++ b/phonon/factory.cpp
+@@ -79,6 +79,17 @@
+
+ PHONON_GLOBAL_STATIC(Phonon::FactoryPrivate, globalFactory)
+
++static inline void ensureLibraryPathSet()
++{
++#ifdef PHONON_LIBRARY_PATH
++ static bool done = false;
++ if (!done) {
++ done = true;
++ QCoreApplication::addLibraryPath(QLatin1String(PHONON_LIBRARY_PATH));
++ }
++#endif // PHONON_LIBRARY_PATH
++}
++
+ void Factory::setBackend(QObject *b)
+ {
+ Q_ASSERT(globalFactory->m_backendObject == 0);
+@@ -102,6 +113,8 @@
+ m_backendObject = f->createBackend();
+ }
+ if (!m_backendObject) {
++ ensureLibraryPathSet();
++
+ // could not load a backend through the platform plugin. Falling back to the default
+ // (finding the first loadable backend).
+ const QLatin1String suffix("/phonon_backend/");
+@@ -302,6 +315,7 @@
+ #endif
+ const QString suffix(QLatin1String("/phonon_platform/"));
+ Q_ASSERT(QCoreApplication::instance());
++ ensureLibraryPathSet();
+ foreach (QString libPath, QCoreApplication::libraryPaths()) {
+ libPath += suffix;
+ const QDir dir(libPath);
+Index: b/phonon/CMakeLists.txt
+===================================================================
+--- a/phonon/CMakeLists.txt
++++ b/phonon/CMakeLists.txt
+@@ -40,6 +40,7 @@
+ endif (QT_QTDBUS_FOUND)
+
+
++add_definitions(-DPHONON_LIBRARY_PATH="${PLUGIN_INSTALL_DIR}/plugins")
+ automoc4(phonon phonon_LIB_SRCS)
+ add_library(phonon SHARED ${phonon_LIB_SRCS})
+ if (QT_QTDBUS_FOUND)
+Index: b/CMakeLists.txt
+===================================================================
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,6 +1,9 @@
+ project(Phonon)
+
+-cmake_minimum_required(VERSION 2.4.5 FATAL_ERROR)
++cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR)
++
++# CMP0002: we have multiple targets with the same name for the unit tests
++cmake_policy(SET CMP0002 OLD)
+
+ # enable unit tests
+ enable_testing()
+@@ -20,16 +23,13 @@
+ include (CheckCXXCompilerFlag)
+ include (MacroEnsureVersion)
+
+-if (CMAKE_MAJOR_VERSION GREATER 4)
+- # cmake 2.6.0 and automoc4 0.9.83 didn't add the necessary definitions for backends to moc calls
+- if (NOT AUTOMOC4_VERSION)
+- set(AUTOMOC4_VERSION "0.9.83")
+- endif (NOT AUTOMOC4_VERSION)
+- macro_ensure_version("0.9.84" "${AUTOMOC4_VERSION}" _automoc4_version_ok)
+- if (NOT _automoc4_version_ok)
+- message(FATAL_ERROR "Your version of automoc4 is too old. You have ${AUTOMOC4_VERSION}, you need at least 0.9.84")
+- endif (NOT _automoc4_version_ok)
+-endif (CMAKE_MAJOR_VERSION GREATER 4)
++if (NOT AUTOMOC4_VERSION)
++ set(AUTOMOC4_VERSION "0.9.83")
++endif (NOT AUTOMOC4_VERSION)
++macro_ensure_version("0.9.86" "${AUTOMOC4_VERSION}" _automoc4_version_ok)
++if (NOT _automoc4_version_ok)
++ message(FATAL_ERROR "Your version of automoc4 is too old. You have ${AUTOMOC4_VERSION}, you need at least 0.9.86")
++endif (NOT _automoc4_version_ok)
+
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ set (KDE4_ENABLE_EXCEPTIONS -fexceptions)
Added: branches/kde4/packages/phonon/debian/patches/series
===================================================================
--- branches/kde4/packages/phonon/debian/patches/series (rev 0)
+++ branches/kde4/packages/phonon/debian/patches/series 2008-11-21 09:47:53 UTC (rev 12697)
@@ -0,0 +1,2 @@
+phonon-inc.patch
+phonon-libraryPaths.patch
More information about the pkg-kde-commits
mailing list