Hello community,
here is the log from the commit of package phonon-backend-vlc for
openSUSE:Factory checked in at 2014-08-18 11:23:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2014-06-23 09:24:28.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.phonon-backend-vlc.new/phonon-backend-vlc.changes
2014-08-18 11:23:50.000000000 +0200
@@ -1,0 +2,8 @@
+Tue Aug 12 19:32:55 UTC 2014 - hrvoje.sen...@gmail.com
+
+- Update to 0.7.80
+ * 0.8 beta: PA interaction improvements, documentation fixes and
+ standard bugfixes
+- Bump phonon (Build)Requires to 4.7.80
+
+-------------------------------------------------------------------
Old:
----
phonon-backend-vlc-0.7.2.tar.xz
New:
----
phonon-backend-vlc-0.7.80.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ phonon-backend-vlc.spec ++++++
--- /var/tmp/diff_new_pack.8lkdpm/_old 2014-08-18 11:23:51.000000000 +0200
+++ /var/tmp/diff_new_pack.8lkdpm/_new 2014-08-18 11:23:51.000000000 +0200
@@ -17,14 +17,14 @@
Name: phonon-backend-vlc
-Version: 0.7.2
+Version: 0.7.80
Release: 0
Summary: Phonon VLC Backend
License: LGPL-2.1+
Group: Development/Libraries/KDE
Url: http://phonon.kde.org/
-%define _phonon_version 4.7.1
-Source:
http://download.kde.org/stable/phonon/%{name}/%{version}/src/%{name}-%{version}.tar.xz
+%define _phonon_version 4.7.80
+Source:
http://download.kde.org/unstable/phonon/%{name}/%{version}/%{name}-%{version}.tar.xz
BuildRequires: alsa-devel
BuildRequires: automoc4
BuildRequires: cmake
++++++ phonon-backend-vlc-0.7.2.tar.xz -> phonon-backend-vlc-0.7.80.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/phonon-backend-vlc-0.7.2/.reviewboardrc
new/phonon-backend-vlc-0.7.80/.reviewboardrc
--- old/phonon-backend-vlc-0.7.2/.reviewboardrc 1970-01-01 01:00:00.000000000
+0100
+++ new/phonon-backend-vlc-0.7.80/.reviewboardrc 2014-08-12
18:56:09.000000000 +0200
@@ -0,0 +1,3 @@
+REVIEWBOARD_URL = "https://git.reviewboard.kde.org";
+REPOSITORY = 'git://anongit.kde.org/phonon-vlc'
+TARGET_GROUPS = 'phonon'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/phonon-backend-vlc-0.7.2/CMakeLists.txt
new/phonon-backend-vlc-0.7.80/CMakeLists.txt
--- old/phonon-backend-vlc-0.7.2/CMakeLists.txt 2014-06-20 10:39:18.000000000
+0200
+++ new/phonon-backend-vlc-0.7.80/CMakeLists.txt 2014-08-12
18:56:09.000000000 +0200
@@ -25,7 +25,7 @@
set(PHONON_VLC_MAJOR_VERSION "0")
set(PHONON_VLC_MINOR_VERSION "7")
-set(PHONON_VLC_PATCH_VERSION "2")
+set(PHONON_VLC_PATCH_VERSION "80")
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.2/src/mediaplayer.cpp
new/phonon-backend-vlc-0.7.80/src/mediaplayer.cpp
--- old/phonon-backend-vlc-0.7.2/src/mediaplayer.cpp 2014-06-20
10:39:18.000000000 +0200
+++ new/phonon-backend-vlc-0.7.80/src/mediaplayer.cpp 2014-08-12
18:56:09.000000000 +0200
@@ -243,7 +243,19 @@
// Intercept state change and apply pausing once playing.
if (that->m_doingPausedPlay) {
that->m_doingPausedPlay = false;
- that->pause();
+ // VLC internally will call stop if a player can not be paused,
this
+ // can lead to deadlocks as stop is partially blocking, to avoid
this
+ // we explicitly do a queued stop whenever a player can not be
paused.
+ // In those situations pausedplay capability can not be provided,
so
+ // applications wanting to do pausedplay will need to handle it
anyway
+ // as faking a paused state when there is none would be a very code
+ // intense workaround asking for weird abstraction leakage.
+ // See kde bug 337604.
+ if (libvlc_media_player_can_pause(that->m_player)) {
+ that->pause();
+ } else {
+ QMetaObject::invokeMethod(that, "stop", Qt::QueuedConnection);
+ }
} else
P_EMIT_STATE(PlayingState);
break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/phonon-backend-vlc-0.7.2/src/mediaplayer.h
new/phonon-backend-vlc-0.7.80/src/mediaplayer.h
--- old/phonon-backend-vlc-0.7.2/src/mediaplayer.h 2014-06-20
10:39:18.000000000 +0200
+++ new/phonon-backend-vlc-0.7.80/src/mediaplayer.h 2014-08-12
18:56:09.000000000 +0200
@@ -68,7 +68,7 @@
void pausedPlay();
void resume();
void togglePause();
- void stop();
+ Q_INVOKABLE void stop();
qint64 length() const;
qint64 time() const;
@@ -167,7 +167,7 @@
#if (LIBVLC_VERSION_INT >= LIBVLC_VERSION(2, 2, 0, 0))
void setEqualizer(libvlc_equalizer_t *equalizer);
#endif
-
+
signals:
void lengthChanged(qint64 length);
void seekableChanged(bool seekable);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/phonon-backend-vlc-0.7.2/src/utils/libvlc.cpp
new/phonon-backend-vlc-0.7.80/src/utils/libvlc.cpp
--- old/phonon-backend-vlc-0.7.2/src/utils/libvlc.cpp 2014-06-20
10:39:18.000000000 +0200
+++ new/phonon-backend-vlc-0.7.80/src/utils/libvlc.cpp 2014-08-12
18:56:09.000000000 +0200
@@ -26,6 +26,8 @@
#include <QtCore/QStringBuilder>
#include <QtCore/QVarLengthArray>
+#include <phonon/pulsesupport.h>
+
#include <vlc/libvlc.h>
#include <vlc/libvlc_version.h>
@@ -61,7 +63,7 @@
int debugLevel = qgetenv("PHONON_SUBSYSTEM_DEBUG").toInt();
if (debugLevel > 0) {
- args << QByteArray("--verbose=").append(QString::number(debugLevel));
+ args <<
QByteArray("--verbose=").append(QByteArray::number(debugLevel));
args << QByteArray("--extraintf=logger");
#ifdef Q_WS_WIN
QDir logFilePath(QString(qgetenv("APPDATA")).append("/vlc"));
@@ -83,9 +85,6 @@
// 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";
@@ -101,6 +100,12 @@
#endif
args << "--no-audio";
args << "--no-video";
+ // 6 seconds disk read buffer (up from vlc 2.1 default of 300ms) when
using alsa, prevents most buffer underruns
+ // when the disk is very busy. We expect the pulse buffer after decoding
to solve the same problem.
+ Phonon::PulseSupport *pulse = Phonon::PulseSupport::getInstance();
+ if (!pulse || !pulse->isActive()) {
+ args << "--file-caching=6000";
+ }
// Build const char* array
QVarLengthArray<const char *, 64> vlcArgs(args.size());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/phonon-backend-vlc-0.7.2/src/video/videowidget.cpp
new/phonon-backend-vlc-0.7.80/src/video/videowidget.cpp
--- old/phonon-backend-vlc-0.7.2/src/video/videowidget.cpp 2014-06-20
10:39:18.000000000 +0200
+++ new/phonon-backend-vlc-0.7.80/src/video/videowidget.cpp 2014-08-12
18:56:09.000000000 +0200
@@ -234,7 +234,7 @@
#elif defined(Q_OS_UNIX)
m_player->setXWindow(winId());
#elif defined(Q_OS_WIN)
- m_player->setHwnd(winId());
+ m_player->setHwnd((HWND)winId());
#endif
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/phonon-backend-vlc-0.7.2/src/vlc.desktop.cmake
new/phonon-backend-vlc-0.7.80/src/vlc.desktop.cmake
--- old/phonon-backend-vlc-0.7.2/src/vlc.desktop.cmake 2014-06-20
10:39:18.000000000 +0200
+++ new/phonon-backend-vlc-0.7.80/src/vlc.desktop.cmake 2014-08-12
18:56:09.000000000 +0200
@@ -18,9 +18,11 @@
Name[da]=VLC
Name[de]=VLC
Name[el]=VLC
+Name[en_GB]=VLC
Name[es]=VLC
Name[et]=VLC
Name[eu]=VLC
+Name[fa]=ویالسی (VLC)
Name[fi]=VLC
Name[fr]=VLC
Name[ga]=VLC
@@ -63,9 +65,11 @@
Comment[da]=Phonon VLC-motor
Comment[de]=Phonon-Treiber für VLC
Comment[el]=Σύστημα υποστήριξης Phonon VLC
+Comment[en_GB]=Phonon VLC backend
Comment[es]=Motor VLC para Phonon
Comment[et]=Phononi VLC taustaprogramm
Comment[eu]=Phonon-en VLC bizkarraldekoa
+Comment[fa]=پسانهی ویالسی برای فنون (Phonon VLC backend)
Comment[fi]=Phonon VLC -taustajärjestelmä
Comment[fr]=Module VLC pour Phonon
Comment[ga]=Inneall VLC Phonon
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
