Hello community, here is the log from the commit of package phonon-backend-vlc for openSUSE:Factory checked in at 2013-12-09 07:16:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/phonon-backend-vlc (Old) and /work/SRC/openSUSE:Factory/.phonon-backend-vlc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "phonon-backend-vlc" Changes: -------- --- /work/SRC/openSUSE:Factory/phonon-backend-vlc/phonon-backend-vlc.changes 2013-11-20 11:17:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.phonon-backend-vlc.new/phonon-backend-vlc.changes 2013-12-09 07:16:13.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Dec 6 16:49:55 UTC 2013 - hrvoje.sen...@gmail.com + +- Update to 0.7.1: + * Bugfix release, no changelog provided +- Bump required phonon version to 4.7.1 +- Fix Source URL + +------------------------------------------------------------------- Old: ---- phonon-backend-vlc-0.7.0.tar.xz New: ---- phonon-backend-vlc-0.7.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phonon-backend-vlc.spec ++++++ --- /var/tmp/diff_new_pack.x3oW7C/_old 2013-12-09 07:16:13.000000000 +0100 +++ /var/tmp/diff_new_pack.x3oW7C/_new 2013-12-09 07:16:13.000000000 +0100 @@ -17,20 +17,20 @@ Name: phonon-backend-vlc -Version: 0.7.0 +Version: 0.7.1 Release: 0 Summary: Phonon VLC Backend License: LGPL-2.1+ Group: Development/Libraries/KDE Url: http://phonon.kde.org/ -%define _phonon_version 4.7.0 -Source0: http://download.kde.org/stable/phonon/%{name}/%{version}/src/%{name}-%{version}.tar.xz +%define _phonon_version 4.7.1 +Source0: http://download.kde.org/stable/phonon/%{name}/%{version}/%{name}-%{version}.tar.xz BuildRequires: alsa-devel BuildRequires: automoc4 BuildRequires: cmake BuildRequires: fdupes BuildRequires: kde4-filesystem -BuildRequires: phonon-devel >= 4.7.0 +BuildRequires: phonon-devel >= %{_phonon_version} BuildRequires: pkgconfig BuildRequires: vlc-devel >= 2.0.1 Requires: libphonon4 => %{_phonon_version} ++++++ phonon-backend-vlc-0.7.0.tar.xz -> phonon-backend-vlc-0.7.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-backend-vlc-0.7.0/CMakeLists.txt new/phonon-backend-vlc-0.7.1/CMakeLists.txt --- old/phonon-backend-vlc-0.7.0/CMakeLists.txt 2013-11-04 17:49:24.000000000 +0100 +++ new/phonon-backend-vlc-0.7.1/CMakeLists.txt 2013-12-06 11:23:05.000000000 +0100 @@ -25,7 +25,7 @@ set(PHONON_VLC_MAJOR_VERSION "0") set(PHONON_VLC_MINOR_VERSION "7") -set(PHONON_VLC_PATCH_VERSION "0") +set(PHONON_VLC_PATCH_VERSION "1") set(PHONON_VLC_VERSION "${PHONON_VLC_MAJOR_VERSION}.${PHONON_VLC_MINOR_VERSION}.${PHONON_VLC_PATCH_VERSION}") add_definitions(-DPHONON_VLC_VERSION="${PHONON_VLC_VERSION}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-backend-vlc-0.7.0/cmake/FindLIBVLC.cmake new/phonon-backend-vlc-0.7.1/cmake/FindLIBVLC.cmake --- old/phonon-backend-vlc-0.7.0/cmake/FindLIBVLC.cmake 2013-11-04 17:49:24.000000000 +0100 +++ new/phonon-backend-vlc-0.7.1/cmake/FindLIBVLC.cmake 2013-12-06 11:23:05.000000000 +0100 @@ -67,7 +67,21 @@ set(LIBVLC_VERSION ${PC_LIBVLC_VERSION}) if (NOT LIBVLC_VERSION) -# TODO: implement means to detect version on windows (vlc --version && regex? ... ultimately we would get it from a header though...) + file(READ "${LIBVLC_INCLUDE_DIR}/vlc/libvlc_version.h" _libvlc_version_h) + + string(REGEX MATCH "# define LIBVLC_VERSION_MAJOR +\\(([0-9])\\)" _dummy "${_libvlc_version_h}") + set(_version_major "${CMAKE_MATCH_1}") + + string(REGEX MATCH "# define LIBVLC_VERSION_MINOR +\\(([0-9])\\)" _dummy "${_libvlc_version_h}") + set(_version_minor "${CMAKE_MATCH_1}") + + string(REGEX MATCH "# define LIBVLC_VERSION_REVISION +\\(([0-9])\\)" _dummy "${_libvlc_version_h}") + set(_version_revision "${CMAKE_MATCH_1}") + + # Optionally, one could also parse LIBVLC_VERSION_EXTRA, but it does not + # seem to be used by libvlc.pc. + + set(LIBVLC_VERSION "${_version_major}.${_version_minor}.${_version_revision}") endif (NOT LIBVLC_VERSION) if (LIBVLC_INCLUDE_DIR AND LIBVLC_LIBRARY AND LIBVLCCORE_LIBRARY) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-backend-vlc-0.7.0/src/CMakeLists.txt new/phonon-backend-vlc-0.7.1/src/CMakeLists.txt --- old/phonon-backend-vlc-0.7.0/src/CMakeLists.txt 2013-11-04 17:49:24.000000000 +0100 +++ new/phonon-backend-vlc-0.7.1/src/CMakeLists.txt 2013-12-06 11:23:05.000000000 +0100 @@ -2,7 +2,7 @@ add_definitions(-DPHONON_LIB_INSTALL_DIR="${LIB_INSTALL_DIR}") -if (MSVC) +if (MSVC OR (WIN32 AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")) set (CMAKE_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/share/apps/cmake/modules) find_package(KDEWin) if (KDEWIN_FOUND) @@ -16,18 +16,22 @@ message (FATAL_ERROR "You don't have stdint.h and inttypes.h\n\t get them from http://code.google.com/p/baseutils/source/browse/#svn/trunk/msvc,\n\t or get kdewin http://websvn.kde.org/trunk/kdesupport/kdewin/") endif ( NOT HAVE_STDINT AND NOT HAVE_INTTYPES ) endif (KDEWIN_FOUND) -endif (MSVC) +endif (MSVC OR (WIN32 AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")) if(${PHONON_VERSION} VERSION_GREATER "4.6.49") # Pre-release 4.7 starts at 4.6.50 message(STATUS "Building against Phonon 4.7 API") - add_definitions(-DPHONON_BACKEND_VERSION_4_7) + set(BACKEND_VERSION_DEFINE -DPHONON_BACKEND_VERSION_4_7) elseif(${PHONON_VERSION} VERSION_GREATER "4.1.99") message(STATUS "Building against Phonon 4.2 API") - add_definitions(-DPHONON_BACKEND_VERSION_4_2) + set(BACKEND_VERSION_DEFINE -DPHONON_BACKEND_VERSION_4_2) else() message(STATUS "Building against Phonon 4.0 API") + set(BACKEND_VERSION_DEFINE) endif() +add_definitions(${BACKEND_VERSION_DEFINE}) +set(AUTOMOC_MOC_OPTIONS ${BACKEND_VERSION_DEFINE}) + set(phonon_vlc_SRCS audio/audiooutput.cpp audio/audiodataoutput.cpp @@ -73,7 +77,10 @@ automoc4_add_library(phonon_vlc MODULE ${phonon_vlc_SRCS}) qt5_use_modules(phonon_vlc Core Widgets) -set_target_properties(phonon_vlc PROPERTIES PREFIX "") +set_target_properties(phonon_vlc PROPERTIES + PREFIX "" + AUTOMOC_MOC_OPTIONS ${AUTOMOC_MOC_OPTIONS} +) target_link_libraries(phonon_vlc ${PHONON_LIBRARY} ${LIBVLCCORE_LIBRARY} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-backend-vlc-0.7.0/src/audio/audiooutput.cpp new/phonon-backend-vlc-0.7.1/src/audio/audiooutput.cpp --- old/phonon-backend-vlc-0.7.0/src/audio/audiooutput.cpp 2013-11-04 17:49:24.000000000 +0100 +++ new/phonon-backend-vlc-0.7.1/src/audio/audiooutput.cpp 2013-12-06 11:23:05.000000000 +0100 @@ -54,10 +54,12 @@ void AudioOutput::handleAddToMedia(Media *media) { media->addOption(":audio"); +#if (PHONON_VERSION >= PHONON_VERSION_CHECK(4, 6, 50)) PulseSupport *pulse = PulseSupport::getInstance(); if (pulse && pulse->isActive()) { pulse->setupStreamEnvironment(m_streamUuid); } +#endif } qreal AudioOutput::volume() const @@ -115,6 +117,8 @@ #if (PHONON_VERSION >= PHONON_VERSION_CHECK(4, 6, 50)) void AudioOutput::setStreamUuid(QString uuid) { + DEBUG_BLOCK; + debug() << uuid; m_streamUuid = uuid; } #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-backend-vlc-0.7.0/src/backend.cpp new/phonon-backend-vlc-0.7.1/src/backend.cpp --- old/phonon-backend-vlc-0.7.0/src/backend.cpp 2013-11-04 17:49:24.000000000 +0100 +++ new/phonon-backend-vlc-0.7.1/src/backend.cpp 2013-12-06 11:23:05.000000000 +0100 @@ -83,6 +83,8 @@ debugLevel = 3; Debug::setMinimumDebugLevel((Debug::DebugLevel)((int) Debug::DEBUG_NONE - 1 - debugLevel)); + debug() << "Constructing Phonon-VLC Version" << PHONON_VLC_VERSION; + // Actual libVLC initialisation if (LibVLC::init()) { debug() << "Using VLC version" << libvlc_get_version(); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org