Hello community,
here is the log from the commit of package phonon-backend-vlc for
openSUSE:Factory checked in at 2013-11-04 16:10:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-10-08 11:04:51.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.phonon-backend-vlc.new/phonon-backend-vlc.changes
2013-11-04 16:10:40.000000000 +0100
@@ -1,0 +2,7 @@
+Mon Nov 4 12:40:08 UTC 2013 - [email protected]
+
+- Update to 0.7.0~git20131104
+ * Buildsystem fixes since previous snapshot
+ * Version bump to 0.7.0
+
+-------------------------------------------------------------------
Old:
----
phonon-backend-vlc-0.6.80~git20130930.tar.xz
New:
----
phonon-backend-vlc-0.7.0~git20131104.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ phonon-backend-vlc.spec ++++++
--- /var/tmp/diff_new_pack.tgEhwI/_old 2013-11-04 16:10:41.000000000 +0100
+++ /var/tmp/diff_new_pack.tgEhwI/_new 2013-11-04 16:10:41.000000000 +0100
@@ -17,20 +17,20 @@
Name: phonon-backend-vlc
-Version: 0.6.80~git20130930
+Version: 0.7.0~git20131104
Release: 0
Summary: Phonon VLC Backend
License: LGPL-2.1+
Group: Development/Libraries/KDE
Url: http://phonon.kde.org/
-%define _phonon_version 4.6.80~git20130930
+%define _phonon_version 4.7.0~git20131104
Source0: %{name}-%{version}.tar.xz
BuildRequires: alsa-devel
BuildRequires: automoc4
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: kde4-filesystem
-BuildRequires: phonon-devel >= 4.6.80~git20130930
+BuildRequires: phonon-devel >= 4.7.0~git20131104
BuildRequires: pkgconfig
BuildRequires: vlc-devel >= 2.0.1
Requires: libphonon4 => %{_phonon_version}
++++++ phonon-backend-vlc-0.6.80~git20130930.tar.xz ->
phonon-backend-vlc-0.7.0~git20131104.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/phonon-backend-vlc-0.6.80~git20130930/CMakeLists.txt
new/phonon-backend-vlc-0.7.0~git20131104/CMakeLists.txt
--- old/phonon-backend-vlc-0.6.80~git20130930/CMakeLists.txt 2013-09-30
16:33:59.000000000 +0200
+++ new/phonon-backend-vlc-0.7.0~git20131104/CMakeLists.txt 2013-11-04
13:00:01.000000000 +0100
@@ -5,8 +5,13 @@
# Phonon
find_package(Phonon REQUIRED)
-macro_ensure_version("4.6.80" ${PHONON_VERSION} PHONON_FOUND)
-macro_log_feature(PHONON_FOUND "Phonon" "Core Library"
"git://anongit.kde.org/phonon.git" TRUE "4.6.80")
+macro_ensure_version("4.7.0" ${PHONON_VERSION} PHONON_FOUND)
+macro_log_feature(PHONON_FOUND "Phonon" "Core Library"
"git://anongit.kde.org/phonon.git" TRUE "4.7.0")
+
+# LibVLC
+find_package(LIBVLC REQUIRED)
+macro_ensure_version("2.0.1" ${LIBVLC_VERSION} LIBVLC_FOUND)
+macro_log_feature(LIBVLC_FOUND "LibVLC" "VLC C API Library"
"git://git.videolan.org/vlc.git" TRUE "2.0.1")
if(PHONON_FOUND_EXPERIMENTAL)
add_definitions(-DPHONON_EXPERIMENTAL)
@@ -14,17 +19,13 @@
add_definitions(-DPHONON_VLC_NO_EXPERIMENTAL)
endif(PHONON_FOUND_EXPERIMENTAL)
-# libVLC
-set(LIBVLC_MIN_VERSION "2.0.1")
-find_package(LIBVLC REQUIRED)
-
add_definitions(${QT_DEFINITIONS})
include_directories(${PHONON_INCLUDES} ${QT_INCLUDES} ${LIBVLC_INCLUDE_DIR}
${LIBVLC_INCLUDE_DIR}/vlc/plugins)
set(PHONON_VLC_MAJOR_VERSION "0")
-set(PHONON_VLC_MINOR_VERSION "6")
-set(PHONON_VLC_PATCH_VERSION "80")
+set(PHONON_VLC_MINOR_VERSION "7")
+set(PHONON_VLC_PATCH_VERSION "0")
set(PHONON_VLC_VERSION
"${PHONON_VLC_MAJOR_VERSION}.${PHONON_VLC_MINOR_VERSION}.${PHONON_VLC_PATCH_VERSION}")
add_definitions(-DPHONON_VLC_VERSION="${PHONON_VLC_VERSION}")
@@ -32,3 +33,5 @@
include(MimeTypes.cmake)
add_subdirectory(src)
+
+macro_display_feature_log()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/phonon-backend-vlc-0.6.80~git20130930/src/CMakeLists.txt
new/phonon-backend-vlc-0.7.0~git20131104/src/CMakeLists.txt
--- old/phonon-backend-vlc-0.6.80~git20130930/src/CMakeLists.txt
2013-09-30 16:33:59.000000000 +0200
+++ new/phonon-backend-vlc-0.7.0~git20131104/src/CMakeLists.txt 2013-11-04
13:00:01.000000000 +0100
@@ -19,13 +19,13 @@
endif (MSVC)
if(${PHONON_VERSION} VERSION_GREATER "4.6.49") # Pre-release 4.7 starts at
4.6.50
- message("Building against Phonon 4.7 API")
+ message(STATUS "Building against Phonon 4.7 API")
add_definitions(-DPHONON_BACKEND_VERSION_4_7)
elseif(${PHONON_VERSION} VERSION_GREATER "4.1.99")
- message("Building against Phonon 4.2 API")
+ message(STATUS "Building against Phonon 4.2 API")
add_definitions(-DPHONON_BACKEND_VERSION_4_2)
else()
- message("Building against Phonon 4.0 API")
+ message(STATUS "Building against Phonon 4.0 API")
endif()
set(phonon_vlc_SRCS
@@ -80,11 +80,7 @@
${LIBVLC_LIBRARY}
)
-if(WIN32)
- install(TARGETS phonon_vlc DESTINATION bin/phonon_backend)
-else(WIN32)
- install(TARGETS phonon_vlc DESTINATION
${PLUGIN_INSTALL_DIR}/plugins/phonon_backend)
-endif(WIN32)
+install(TARGETS phonon_vlc DESTINATION ${BACKEND_INSTALL_DIR})
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/utils/mime.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/utils/mime.h @ONLY)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/phonon-backend-vlc-0.6.80~git20130930/src/audio/audiooutput.cpp
new/phonon-backend-vlc-0.7.0~git20131104/src/audio/audiooutput.cpp
--- old/phonon-backend-vlc-0.6.80~git20130930/src/audio/audiooutput.cpp
2013-09-30 16:33:59.000000000 +0200
+++ new/phonon-backend-vlc-0.7.0~git20131104/src/audio/audiooutput.cpp
2013-11-04 13:00:01.000000000 +0100
@@ -45,6 +45,7 @@
void AudioOutput::handleConnectToMediaObject(MediaObject *mediaObject)
{
+ Q_UNUSED(mediaObject);
setOutputDeviceImplementation();
if (!PulseSupport::getInstance()->isActive())
applyVolume();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/phonon-backend-vlc-0.6.80~git20130930/src/backend.cpp
new/phonon-backend-vlc-0.7.0~git20131104/src/backend.cpp
--- old/phonon-backend-vlc-0.6.80~git20130930/src/backend.cpp 2013-09-30
16:33:59.000000000 +0200
+++ new/phonon-backend-vlc-0.7.0~git20131104/src/backend.cpp 2013-11-04
13:00:01.000000000 +0100
@@ -120,7 +120,7 @@
#endif
} else {
#ifdef __GNUC__
-#warning TODO - this error message is about as useful as a cooling unit in the
arctic
+ #warning TODO - this error message is as useful as a knife at a gun fight
#endif
QMessageBox msg;
msg.setIcon(QMessageBox::Critical);
@@ -165,13 +165,9 @@
return new MediaObject(parent);
case AudioOutputClass:
return new AudioOutput(parent);
-#ifdef __GNUC__
-#warning using sout in VLC2 breaks libvlcs vout functions, see vlc bug 6992
-// https://trac.videolan.org/vlc/ticket/6992
-#endif
#if (LIBVLC_VERSION_INT < LIBVLC_VERSION(2, 0, 0, 0))
- // FWIW: the case is inside the if because that gives clear indication
which
- // frontend objects are not supported!
+ // Broken >= 2.0
+ // https://trac.videolan.org/vlc/ticket/6992
case AudioDataOutputClass:
return new AudioDataOutput(parent);
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/phonon-backend-vlc-0.6.80~git20130930/src/effect.cpp
new/phonon-backend-vlc-0.7.0~git20131104/src/effect.cpp
--- old/phonon-backend-vlc-0.6.80~git20130930/src/effect.cpp 2013-09-30
16:33:59.000000000 +0200
+++ new/phonon-backend-vlc-0.7.0~git20131104/src/effect.cpp 2013-11-04
13:00:01.000000000 +0100
@@ -33,6 +33,8 @@
: QObject(p_parent)
, SinkNode()
{
+ Q_UNUSED(p_em);
+ Q_UNUSED(i_effectId);
// p_effectManager = p_em;
// const QList<EffectInfo> effects = p_effectManager->effects();
@@ -51,7 +53,7 @@
parameterList.clear();
}
-void Effect::handleConnectToMediaObject(MediaObject *p_media_object)
+void Effect::handleConnectToMediaObject(MediaObject *)
{
switch (effect_type) {
case EffectInfo::AudioEffect:
@@ -65,7 +67,7 @@
}
}
-void Effect::handleDisconnectFromMediaObject(MediaObject *p_media_object)
+void Effect::handleDisconnectFromMediaObject(MediaObject *)
{
switch (effect_type) {
case EffectInfo::AudioEffect:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/phonon-backend-vlc-0.6.80~git20130930/src/effectmanager.cpp
new/phonon-backend-vlc-0.7.0~git20131104/src/effectmanager.cpp
--- old/phonon-backend-vlc-0.6.80~git20130930/src/effectmanager.cpp
2013-09-30 16:33:59.000000000 +0200
+++ new/phonon-backend-vlc-0.7.0~git20131104/src/effectmanager.cpp
2013-11-04 13:00:01.000000000 +0100
@@ -79,8 +79,11 @@
QObject *EffectManager::createEffect(int id, QObject *parent)
{
+ Q_UNUSED(id);
#if (LIBVLC_VERSION_INT >= LIBVLC_VERSION(2, 2, 0, 0))
return new EqualizerEffect(parent);
+#else
+ Q_UNUSED(parent);
#endif
return 0;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/phonon-backend-vlc-0.6.80~git20130930/src/mediacontroller.cpp
new/phonon-backend-vlc-0.7.0~git20131104/src/mediacontroller.cpp
--- old/phonon-backend-vlc-0.6.80~git20130930/src/mediacontroller.cpp
2013-09-30 16:33:59.000000000 +0200
+++ new/phonon-backend-vlc-0.7.0~git20131104/src/mediacontroller.cpp
2013-11-04 13:00:01.000000000 +0100
@@ -306,13 +306,13 @@
const QString file = url.toLocalFile();
if (!m_player->setSubtitle(file))
error() << "libVLC failed to set subtitle file:" <<
LibVLC::errorMessage();
-#warning report upstream wish
// Unfortunately the addition of SPUs does not trigger an event in the
// VLC mediaplayer, yet the actual addition to the descriptor is async.
// So for the time being our best shot at getting an up-to-date list of
SPUs
// is shooting in the dark and hoping we hit something.
// Refresha after 1, 2 and 5 seconds. If we have no updated list after 5
// seconds we are out of luck.
+ // https://trac.videolan.org/vlc/ticket/9796
QObject *mediaObject = dynamic_cast<QObject *>(this); // MediaObject :
QObject, MediaController
m_refreshTimer->singleShot(1 * 1000, mediaObject,
SLOT(refreshDescriptors()));
m_refreshTimer->singleShot(2 * 1000, mediaObject,
SLOT(refreshDescriptors()));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/phonon-backend-vlc-0.6.80~git20130930/src/mediaobject.cpp
new/phonon-backend-vlc-0.7.0~git20131104/src/mediaobject.cpp
--- old/phonon-backend-vlc-0.6.80~git20130930/src/mediaobject.cpp
2013-09-30 16:33:59.000000000 +0200
+++ new/phonon-backend-vlc-0.7.0~git20131104/src/mediaobject.cpp
2013-11-04 13:00:01.000000000 +0100
@@ -543,9 +543,12 @@
if (!m_subtitleFontChanged) // Update font settings
m_subtitleFont = QFont();
+#ifdef __GNUC__
#warning freetype module is not working as expected - font api not working
+#endif
// BUG: VLC's freetype module doesn't pick up per-media options
// vlc -vvvv --freetype-font="Comic Sans MS" multiple_sub_sample.mkv
:freetype-font=Arial
+ // https://trac.videolan.org/vlc/ticket/9797
m_media->addOption(QLatin1String(":freetype-font="),
m_subtitleFont.family());
m_media->addOption(QLatin1String(":freetype-fontsize="),
m_subtitleFont.pointSize());
if (m_subtitleFont.bold())
@@ -644,7 +647,6 @@
debug() << state;
debug() << "attempted autoplay?" << m_attemptingAutoplay;
-#warning report upstream: lack of track information on cdda-trakc specific
media
if (m_attemptingAutoplay) {
switch (state) {
case MediaPlayer::PlayingState:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/phonon-backend-vlc-0.6.80~git20130930/src/mediaplayer.cpp
new/phonon-backend-vlc-0.7.0~git20131104/src/mediaplayer.cpp
--- old/phonon-backend-vlc-0.6.80~git20130930/src/mediaplayer.cpp
2013-09-30 16:33:59.000000000 +0200
+++ new/phonon-backend-vlc-0.7.0~git20131104/src/mediaplayer.cpp
2013-11-04 13:00:01.000000000 +0100
@@ -47,12 +47,12 @@
namespace Phonon {
namespace VLC {
-MediaPlayer::MediaPlayer(QObject *parent) :
- QObject(parent),
- m_player(libvlc_media_player_new(libvlc)),
- m_doingPausedPlay(false),
- m_fadeAmount(1.0f),
- m_volume(75)
+MediaPlayer::MediaPlayer(QObject *parent)
+ : QObject(parent)
+ , m_player(libvlc_media_player_new(libvlc))
+ , m_doingPausedPlay(false)
+ , m_volume(75)
+ , m_fadeAmount(1.0f)
{
Q_ASSERT(m_player);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/phonon-backend-vlc-0.6.80~git20130930/src/phonon-vlc.json.in
new/phonon-backend-vlc-0.7.0~git20131104/src/phonon-vlc.json.in
--- old/phonon-backend-vlc-0.6.80~git20130930/src/phonon-vlc.json.in
2013-09-30 16:33:59.000000000 +0200
+++ new/phonon-backend-vlc-0.7.0~git20131104/src/phonon-vlc.json.in
2013-11-04 13:00:01.000000000 +0100
@@ -5,5 +5,5 @@
"Website": "http://www.videolan.org";,
"InterfaceVersion": 0,
- "InitialPreference": 10
+ "InitialPreference": 20
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/phonon-backend-vlc-0.6.80~git20130930/src/video/videodataoutput.cpp
new/phonon-backend-vlc-0.7.0~git20131104/src/video/videodataoutput.cpp
--- old/phonon-backend-vlc-0.6.80~git20130930/src/video/videodataoutput.cpp
2013-09-30 16:33:59.000000000 +0200
+++ new/phonon-backend-vlc-0.7.0~git20131104/src/video/videodataoutput.cpp
2013-11-04 13:00:01.000000000 +0100
@@ -50,11 +50,13 @@
void VideoDataOutput::handleConnectToMediaObject(MediaObject *mediaObject)
{
+ Q_UNUSED(mediaObject);
setCallbacks(m_player);
}
void VideoDataOutput::handleDisconnectFromMediaObject(MediaObject *mediaObject)
{
+ Q_UNUSED(mediaObject);
unsetCallbacks(m_player);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/phonon-backend-vlc-0.6.80~git20130930/src/vlc.desktop.cmake
new/phonon-backend-vlc-0.7.0~git20131104/src/vlc.desktop.cmake
--- old/phonon-backend-vlc-0.6.80~git20130930/src/vlc.desktop.cmake
2013-09-30 16:33:59.000000000 +0200
+++ new/phonon-backend-vlc-0.7.0~git20131104/src/vlc.desktop.cmake
2013-11-04 13:00:01.000000000 +0100
@@ -7,7 +7,7 @@
X-KDE-PhononBackendInfo-Version=@PHONON_VLC_VERSION@
X-KDE-PhononBackendInfo-Website=http://www.videolan.org/
Icon=vlc
-InitialPreference=10
+InitialPreference=20
Name=VLC
Name[bg]=VLC
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
