commit phonon-backend-gstreamer-0_10 for openSUSE:Factory

Hello community, here is the log from the commit of package phonon-backend-gstreamer-0_10 for openSUSE:Factory checked in at 2012-01-05 13:49:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/phonon-backend-gstreamer-0_10 (Old) and /work/SRC/openSUSE:Factory/.phonon-backend-gstreamer-0_10.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "phonon-backend-gstreamer-0_10", Maintainer is "kde-maintainers@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/phonon-backend-gstreamer-0_10/phonon-backend-gstreamer-0_10.changes 2011-10-16 12:58:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.phonon-backend-gstreamer-0_10.new/phonon-backend-gstreamer-0_10.changes 2012-01-05 13:49:41.000000000 +0100 @@ -1,0 +2,18 @@ +Tue Jan 3 11:42:26 UTC 2012 - cgiboudeaux@gmx.com + +- Update to 4.6RC1 + * Gapless playback + * Improved subtitles + * Misc fixes in audio fade in and out + * Fixes to KIO streaming + * A handful of fixed memory leaks + * Multichannel AudioDataOutput support + * Thread safety! + * Removed a hard dependency on ALSA + * Lots of lines of code wiped out + * Usage of playbin2 in GStreamer insead of a fragile, hand-made pipeline + * More debugging tools fort us + * More plugin installation fixes +- Apply commit cf8f37 from upstream to build the backend with Phonon 4.6 + +------------------------------------------------------------------- Old: ---- phonon-backend-gstreamer-4.5.1.tar.bz2 stoptimer.diff New: ---- fix_build.diff phonon-backend-gstreamer-4.5.90.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phonon-backend-gstreamer-0_10.spec ++++++ --- /var/tmp/diff_new_pack.vEN6NR/_old 2012-01-05 13:49:42.000000000 +0100 +++ /var/tmp/diff_new_pack.vEN6NR/_new 2012-01-05 13:49:42.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package phonon-backend-gstreamer-0_10 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,18 +16,17 @@ # - Name: phonon-backend-gstreamer-0_10 -Version: 4.5.1 -Release: 1 -License: LGPL-2.0+ +Version: 4.5.90 +Release: 0 Summary: Phonon Multimedia Platform Abstraction -Url: http://phonon.kde.org/ +License: LGPL-2.0+ Group: System/GUI/KDE +Url: http://phonon.kde.org/ %define filename phonon-backend-gstreamer -%define _phonon_version 4.5.0 +%define _phonon_version 4.6.0 Source0: %{filename}-%{version}.tar.bz2 -Patch0: stoptimer.diff +Patch0: fix_build.diff BuildRequires: alsa-devel BuildRequires: automoc4 BuildRequires: cmake ++++++ fix_build.diff ++++++ commit cf8f37f2571e466491f817144a089abf43c4f009 Author: Harald Sitter Date: Tue Dec 27 19:11:56 2011 +0100 Build even if Phonon was built without experimental Building phonon without the experimental is possible and actually default in git master due to intermediate breakage, so support this case properly. BUG: 289773 FIXED-IN: 4.6.0 diff --git a/gstreamer/CMakeLists.txt b/gstreamer/CMakeLists.txt index ac19f14..79dbb89 100644 --- a/gstreamer/CMakeLists.txt +++ b/gstreamer/CMakeLists.txt @@ -27,9 +27,6 @@ if (BUILD_PHONON_GSTREAMER) ${LIBXML2_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH}) add_definitions(-DPHONON_BACKEND_VERSION_4_2) - if (PHONON_FOUND_EXPERIMENTAL) - add_definitions(-DPHONON_EXPERIMENTAL) - endif (PHONON_FOUND_EXPERIMENTAL) # configure plugin api if(USE_INSTALL_PLUGIN) @@ -56,12 +53,16 @@ if (BUILD_PHONON_GSTREAMER) plugininstaller.cpp qwidgetvideosink.cpp streamreader.cpp - videodataoutput.cpp videowidget.cpp volumefadereffect.cpp widgetrenderer.cpp ) + if(PHONON_FOUND_EXPERIMENTAL) + add_definitions(-DPHONON_EXPERIMENTAL) + list(APPEND phonon_gstreamer_SRCS videodataoutput.cpp) + endif(PHONON_FOUND_EXPERIMENTAL) + if(OPENGL_FOUND) list(APPEND phonon_gstreamer_SRCS glrenderer.cpp) endif(OPENGL_FOUND) diff --git a/gstreamer/backend.cpp b/gstreamer/backend.cpp index 6e93414..bccb933 100644 --- a/gstreamer/backend.cpp +++ b/gstreamer/backend.cpp @@ -18,7 +18,9 @@ #include "backend.h" #include "audiooutput.h" #include "audiodataoutput.h" +#ifdef PHONON_EXPERIMENTAL #include "videodataoutput.h" +#endif #include "audioeffect.h" #include "mediaobject.h" #include "videowidget.h" @@ -144,9 +146,11 @@ QObject *Backend::createObject(BackendInterface::Class c, QObject *parent, const return new AudioDataOutput(this, parent); #ifndef QT_NO_PHONON_VIDEO +#ifdef PHONON_EXPERIMENTAL case VideoDataOutputClass: return new VideoDataOutput(this, parent); break; +#endif case VideoWidgetClass: { QWidget *widget = qobject_cast(parent); ++++++ phonon-backend-gstreamer-4.5.1.tar.bz2 -> phonon-backend-gstreamer-4.5.90.tar.bz2 ++++++ ++++ 8243 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org