Hello community, here is the log from the commit of package phonon-backend-vlc for openSUSE:Factory checked in at 2018-02-19 13:03:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/phonon-backend-vlc (Old) and /work/SRC/openSUSE:Factory/.phonon-backend-vlc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "phonon-backend-vlc" Mon Feb 19 13:03:10 2018 rev:22 rq:577899 version:0.9.1 Changes: -------- --- /work/SRC/openSUSE:Factory/phonon-backend-vlc/phonon-backend-vlc.changes 2017-12-08 13:02:14.011185306 +0100 +++ /work/SRC/openSUSE:Factory/.phonon-backend-vlc.new/phonon-backend-vlc.changes 2018-02-19 13:03:35.772389851 +0100 @@ -1,0 +2,14 @@ +Sun Feb 18 16:44:20 UTC 2018 - wba...@tmo.at + +- Update to 0.9.1 + * Fix building against older Phonon versions + * Prevent compilation errors by avoiding preprocessor macros that + could conflict with VLC's own names (kde#364582) + * Removed excess warnings from the OS X video widget + * Introduced a workaround for a double-release bug in the OS X + video widget introduced in Qt 5.8.0. +- Call vlc-cache-gen on package installation like in + phonon4qt5-backend-vlc +- Drop fix-build-with-older-phonon.patch, merged upstream + +------------------------------------------------------------------- Old: ---- fix-build-with-older-phonon.patch phonon-backend-vlc-0.9.0.tar.xz New: ---- phonon-backend-vlc-0.9.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phonon-backend-vlc.spec ++++++ --- /var/tmp/diff_new_pack.wCvLv5/_old 2018-02-19 13:03:37.212337921 +0100 +++ /var/tmp/diff_new_pack.wCvLv5/_new 2018-02-19 13:03:37.216337776 +0100 @@ -1,7 +1,7 @@ # # spec file for package phonon-backend-vlc # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,15 +18,13 @@ %define _phonon_version 4.7.0 Name: phonon-backend-vlc -Version: 0.9.0 +Version: 0.9.1 Release: 0 Summary: Phonon VLC Backend License: LGPL-2.1+ Group: System/GUI/KDE Url: http://phonon.kde.org/ Source: http://download.kde.org/stable/phonon/%{name}/%{version}/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM fix-build-with-older-phonon.patch -- Fix build against older phonon versions -Patch: fix-build-with-older-phonon.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: kde4-filesystem @@ -48,8 +46,7 @@ This is the VLC backend for Phonon. %prep -%setup -q -n phonon-vlc-%{version} -%patch -p1 +%setup -q -n phonon-backend-vlc-%{version} %build %cmake_kde4 -d build @@ -61,6 +58,13 @@ %kde_post_install +%post +%if 0%{?suse_version} >= 1500 +%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins +%else +%{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc/plugins +%endif + %files %defattr(-,root,root) %doc AUTHORS COPYING.LIB ++++++ phonon-backend-vlc-0.9.0.tar.xz -> phonon-backend-vlc-0.9.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-vlc-0.9.0/CMakeLists.txt new/phonon-backend-vlc-0.9.1/CMakeLists.txt --- old/phonon-vlc-0.9.0/CMakeLists.txt 2016-04-18 06:25:24.000000000 +0200 +++ new/phonon-backend-vlc-0.9.1/CMakeLists.txt 2017-02-23 11:39:51.000000000 +0100 @@ -25,7 +25,7 @@ set(PHONON_VLC_MAJOR_VERSION "0") set(PHONON_VLC_MINOR_VERSION "9") -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-vlc-0.9.0/src/audio/audiooutput.cpp new/phonon-backend-vlc-0.9.1/src/audio/audiooutput.cpp --- old/phonon-vlc-0.9.0/src/audio/audiooutput.cpp 2016-04-18 06:25:24.000000000 +0200 +++ new/phonon-backend-vlc-0.9.1/src/audio/audiooutput.cpp 2017-02-23 11:39:51.000000000 +0100 @@ -86,6 +86,7 @@ } } +#if (PHONON_VERSION >= PHONON_VERSION_CHECK(4, 8, 50)) void AudioOutput::setMuted(bool mute) { if (mute == m_player->mute()) { @@ -95,6 +96,7 @@ } m_player->setMute(mute); } +#endif int AudioOutput::outputDevice() const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-vlc-0.9.0/src/backend.cpp new/phonon-backend-vlc-0.9.1/src/backend.cpp --- old/phonon-vlc-0.9.0/src/backend.cpp 2016-04-18 06:25:24.000000000 +0200 +++ new/phonon-backend-vlc-0.9.1/src/backend.cpp 2017-02-23 11:39:51.000000000 +0100 @@ -96,7 +96,7 @@ qApp->applicationVersion(), PHONON_VERSION_STR, PHONON_VLC_VERSION); - libvlc_set_user_agent(libvlc, + libvlc_set_user_agent(pvlc_libvlc, qApp->applicationName().toUtf8().constData(), userAgent.toUtf8().constData()); } else { @@ -121,7 +121,7 @@ // If we failed to get a proper icon name, use the appname instead. icon = qApp->applicationName().toLower(); } - libvlc_set_app_id(libvlc, + libvlc_set_app_id(pvlc_libvlc, id.toUtf8().constData(), version.toUtf8().constData(), icon.toUtf8().constData()); @@ -176,7 +176,7 @@ QObject *Backend::createObject(BackendInterface::Class c, QObject *parent, const QList<QVariant> &args) { - if (!LibVLC::self || !libvlc) + if (!LibVLC::self || !pvlc_libvlc) return 0; switch (c) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-vlc-0.9.0/src/devicemanager.cpp new/phonon-backend-vlc-0.9.1/src/devicemanager.cpp --- old/phonon-vlc-0.9.0/src/devicemanager.cpp 2016-04-18 06:25:24.000000000 +0200 +++ new/phonon-backend-vlc-0.9.1/src/devicemanager.cpp 2017-02-23 11:39:51.000000000 +0100 @@ -203,7 +203,7 @@ { QList<DeviceInfo> newDeviceList; - if (!LibVLC::self || !libvlc) + if (!LibVLC::self || !pvlc_libvlc) return; QList<QByteArray> audioOutBackends = vlcAudioOutBackends(); @@ -252,7 +252,7 @@ bool hasDevices = false; VLC_FOREACH(audio_output_device, device, - libvlc_audio_output_device_list_get(libvlc, soundSystem), + libvlc_audio_output_device_list_get(pvlc_libvlc, soundSystem), libvlc_audio_output_device_list_release) { QString idName = QString::fromUtf8(device->psz_device); QString longName = QString::fromUtf8(device->psz_description); @@ -275,11 +275,11 @@ newDeviceList.append(info); } #else - const int deviceCount = libvlc_audio_output_device_count(libvlc, soundSystem); + const int deviceCount = libvlc_audio_output_device_count(pvlc_libvlc, soundSystem); for (int i = 0; i < deviceCount; i++) { VString idName(libvlc_audio_output_device_id(libvlc, soundSystem, i)); - VString longName(libvlc_audio_output_device_longname(libvlc, soundSystem, i)); + VString longName(libvlc_audio_output_device_longname(pvlc_libvlc, soundSystem, i)); debug() << "found device" << soundSystem << idName << longName; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-vlc-0.9.0/src/effectmanager.cpp new/phonon-backend-vlc-0.9.1/src/effectmanager.cpp --- old/phonon-vlc-0.9.0/src/effectmanager.cpp 2016-04-18 06:25:24.000000000 +0200 +++ new/phonon-backend-vlc-0.9.1/src/effectmanager.cpp 2017-02-23 11:39:51.000000000 +0100 @@ -46,7 +46,7 @@ EffectManager::EffectManager(QObject *parent) : QObject(parent) { - if (!libvlc) + if (!pvlc_libvlc) return; updateEffects(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-vlc-0.9.0/src/media.cpp new/phonon-backend-vlc-0.9.1/src/media.cpp --- old/phonon-vlc-0.9.0/src/media.cpp 2016-04-18 06:25:24.000000000 +0200 +++ new/phonon-backend-vlc-0.9.1/src/media.cpp 2017-02-23 11:39:51.000000000 +0100 @@ -30,7 +30,7 @@ Media::Media(const QByteArray &mrl, QObject *parent) : QObject(parent), - m_media(libvlc_media_new_location(libvlc, mrl.constData())), + m_media(libvlc_media_new_location(pvlc_libvlc, mrl.constData())), m_mrl(mrl) { Q_ASSERT(m_media); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-vlc-0.9.0/src/mediaplayer.cpp new/phonon-backend-vlc-0.9.1/src/mediaplayer.cpp --- old/phonon-vlc-0.9.0/src/mediaplayer.cpp 2016-04-18 06:25:24.000000000 +0200 +++ new/phonon-backend-vlc-0.9.1/src/mediaplayer.cpp 2017-02-23 11:39:51.000000000 +0100 @@ -50,7 +50,7 @@ MediaPlayer::MediaPlayer(QObject *parent) : QObject(parent) , m_media(0) - , m_player(libvlc_media_player_new(libvlc)) + , m_player(libvlc_media_player_new(pvlc_libvlc)) , m_doingPausedPlay(false) , m_volume(75) , m_fadeAmount(1.0f) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-vlc-0.9.0/src/utils/libvlc.h new/phonon-backend-vlc-0.9.1/src/utils/libvlc.h --- old/phonon-vlc-0.9.0/src/utils/libvlc.h 2016-04-18 06:25:24.000000000 +0200 +++ new/phonon-backend-vlc-0.9.1/src/utils/libvlc.h 2017-02-23 11:39:51.000000000 +0100 @@ -30,7 +30,7 @@ * Please note that init() must have been called whenever using this, as no * checking of self is conducted (i.e. can be null). */ -#define libvlc LibVLC::self->vlc() +#define pvlc_libvlc LibVLC::self->vlc() /** * Foreach loop macro for VLC descriptions. @@ -50,7 +50,7 @@ // This foreach expects only a type and variable because getter and releaser are generic. // Also the type is in short form i.e. libvlc_foo_t would be foo. -#define VLC_FOREACH_LIST(type, variable) VLC_FOREACH(type, variable, libvlc_##type##_list_get(libvlc), libvlc_##type##_list_release) +#define VLC_FOREACH_LIST(type, variable) VLC_FOREACH(type, variable, libvlc_##type##_list_get(pvlc_libvlc), libvlc_##type##_list_release) // These foreach expect no type because the type is generic, they do however // expect a getter to allow usage with our wrapper classes and since the getter diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-vlc-0.9.0/src/video/mac/vlcmacwidget.mm new/phonon-backend-vlc-0.9.1/src/video/mac/vlcmacwidget.mm --- old/phonon-vlc-0.9.0/src/video/mac/vlcmacwidget.mm 2016-04-18 06:25:24.000000000 +0200 +++ new/phonon-backend-vlc-0.9.1/src/video/mac/vlcmacwidget.mm 2017-02-23 11:39:51.000000000 +0100 @@ -25,18 +25,15 @@ { // Many Cocoa objects create temporary autorelease objects, // so create a pool to catch them. + @autoreleasepool { + VideoView *videoView = [[VideoView alloc] init]; - printf("[0x123c1b938] vout_macosx generic debug: No drawable-nsobject, passing over.[0x123c1b938] vout_macosx generic debug: No drawable-nsobject, passing over.[0x123c1b938] vout_macosx generic debug: No drawable-nsobject, passing over.[0x123c1b938] vout_macosx generic debug: No drawable-nsobject, passing over.[0x123c1b938] vout_macosx generic debug: No drawable-nsobject, passing over.[0x123c1b938] vout_macosx generic debug: No drawable-nsobject, passing over.[0x123c1b938] vout_macosx generic debug: No drawable-nsobject, passing over.[0x123c1b938] vout_macosx generic debug: No drawable-nsobject, passing over."); - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - VideoView *videoView = [[VideoView alloc] init]; - - this->setCocoaView(videoView); - - // Release our reference, since our super class takes ownership and we - // don't need it anymore. - [videoView release]; - - // Clean up our pool as we no longer need it. - [pool release]; + this->setCocoaView(videoView); + // Release our reference, since our super class takes ownership and we + // don't need it anymore (except with Qt 5.8.0 because of a regression). + if (strcmp(qVersion(), "5.8.0")) { + [videoView release]; + } + } }