Hello community,
here is the log from the commit of package phonon4qt5-backend-vlc for
openSUSE:Factory checked in at 2014-06-23 09:24:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/phonon4qt5-backend-vlc (Old)
and /work/SRC/openSUSE:Factory/.phonon4qt5-backend-vlc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "phonon4qt5-backend-vlc"
Changes:
--------
---
/work/SRC/openSUSE:Factory/phonon4qt5-backend-vlc/phonon4qt5-backend-vlc.changes
2014-05-14 20:28:28.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.phonon4qt5-backend-vlc.new/phonon4qt5-backend-vlc.changes
2014-06-23 09:24:30.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Jun 20 22:07:04 UTC 2014 - hrvoje.sen...@gmail.com
+
+- Update to 0.7.2
+ * Bugfix release, no changelog provided
+
+-------------------------------------------------------------------
Old:
----
phonon-backend-vlc-0.7.1.tar.xz
New:
----
phonon-backend-vlc-0.7.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ phonon4qt5-backend-vlc.spec ++++++
--- /var/tmp/diff_new_pack.5fp2FU/_old 2014-06-23 09:24:31.000000000 +0200
+++ /var/tmp/diff_new_pack.5fp2FU/_new 2014-06-23 09:24:31.000000000 +0200
@@ -17,7 +17,7 @@
Name: phonon4qt5-backend-vlc
-Version: 0.7.1
+Version: 0.7.2
Release: 0
Summary: Phonon VLC Backend
License: LGPL-2.1+
@@ -25,7 +25,7 @@
Url: http://phonon.kde.org/
%define filename phonon-backend-vlc
%define _phonon4qt5_version 4.7.1
-Source0:
http://download.kde.org/stable/phonon/%{filename}/%{version}/%{filename}-%{version}.tar.xz
+Source:
http://download.kde.org/stable/phonon/%{filename}/%{version}/src/%{filename}-%{version}.tar.xz
BuildRequires: alsa-devel
BuildRequires: cmake
BuildRequires: kf5-filesystem
++++++ phonon-backend-vlc-0.7.1.tar.xz -> phonon-backend-vlc-0.7.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/phonon-backend-vlc-0.7.1/CMakeLists.txt
new/phonon-backend-vlc-0.7.2/CMakeLists.txt
--- old/phonon-backend-vlc-0.7.1/CMakeLists.txt 2013-12-06 11:23:05.000000000
+0100
+++ new/phonon-backend-vlc-0.7.2/CMakeLists.txt 2014-06-20 10:39:18.000000000
+0200
@@ -25,7 +25,7 @@
set(PHONON_VLC_MAJOR_VERSION "0")
set(PHONON_VLC_MINOR_VERSION "7")
-set(PHONON_VLC_PATCH_VERSION "1")
+set(PHONON_VLC_PATCH_VERSION "2")
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.1/src/media.cpp
new/phonon-backend-vlc-0.7.2/src/media.cpp
--- old/phonon-backend-vlc-0.7.1/src/media.cpp 2013-12-06 11:23:05.000000000
+0100
+++ new/phonon-backend-vlc-0.7.2/src/media.cpp 2014-06-20 10:39:18.000000000
+0200
@@ -52,8 +52,10 @@
Media::~Media()
{
- if (m_media)
+ if (m_media) {
libvlc_media_release(m_media);
+ m_media = 0;
+ }
}
void Media::addOption(const QString &option)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/phonon-backend-vlc-0.7.1/src/mediaobject.cpp
new/phonon-backend-vlc-0.7.2/src/mediaobject.cpp
--- old/phonon-backend-vlc-0.7.1/src/mediaobject.cpp 2013-12-06
11:23:05.000000000 +0100
+++ new/phonon-backend-vlc-0.7.2/src/mediaobject.cpp 2014-06-20
10:39:18.000000000 +0200
@@ -490,7 +490,15 @@
DEBUG_BLOCK;
setSource(m_nextSource);
- play();
+
+ // The consumer may set an invalid source as final source to force a
+ // queued stop, regardless of how fast the consumer is at actually calling
+ // stop. Such a source must not cause an actual move (moving ~= state
+ // changes towards playing) but instead we only set the source to reflect
+ // that we got the setNextSource call.
+ if (hasNextTrack())
+ play();
+
m_nextSource = MediaSource(QUrl());
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/phonon-backend-vlc-0.7.1/src/mediaplayer.cpp
new/phonon-backend-vlc-0.7.2/src/mediaplayer.cpp
--- old/phonon-backend-vlc-0.7.1/src/mediaplayer.cpp 2013-12-06
11:23:05.000000000 +0100
+++ new/phonon-backend-vlc-0.7.2/src/mediaplayer.cpp 2014-06-20
10:39:18.000000000 +0200
@@ -49,6 +49,7 @@
MediaPlayer::MediaPlayer(QObject *parent)
: QObject(parent)
+ , m_media(0)
, m_player(libvlc_media_player_new(libvlc))
, m_doingPausedPlay(false)
, m_volume(75)
@@ -332,6 +333,8 @@
void MediaPlayer::setCdTrack(int track)
{
+ if (!m_media)
+ return;
libvlc_media_player_stop(m_player);
m_media->setCdTrack(track);
libvlc_media_player_set_media(m_player, *m_media);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/phonon-backend-vlc-0.7.1/src/utils/libvlc.cpp
new/phonon-backend-vlc-0.7.2/src/utils/libvlc.cpp
--- old/phonon-backend-vlc-0.7.1/src/utils/libvlc.cpp 2013-12-06
11:23:05.000000000 +0100
+++ new/phonon-backend-vlc-0.7.2/src/utils/libvlc.cpp 2014-06-20
10:39:18.000000000 +0200
@@ -83,7 +83,9 @@
// Replaced by API call, see MediaPlayer::MediaPlayer.
args << "--no-video-title-show";
#endif
+#if (LIBVLC_VERSION_INT < LIBVLC_VERSION(2, 2, 0, 0))
args << "--album-art=0";
+#endif
// By default VLC will put a picture-in-picture when making a snapshot.
// This is unexpected behaviour for us, so we force it off.
args << "--no-snapshot-preview";
@@ -94,7 +96,7 @@
// Do not preload services discovery modules, we don't use them.
args << "--services-discovery=''";
// Allow multiple starts (one gets to wonder whether that makes a
difference).
-#if (LIBVLC_VERSION_INT > LIBVLC_VERSION(2, 1, 0, 0) && defined(Q_OS_MAC)) ||
defined( Q_OS_WIN) || !defined(PHONON_NO_DBUS)
+#if !defined(Q_OS_MAC) && (defined(Q_OS_WIN) || !defined(PHONON_NO_DBUS))
args << "--no-one-instance";
#endif
args << "--no-audio";
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
