Hello community,
here is the log from the commit of package phonon-backend-vlc for
openSUSE:Factory checked in at 2016-05-13 09:24:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2016-04-30 23:29:17.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.phonon-backend-vlc.new/phonon-backend-vlc.changes
2016-05-13 09:24:06.000000000 +0200
@@ -1,0 +2,8 @@
+Mon May 9 09:00:02 UTC 2016 - wba...@tmo.at
+
+- Added fix-build-with-older-phonon.patch to fix building against
+ older phonon versions
+- Also change required phonon version to 4.7.0, that's the minimum
+ supported nowadays
+
+-------------------------------------------------------------------
New:
----
fix-build-with-older-phonon.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ phonon-backend-vlc.spec ++++++
--- /var/tmp/diff_new_pack.WhAYU3/_old 2016-05-13 09:24:07.000000000 +0200
+++ /var/tmp/diff_new_pack.WhAYU3/_new 2016-05-13 09:24:07.000000000 +0200
@@ -16,7 +16,7 @@
#
-%define _phonon_version 4.6.50
+%define _phonon_version 4.7.0
Name: phonon-backend-vlc
Version: 0.9.0
Release: 0
@@ -25,6 +25,8 @@
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
@@ -47,6 +49,7 @@
%prep
%setup -q -n phonon-vlc-%{version}
+%patch -p1
%build
%cmake_kde4 -d build
++++++ fix-build-with-older-phonon.patch ++++++
From: Wolfgang Bauer <wba...@tmo.at>
Date: Mon, 09 May 2016 08:45:47 +0000
Subject: Fix build against older phonon versions
X-Git-Url:
http://quickgit.kde.org/?p=phonon-vlc.git&a=commitdiff&h=340fd9f9dbbb3b4be7a949bbb7e8f74cded6879c
---
Fix build against older phonon versions
Commit 4d6bdb0 introduced a new AudioOutput::setMuted() method for
Phonon 4.9.
While the declaration is conditional in the header file, there is no
version check for the implementation. This broke the build with
Phonon < 4.8.50.
So make the implementation conditional as well, to make phonon-vlc build
fine again with older Phonon versions.
REVIEW: 127858
---
--- a/src/audio/audiooutput.cpp
+++ b/src/audio/audiooutput.cpp
@@ -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
{
