Hello community, here is the log from the commit of package phonon-backend-gstreamer-0_10 for openSUSE:Factory checked in at 2013-11-04 16:09:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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" Changes: -------- --- /work/SRC/openSUSE:Factory/phonon-backend-gstreamer-0_10/phonon-backend-gstreamer-0_10.changes 2013-09-16 12:38:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.phonon-backend-gstreamer-0_10.new/phonon-backend-gstreamer-0_10.changes 2013-11-04 16:09:36.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Nov 4 12:35:53 UTC 2013 - hrvoje.sen...@gmail.com + +- Update to 4.7.0~git20131104 + * Buildsystem fixes since previous snapshot + * Version bump to 4.7.0 + +------------------------------------------------------------------- Old: ---- phonon-backend-gstreamer-4.6.80~git20130915.tar.xz New: ---- phonon-backend-gstreamer-4.7.0~git20131104.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phonon-backend-gstreamer-0_10.spec ++++++ --- /var/tmp/diff_new_pack.EO8p8M/_old 2013-11-04 16:09:36.000000000 +0100 +++ /var/tmp/diff_new_pack.EO8p8M/_new 2013-11-04 16:09:36.000000000 +0100 @@ -17,14 +17,14 @@ Name: phonon-backend-gstreamer-0_10 -Version: 4.6.80~git20130915 +Version: 4.7.0~git20131104 Release: 0 Summary: Phonon Multimedia Platform Abstraction License: LGPL-2.0+ Group: System/GUI/KDE Url: http://phonon.kde.org/ %define filename phonon-backend-gstreamer -%define _phonon_version 4.6.80~git20130915 +%define _phonon_version 4.7.0~git20131104 Source0: %{filename}-%{version}.tar.xz # PATCH-FIX-UPSTREAM 0001-Fix-no-return-in-nonvoid-function.patch -- fixes build issue detected by post-build-checks Patch0: 0001-Fix-no-return-in-nonvoid-function.patch @@ -34,7 +34,7 @@ BuildRequires: fdupes BuildRequires: gstreamer-0_10-plugins-base-devel BuildRequires: kde4-filesystem -BuildRequires: phonon-devel >= 4.6.80~git20130915 +BuildRequires: phonon-devel >= 4.7.0~git20131104 BuildRequires: update-desktop-files BuildRequires: xz Requires: libphonon4 => %{_phonon_version} ++++++ phonon-backend-gstreamer-4.6.80~git20130915.tar.xz -> phonon-backend-gstreamer-4.7.0~git20131104.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-backend-gstreamer-4.6.80~git20130915/.gitignore new/phonon-backend-gstreamer-4.7.0~git20131104/.gitignore --- old/phonon-backend-gstreamer-4.6.80~git20130915/.gitignore 2013-09-09 13:30:06.000000000 +0200 +++ new/phonon-backend-gstreamer-4.7.0~git20131104/.gitignore 2013-11-04 12:52:32.000000000 +0100 @@ -1,2 +1,3 @@ *.swp build +build5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-backend-gstreamer-4.6.80~git20130915/CMakeLists.txt new/phonon-backend-gstreamer-4.7.0~git20131104/CMakeLists.txt --- old/phonon-backend-gstreamer-4.6.80~git20130915/CMakeLists.txt 2013-09-09 13:30:06.000000000 +0200 +++ new/phonon-backend-gstreamer-4.7.0~git20131104/CMakeLists.txt 2013-11-04 12:52:32.000000000 +0100 @@ -6,30 +6,18 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") 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") add_definitions(${QT_DEFINITIONS}) include_directories(${PHONON_INCLUDES} ${QT_INCLUDES}) set(PHONON_GST_MAJOR_VERSION "4") -set(PHONON_GST_MINOR_VERSION "6") -set(PHONON_GST_PATCH_VERSION "80") +set(PHONON_GST_MINOR_VERSION "7") +set(PHONON_GST_PATCH_VERSION "0") set(PHONON_GST_VERSION "${PHONON_GST_MAJOR_VERSION}.${PHONON_GST_MINOR_VERSION}.${PHONON_GST_PATCH_VERSION}") add_definitions(-DPHONON_GST_VERSION="${PHONON_GST_VERSION}") add_subdirectory(gstreamer) macro_display_feature_log() - -add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/phonon-backend-gstreamer-${PHONON_GST_VERSION}.tar.xz - COMMAND - git archive --prefix=phonon-backend-gstreamer-${PHONON_GST_VERSION}/ HEAD | xz > ${CMAKE_BINARY_DIR}/phonon-backend-gstreamer-${PHONON_GST_VERSION}.tar.xz - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} -) - -add_custom_target( - dist - DEPENDS ${CMAKE_BINARY_DIR}/phonon-backend-gstreamer-${PHONON_GST_VERSION}.tar.xz -) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-backend-gstreamer-4.6.80~git20130915/gstreamer/CMakeLists.txt new/phonon-backend-gstreamer-4.7.0~git20131104/gstreamer/CMakeLists.txt --- old/phonon-backend-gstreamer-4.6.80~git20130915/gstreamer/CMakeLists.txt 2013-09-09 13:30:06.000000000 +0200 +++ new/phonon-backend-gstreamer-4.7.0~git20131104/gstreamer/CMakeLists.txt 2013-11-04 12:52:32.000000000 +0100 @@ -95,7 +95,7 @@ target_link_libraries(phonon_gstreamer ${OPENGL_gl_LIBRARY}) endif(OPENGL_FOUND) - install(TARGETS phonon_gstreamer DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/phonon_backend) + install(TARGETS phonon_gstreamer DESTINATION ${BACKEND_INSTALL_DIR}) if(PHONON_BUILD_PHONON4QT5) # Instead of desktop files we are embedding the information into the plugin itself. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-backend-gstreamer-4.6.80~git20130915/gstreamer/medianode.cpp new/phonon-backend-gstreamer-4.7.0~git20131104/gstreamer/medianode.cpp --- old/phonon-backend-gstreamer-4.6.80~git20130915/gstreamer/medianode.cpp 2013-09-09 13:30:06.000000000 +0200 +++ new/phonon-backend-gstreamer-4.7.0~git20131104/gstreamer/medianode.cpp 2013-11-04 12:52:32.000000000 +0100 @@ -43,12 +43,14 @@ if (description & AudioSource) { m_audioTee = gst_element_factory_make("tee", NULL); + Q_ASSERT(m_audioTee); // Must not ever be null. gst_object_ref (GST_OBJECT (m_audioTee)); gst_object_sink (GST_OBJECT (m_audioTee)); } if (description & VideoSource) { m_videoTee = gst_element_factory_make("tee", NULL); + Q_ASSERT(m_videoTee); // Must not ever be null. gst_object_ref (GST_OBJECT (m_videoTee)); gst_object_sink (GST_OBJECT (m_videoTee)); } @@ -300,11 +302,13 @@ { // Rewire everything if ((description() & AudioSource)) { + Q_ASSERT(m_audioTee); if (!linkMediaNodeList(m_audioSinkList, root()->audioGraph(), m_audioTee, audioElement())) return false; } if ((description() & VideoSource)) { + Q_ASSERT(m_videoTee); if (!linkMediaNodeList(m_videoSinkList, root()->videoGraph(), m_videoTee, videoElement())) return false; } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org