Hello community, here is the log from the commit of package phonon for openSUSE:Factory checked in at 2013-11-04 16:08:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/phonon (Old) and /work/SRC/openSUSE:Factory/.phonon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "phonon" Changes: -------- --- /work/SRC/openSUSE:Factory/phonon/phonon.changes 2013-10-01 08:20:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.phonon.new/phonon.changes 2013-11-04 16:08:51.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Nov 4 12:28:41 UTC 2013 - [email protected] + +- Update to 4.7.0~git20131104 + * Buildsystem fixes since previous snapshot + * Version bump to 4.7.0 + +------------------------------------------------------------------- Old: ---- phonon-4.6.80~git20130930.tar.xz New: ---- phonon-4.7.0~git20131104.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phonon.spec ++++++ --- /var/tmp/diff_new_pack.W7MSuB/_old 2013-11-04 16:08:51.000000000 +0100 +++ /var/tmp/diff_new_pack.W7MSuB/_new 2013-11-04 16:08:51.000000000 +0100 @@ -17,7 +17,7 @@ Name: phonon -Version: 4.6.80~git20130930 +Version: 4.7.0~git20131104 Release: 0 Summary: Multimedia Platform Abstraction License: LGPL-2.0+ ++++++ phonon-4.6.80~git20130930.tar.xz -> phonon-4.7.0~git20131104.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.6.80~git20130930/.gitignore new/phonon-4.7.0~git20131104/.gitignore --- old/phonon-4.6.80~git20130930/.gitignore 2013-09-30 16:43:58.000000000 +0200 +++ new/phonon-4.7.0~git20131104/.gitignore 2013-11-04 12:30:32.000000000 +0100 @@ -1,3 +1,4 @@ *.swp build +build5 apidocs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.6.80~git20130930/CMakeLists.txt new/phonon-4.7.0~git20131104/CMakeLists.txt --- old/phonon-4.6.80~git20130930/CMakeLists.txt 2013-09-30 16:43:58.000000000 +0200 +++ new/phonon-4.7.0~git20131104/CMakeLists.txt 2013-11-04 12:30:32.000000000 +0100 @@ -20,8 +20,8 @@ # It is highly advised to think twice before changing those. # If you are unsure about the this: http://plan99.net/~mike/writing-shared-libraries.html set(PHONON_LIB_MAJOR_VERSION "4") # Only change on binary incompatible changes -set(PHONON_LIB_MINOR_VERSION "6") # Only change on binary compatible changes with new interfaces -set(PHONON_LIB_PATCH_VERSION "80") # Bump whenever you feel like it :P +set(PHONON_LIB_MINOR_VERSION "7") # Only change on binary compatible changes with new interfaces +set(PHONON_LIB_PATCH_VERSION "0") # Bump whenever you feel like it :P set(PHONON_LIB_VERSION "${PHONON_LIB_MAJOR_VERSION}.${PHONON_LIB_MINOR_VERSION}.${PHONON_LIB_PATCH_VERSION}") set(PHONON_LIB_SOVERSION ${PHONON_LIB_MAJOR_VERSION}) set(PHONON_LIB_SONAME phonon) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.6.80~git20130930/PhononConfig.cmake.in new/phonon-4.7.0~git20131104/PhononConfig.cmake.in --- old/phonon-4.6.80~git20130930/PhononConfig.cmake.in 2013-09-30 16:43:58.000000000 +0200 +++ new/phonon-4.7.0~git20131104/PhononConfig.cmake.in 2013-11-04 12:30:32.000000000 +0100 @@ -15,6 +15,7 @@ set(PHONON_LIBRARY_DIR "${rootDir}/@LIB_INSTALL_DIR@") set(PHONON_BUILDSYSTEM_DIR "${rootDir}/@BUILDSYSTEM_INSTALL_DIR@") +set(PHONON_LIB_SONAME "@PHONON_LIB_SONAME@") if(NOT TARGET Phonon::@PHONON_LIB_SONAME@) include(${currentDir}/PhononTargets.cmake) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.6.80~git20130930/cmake/FindPhononInternal.cmake new/phonon-4.7.0~git20131104/cmake/FindPhononInternal.cmake --- old/phonon-4.6.80~git20130930/cmake/FindPhononInternal.cmake 2013-09-30 16:43:58.000000000 +0200 +++ new/phonon-4.7.0~git20131104/cmake/FindPhononInternal.cmake 2013-11-04 12:30:32.000000000 +0100 @@ -182,6 +182,10 @@ if (PHONON_BUILD_PHONON4QT5) set(PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/qt5" CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/qt5)" FORCE) endif(PHONON_BUILD_PHONON4QT5) +set(BACKEND_INSTALL_DIR "${PLUGIN_INSTALL_DIR}/plugins/${PHONON_LIB_SONAME}_backend") +if(WIN32) # Imported from Phonon VLC + set(BACKEND_INSTALL_DIR "bin/${PHONON_LIB_SONAME}_backend") +endif() set(ICON_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/icons" CACHE PATH "The icon install dir (default ${SHARE_INSTALL_PREFIX}/share/icons/)") set(SERVICES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/kde4/services" CACHE PATH "The install dir for service (desktop, protocol, ...) files") if (PHONON_BUILD_PHONON4QT5) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.6.80~git20130930/doc/Phonon4Qt5.dox new/phonon-4.7.0~git20131104/doc/Phonon4Qt5.dox --- old/phonon-4.6.80~git20130930/doc/Phonon4Qt5.dox 2013-09-30 16:43:58.000000000 +0200 +++ new/phonon-4.7.0~git20131104/doc/Phonon4Qt5.dox 2013-11-04 12:30:32.000000000 +0100 @@ -20,14 +20,17 @@ To build Phonon4Qt5 you will have to pass PHONON_BUILD_PHONON4QT5 to CMake to switch it into Qt5 build mode. -Additionally if you are build against a qt-project provided binary build of Qt5 -you may have to define the CMAKE_PREFIX_PATH to make CMake find Qt5. +Additionally if you are building against a qt-project provided binary build of Qt5 +you may have to define the CMAKE_PREFIX_PATH to make CMake find Qt5. If you are +using QMake for your application you will additionally have to instruct cmake to +install Qt extensions into the actual Qt directory using +PHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT. For example: \verbatim mkdir build5 cd build5 -cmake .. -DPHONON_BUILD_PHONON4QT5=ON -DCMAKE_PREFIX_PATH=/opt/Qt5.0.0/5.0.0/gcc_64 +cmake .. -DPHONON_BUILD_PHONON4QT5=ON -DCMAKE_PREFIX_PATH=/opt/Qt5.0.0/5.0.0/gcc_64 -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON \endverbatim Phonon4Qt5 installation does not conflict with regular Phonon installations in @@ -68,7 +71,10 @@ QT += phonon4qt5 \endcode -QMake will take care of everything else. +QMake will take care of everything else. Except in certain situations QMake will +not be able to find the files necessary to enable a phonon4qt5 build, building +phono4qt5 with PHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT, as explained above, +should prevent this from happening. \subsection phonon4qt5_using_cpp C++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.6.80~git20130930/phonon/CMakeLists.txt new/phonon-4.7.0~git20131104/phonon/CMakeLists.txt --- old/phonon-4.6.80~git20130930/phonon/CMakeLists.txt 2013-09-30 16:43:58.000000000 +0200 +++ new/phonon-4.7.0~git20131104/phonon/CMakeLists.txt 2013-11-04 12:30:32.000000000 +0100 @@ -134,6 +134,7 @@ endif (PHONON_NO_PLATFORMPLUGIN) add_definitions(-DPHONON_LIBRARY_PATH="${CMAKE_INSTALL_PREFIX}/${PLUGIN_INSTALL_DIR}/plugins") +add_definitions(-DPHONON_BACKEND_DIR_SUFFIX="/${PHONON_LIB_SONAME}_backend/") automoc4_add_library(${PHONON_LIB_SONAME} SHARED ${phonon_LIB_SRCS}) qt5_use_modules(${PHONON_LIB_SONAME} Core Widgets) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.6.80~git20130930/phonon/factory.cpp new/phonon-4.7.0~git20131104/phonon/factory.cpp --- old/phonon-4.6.80~git20130930/phonon/factory.cpp 2013-09-30 16:43:58.000000000 +0200 +++ new/phonon-4.7.0~git20131104/phonon/factory.cpp 2013-11-04 12:30:32.000000000 +0100 @@ -253,10 +253,17 @@ // could not load a backend through the platform plugin. Falling back to the default // (finding the first loadable backend). - const QLatin1String suffix("/phonon_backend/"); const QStringList paths = QCoreApplication::libraryPaths(); for (int i = 0; i < paths.count(); ++i) { - const QString libPath = paths.at(i) + suffix; +#ifdef __GNUC__ +#warning this actually breaks with qmake.... +#endif +#ifndef PHONON_BACKEND_DIR_SUFFIX +#ifdef __GNUC__ +#error PHONON_BACKEND_DIR_SUFFIX must be defined. +#endif +#endif + const QString libPath = paths.at(i) + PHONON_BACKEND_DIR_SUFFIX; const QDir dir(libPath); if (!dir.exists()) { pDebug() << Q_FUNC_INFO << dir.absolutePath() << "does not exist"; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
