diff -Nru phonon-backend-gstreamer-4.8.2/cmake/FindGStreamer.cmake phonon-backend-gstreamer-4.9.0/cmake/FindGStreamer.cmake --- phonon-backend-gstreamer-4.8.2/cmake/FindGStreamer.cmake 2014-12-27 14:05:27.000000000 +0000 +++ phonon-backend-gstreamer-4.9.0/cmake/FindGStreamer.cmake 2016-04-18 04:25:19.000000000 +0000 @@ -36,6 +36,27 @@ PATH_SUFFIXES gstreamer-1.0 ) +IF (NOT GSTREAMER_INCLUDE_DIR) + MESSAGE(STATUS "GStreamer: WARNING: include dir not found") +ENDIF (NOT GSTREAMER_INCLUDE_DIR) + +# Newer versions of GStreamer put gst-config.h under lib/gstreamer-1.0/include +FIND_PATH(GSTREAMER_CONF_INCLUDE_DIR gst/gstconfig.h + PATHS + ${PKG_GSTREAMER_INCLUDE_DIRS} + PATH_SUFFIXES gstreamer-1.0 gstreamer-1.0/include + ) + +IF (NOT GSTREAMER_CONF_INCLUDE_DIR) + MESSAGE(STATUS "GStreamer: WARNING: gstconfig.h not found") +ENDIF (NOT GSTREAMER_CONF_INCLUDE_DIR) + +IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_CONF_INCLUDE_DIR) + IF (NOT GSTREAMER_CONF_INCLUDE_DIR STREQUAL GSTREAMER_INCLUDE_DIR) + LIST(APPEND GSTREAMER_INCLUDE_DIR "${GSTREAMER_CONF_INCLUDE_DIR}") + ENDIF() +ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_CONF_INCLUDE_DIR) + FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-1.0 PATHS ${PKG_GSTREAMER_LIBRARY_DIRS} @@ -51,11 +72,6 @@ ${PKG_GSTREAMER_LIBRARY_DIRS} ) -IF (GSTREAMER_INCLUDE_DIR) -ELSE (GSTREAMER_INCLUDE_DIR) - MESSAGE(STATUS "GStreamer: WARNING: include dir not found") -ENDIF (GSTREAMER_INCLUDE_DIR) - IF (GSTREAMER_LIBRARIES) ELSE (GSTREAMER_LIBRARIES) MESSAGE(STATUS "GStreamer: WARNING: library not found") diff -Nru phonon-backend-gstreamer-4.8.2/CMakeLists.txt phonon-backend-gstreamer-4.9.0/CMakeLists.txt --- phonon-backend-gstreamer-4.8.2/CMakeLists.txt 2014-12-27 14:05:27.000000000 +0000 +++ phonon-backend-gstreamer-4.9.0/CMakeLists.txt 2016-04-18 04:25:19.000000000 +0000 @@ -1,13 +1,13 @@ +cmake_minimum_required(VERSION 2.8.9) project(PhononGStreamer) -cmake_minimum_required(VERSION 2.8.6 FATAL_ERROR) option(USE_INSTALL_PLUGIN "Use GStreamer codec installation API" TRUE) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") set(PHONON_GST_MAJOR_VERSION "4") -set(PHONON_GST_MINOR_VERSION "8") -set(PHONON_GST_PATCH_VERSION "2") +set(PHONON_GST_MINOR_VERSION "9") +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}") @@ -23,6 +23,10 @@ find_package(Qt5OpenGL) macro_log_feature(Qt5OpenGL_FOUND "Qt5 OpenGL" "Qt5 OpenGL support is required to compile the gstreamer backend for Phonon" "" FALSE) set(QT_QTOPENGL_FOUND Qt5OpenGL_FOUND) + + set(REQUIRED_QT_VERSION 5.2.0) + macro_optional_find_package(Qt5X11Extras ${REQUIRED_QT_VERSION}) + macro_log_feature(Qt5X11Extras_FOUND "Qt5X11Extras" "Qt5X11Extras is needed for the x11renderer" "http://doc.qt.io/qt-5/qtx11extras-index.html" FALSE "${REQUIRED_QT_VERSION}") else () macro_log_feature(QT_QTOPENGL_FOUND "Qt4 OpenGL" "Qt4 OpenGL support is required to compile the gstreamer backend for Phonon" "" FALSE) endif() @@ -49,8 +53,6 @@ find_package(LibXml2 REQUIRED) macro_log_feature(LIBXML2_FOUND "LibXml2" "LibXml2 is required to compile the gstreamer backend for Phonon" "http://xmlsoft.org/downloads.html" TRUE) - - add_subdirectory(gstreamer) macro_display_feature_log() diff -Nru phonon-backend-gstreamer-4.8.2/debian/changelog phonon-backend-gstreamer-4.9.0/debian/changelog --- phonon-backend-gstreamer-4.8.2/debian/changelog 2016-01-19 10:38:16.000000000 +0000 +++ phonon-backend-gstreamer-4.9.0/debian/changelog 2016-05-18 16:13:02.000000000 +0000 @@ -1,27 +1,40 @@ -phonon-backend-gstreamer (4:4.8.2-0ubuntu2) xenial; urgency=high +phonon-backend-gstreamer (4:4.9.0-1) unstable; urgency=medium - * Add extra-cmake-modules build-dep. - * Cherrypick upstream fixes for new locations of GStreamer headers. - - -- Dimitri John Ledkov Tue, 19 Jan 2016 10:37:26 +0000 - -phonon-backend-gstreamer (4:4.8.2-0ubuntu1) vivid; urgency=medium - - * This package was updated to 4.8.2 + [ Maximiliano Curia ] + * New upstream release (4.9.0). + * Update watch file + * Drop automoc build dependency. + Thanks to Александр Волко for reporting (Closes: 824124) + * debian/control: Update Vcs-Browser and Vcs-Git fields + * Bump Standards-Version to 3.9.8 + * Update build-deps and deps with the info from cmake + * Migrate to the automatic dbgsym packages + * Drop upstream applied patch: gstreamer-compatibility.patch + * Add missing build dependency, libqt5x11extras5-dev + + [ Automatic packaging ] + * Update build-deps and deps with the info from cmake + + -- Maximiliano Curia Wed, 18 May 2016 18:12:27 +0200 + +phonon-backend-gstreamer (4:4.8.2-2) unstable; urgency=medium + + * Fix Diane Trout's email address + * Fix ordering in copyright file. + * Create gstreamer-compatibility.patch (Closes: #802107) - -- Danile Pastushchak Mon, 29 Dec 2014 22:26:03 +0200 + -- Diane Trout Mon, 19 Oct 2015 14:40:24 -0700 -phonon-backend-gstreamer (4:4.8.1-1ubuntu0) vivid; urgency=medium +phonon-backend-gstreamer (4:4.8.2-1) unstable; urgency=medium + * Team upload. * New upstream release. + * Make phonon4qt5-backend-gstreamer provide phonon4qt5-backend instead of + phonon-backend. + * Fix the watch file. + * Bump Standards-Version to 3.9.6, no changes needed. - -- Mikhail Ivchenko Fri, 12 Dec 2014 16:01:42 +0000 - -phonon-backend-gstreamer (4:4.8.0-3ubuntu1) vivid; urgency=medium - - * sync with Debian, now building qt5 and qt4 out of one source again - - -- Jonathan Riddell Wed, 29 Oct 2014 17:59:29 +0000 + -- Felix Geyer Sun, 30 Aug 2015 12:19:39 +0200 phonon-backend-gstreamer (4:4.8.0-3) unstable; urgency=medium @@ -62,55 +75,6 @@ -- Maximiliano Curia Fri, 12 Sep 2014 17:39:17 +0200 -phonon-backend-gstreamer (4:4.7.80-0ubuntu1) utopic; urgency=medium - - * New upstream beta release - * Remove transitional packages phonon-backend-gstreamer1.0-common - phonon-backend-gstreamer1.0 phonon-backend-gstreamer1.0-dbg - - -- Jonathan Riddell Thu, 14 Aug 2014 14:36:15 +0200 - -phonon-backend-gstreamer (4:4.7.2+git20140710-0ubuntu1) utopic; urgency=medium - - * New upstream snapshot of 1.0-porting-for-merge branch - - -- Jonathan Riddell Thu, 10 Jul 2014 13:02:34 +0200 - -phonon-backend-gstreamer (4:4.7.1+git20140403-0ubuntu1) trusty; urgency=medium - - * Upstream snapshot from 1.0-porting-for-merge branch - - Transitional packages for phonon-backend-gstreamer1.0 - - Drop phonon4qt5-backend-gstreamer since it's built by a separate source - now - - -- Rohan Garg Thu, 03 Apr 2014 15:54:50 +0200 - -phonon-backend-gstreamer (4:4.7.1-1ubuntu4) trusty; urgency=medium - - * No change rebuild against libqtcore5a. - - -- Dimitri John Ledkov Fri, 14 Mar 2014 11:34:37 +0000 - -phonon-backend-gstreamer (4:4.7.1-1ubuntu3) trusty; urgency=low - - * Add build-dep on libqt5opengl5-dev - - -- Jonathan Riddell Wed, 11 Dec 2013 12:21:08 +0000 - -phonon-backend-gstreamer (4:4.7.1-1ubuntu2) trusty; urgency=low - - * Add missing build-dep on libphonon4qt5-dev and - libphonon4qt5experimental-dev - - -- Jonathan Riddell Wed, 11 Dec 2013 12:08:16 +0000 - -phonon-backend-gstreamer (4:4.7.1-1ubuntu1) trusty; urgency=low - - * Sync with Debian - * Build Phonon4Qt5 backend and create new and common package for it - - -- Jonathan Riddell Tue, 10 Dec 2013 12:53:31 +0000 - phonon-backend-gstreamer (4:4.7.1-1) unstable; urgency=low * New upstream release. @@ -171,65 +135,6 @@ -- Modestas Vainius Sun, 19 Feb 2012 18:51:23 +0200 -phonon-backend-gstreamer (4:4.7.0really4.6.3-0ubuntu2) saucy; urgency=low - - * Add gstreamer0.10-pulseaudio as alternate dep for gstreamer0.10-alsa - as phonon gstreamer actually supports either. (LP: #1154630) - - -- Harald Sitter Thu, 03 Oct 2013 12:37:03 +0200 - -phonon-backend-gstreamer (4:4.7.0really4.6.3-0ubuntu1) raring; urgency=low - - * New upstream release - - -- Harald Sitter Mon, 04 Feb 2013 14:30:52 +0100 - -phonon-backend-gstreamer (4:4.7.0really4.6.2-0ubuntu1) quantal; urgency=low - - * New upstream release - * Update watch file from bz2 archives to xz archives - - -- Harald Sitter Tue, 14 Aug 2012 10:41:07 +0200 - -phonon-backend-gstreamer (4:4.7.0really4.6.1-0ubuntu1) quantal; urgency=low - - * New upstream release - - -- Harald Sitter Mon, 16 Jul 2012 04:13:29 +0200 - -phonon-backend-gstreamer (4:4.7.0really4.6.0-0ubuntu1) precise; urgency=low - - * New upstream release. - * Bump build-dependency on phonon to 4:4.7.0really4.6.0. - - -- Felix Geyer Thu, 16 Feb 2012 21:50:11 +0100 - -phonon-backend-gstreamer (4:4.7.0really4.5.1-1ubuntu4) precise; urgency=low - - * Build for multiarch. - - Switch to debhelper compat level v9. - * Treat armhf the same as armel. - - -- Felix Geyer Thu, 15 Dec 2011 21:42:41 +0100 - -phonon-backend-gstreamer (4:4.7.0really4.5.1-1ubuntu3) oneiric; urgency=low - - * Build-depend on libx11-dev since it isn't pulled in on armel. (LP: #841450) - - -- Felix Geyer Wed, 14 Sep 2011 08:45:52 +0200 - -phonon-backend-gstreamer (4:4.7.0really4.5.1-1ubuntu2) oneiric; urgency=low - - * On armel: Build-conflict instead of build-depend on OpenGL. (LP: #707794) - - -- Felix Geyer Fri, 27 May 2011 22:47:44 +0200 - -phonon-backend-gstreamer (4:4.7.0really4.5.1-1ubuntu1) oneiric; urgency=low - - * Bump upstream version to 4:4.7.0*. - - -- Felix Geyer Fri, 27 May 2011 21:24:43 +0200 - phonon-backend-gstreamer (4:4.6.0really4.5.1-1) unstable; urgency=low * New upstream release. diff -Nru phonon-backend-gstreamer-4.8.2/debian/control phonon-backend-gstreamer-4.9.0/debian/control --- phonon-backend-gstreamer-4.8.2/debian/control 2016-01-19 10:36:16.000000000 +0000 +++ phonon-backend-gstreamer-4.9.0/debian/control 2016-05-18 16:13:02.000000000 +0000 @@ -1,32 +1,32 @@ Source: phonon-backend-gstreamer Section: sound Priority: optional -Maintainer: Debian/Kubuntu Qt/KDE Maintainers +Maintainer: Debian Qt/KDE Maintainers Uploaders: Modestas Vainius , - Lisandro Damián Nicanor Pérez Meyer , - Diane Trout -Build-Depends: automoc, - cmake (>= 2.8.6), - extra-cmake-modules, + Lisandro Damián Nicanor Pérez Meyer , + Diane Trout +Build-Depends: cmake (>= 2.8.9~), debhelper (>= 9~), + extra-cmake-modules, libasound2-dev [linux-any], libgl1-mesa-dev, libglib2.0-dev, libgstreamer-plugins-base1.0-dev, libgstreamer1.0-dev, libphonon-dev (>= 4:4.7.1~), - libphononexperimental-dev (>= 4:4.7.1~), libphonon4qt5-dev (>= 4:4.7.1~), libphonon4qt5experimental-dev (>= 4:4.7.1~), + libphononexperimental-dev (>= 4:4.7.1~), libqt4-dev (>= 4:4.8.1), libqt4-opengl-dev (>= 4:4.8.1), libqt5opengl5-dev, + libqt5x11extras5-dev (>= 5.2.0~), libxml2-dev, pkg-kde-tools (>= 0.12) -Standards-Version: 3.9.5 +Standards-Version: 3.9.8 Homepage: http://phonon.kde.org/ -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-std/phonon-backend-gstreamer.git -Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-std/phonon-backend-gstreamer.git +Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/kde-std/phonon-backend-gstreamer.git +Vcs-Git: https://anonscm.debian.org/git/pkg-kde/kde-std/phonon-backend-gstreamer.git Package: phonon-backend-gstreamer-common Architecture: any @@ -51,10 +51,10 @@ Multi-Arch: same Provides: phonon-backend Pre-Depends: ${misc:Pre-Depends} -Depends: phonon-backend-gstreamer-common (= ${binary:Version}), - gstreamer1.0-pulseaudio, - gstreamer1.0-alsa [linux-any] | gstreamer1.0-audiosink, +Depends: gstreamer1.0-alsa [linux-any] | gstreamer1.0-audiosink, gstreamer1.0-plugins-base, + gstreamer1.0-pulseaudio, + phonon-backend-gstreamer-common (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Recommends: gstreamer1.0-plugins-good @@ -69,29 +69,14 @@ popular free multimedia formats and gstreamer1.0-plugins-ugly to get support for popular MPEG audio formats like MP3. -Package: phonon-backend-gstreamer-dbg -Section: debug -Priority: extra -Architecture: any -Multi-Arch: same -Depends: phonon-backend-gstreamer (= ${binary:Version}), ${misc:Depends} -Replaces: phonon-dbg (<< 4:4.6.0really4.4.4) -Breaks: phonon-dbg (<< 4:4.6.0really4.4.4) -Description: debugging symbols for the Phonon GStreamer 1.0 backend - This package contains debugging symbols for the Phonon GStreamer 1.0 - backend. If you have a problem with this backend and wish to debug it or you - have been asked to provide a backtrace of the crash inside the Phonon - internals, you may find this package useful. - Package: phonon4qt5-backend-gstreamer Architecture: any Multi-Arch: same -Provides: phonon-backend +Provides: phonon4qt5-backend Pre-Depends: ${misc:Pre-Depends} -Depends: phonon-backend-gstreamer-common (= ${binary:Version}), - gstreamer1.0-pulseaudio | - gstreamer1.0-alsa [linux-any] | gstreamer1.0-audiosink, - gstreamer1.0-plugins-base, +Depends: gstreamer1.0-plugins-base, + gstreamer1.0-pulseaudio | gstreamer1.0-alsa [linux-any] | gstreamer1.0-audiosink, + phonon-backend-gstreamer-common (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Recommends: gstreamer1.0-plugins-good @@ -105,15 +90,3 @@ You should install gstreamer1.0-plugins-good to get support for playing popular free multimedia formats and gstreamer1.0-plugins-ugly to get support for popular MPEG audio formats like MP3. - -Package: phonon4qt5-backend-gstreamer-dbg -Section: debug -Priority: extra -Architecture: any -Multi-Arch: same -Depends: phonon4qt5-backend-gstreamer (= ${binary:Version}), ${misc:Depends} -Description: debugging symbols for the Phonon Qt5 GStreamer 1.0 backend - This package contains debugging symbols for the Phonon Qt5 GStreamer 1.0 - backend. If you have a problem with this backend and wish to debug it or you - have been asked to provide a backtrace of the crash inside the Phonon - internals, you may find this package useful. diff -Nru phonon-backend-gstreamer-4.8.2/debian/copyright phonon-backend-gstreamer-4.9.0/debian/copyright --- phonon-backend-gstreamer-4.8.2/debian/copyright 2014-12-12 16:00:47.000000000 +0000 +++ phonon-backend-gstreamer-4.9.0/debian/copyright 2016-05-18 16:13:02.000000000 +0000 @@ -1,10 +1,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Source: http://download.kde.org//stable/phonon/phonon-backend-gstreamer/*/phonon-backend-gstreamer-*.tar.xz -Files: debian/* -Copyright: 2008-2014 Debian Qt/KDE Maintainers -License: LGPL-2.1+ - Files: * Copyright: 2006-2008 Matthias Kretz 2001 CodeFactory AB @@ -40,6 +36,10 @@ 2010-2013 Harald Sitter License: BSD-3-clause +Files: debian/* +Copyright: 2008-2014 Debian Qt/KDE Maintainers +License: LGPL-2.1+ + License: LGPL-2.1+ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff -Nru phonon-backend-gstreamer-4.8.2/debian/patches/fing-gstreamer.patch phonon-backend-gstreamer-4.9.0/debian/patches/fing-gstreamer.patch --- phonon-backend-gstreamer-4.8.2/debian/patches/fing-gstreamer.patch 2016-01-19 10:38:41.000000000 +0000 +++ phonon-backend-gstreamer-4.9.0/debian/patches/fing-gstreamer.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -Description: Cherrypick upstream fixes for new locations of GStreamer headers. -Author: Dimitri John Ledkov - ---- phonon-backend-gstreamer-4.8.2.orig/cmake/FindGStreamer.cmake -+++ phonon-backend-gstreamer-4.8.2/cmake/FindGStreamer.cmake -@@ -36,6 +36,27 @@ FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst. - PATH_SUFFIXES gstreamer-1.0 - ) - -+IF (NOT GSTREAMER_INCLUDE_DIR) -+ MESSAGE(STATUS "GStreamer: WARNING: include dir not found") -+ENDIF (NOT GSTREAMER_INCLUDE_DIR) -+ -+# Newer versions of GStreamer put gst-config.h under lib/gstreamer-1.0/include -+FIND_PATH(GSTREAMER_CONF_INCLUDE_DIR gst/gstconfig.h -+ PATHS -+ ${PKG_GSTREAMER_INCLUDE_DIRS} -+ PATH_SUFFIXES gstreamer-1.0 gstreamer-1.0/include -+ ) -+ -+IF (NOT GSTREAMER_CONF_INCLUDE_DIR) -+ MESSAGE(STATUS "GStreamer: WARNING: gstconfig.h not found") -+ENDIF (NOT GSTREAMER_CONF_INCLUDE_DIR) -+ -+IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_CONF_INCLUDE_DIR) -+ IF (NOT GSTREAMER_CONF_INCLUDE_DIR STREQUAL GSTREAMER_INCLUDE_DIR) -+ LIST(APPEND GSTREAMER_INCLUDE_DIR "${GSTREAMER_CONF_INCLUDE_DIR}") -+ ENDIF() -+ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_CONF_INCLUDE_DIR) -+ - FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-1.0 - PATHS - ${PKG_GSTREAMER_LIBRARY_DIRS} -@@ -51,11 +72,6 @@ FIND_LIBRARY(GSTREAMER_APP_LIBRARY NAMES - ${PKG_GSTREAMER_LIBRARY_DIRS} - ) - --IF (GSTREAMER_INCLUDE_DIR) --ELSE (GSTREAMER_INCLUDE_DIR) -- MESSAGE(STATUS "GStreamer: WARNING: include dir not found") --ENDIF (GSTREAMER_INCLUDE_DIR) -- - IF (GSTREAMER_LIBRARIES) - ELSE (GSTREAMER_LIBRARIES) - MESSAGE(STATUS "GStreamer: WARNING: library not found") diff -Nru phonon-backend-gstreamer-4.8.2/debian/patches/series phonon-backend-gstreamer-4.9.0/debian/patches/series --- phonon-backend-gstreamer-4.8.2/debian/patches/series 2016-01-19 10:38:30.000000000 +0000 +++ phonon-backend-gstreamer-4.9.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -fing-gstreamer.patch diff -Nru phonon-backend-gstreamer-4.8.2/debian/phonon-backend-gstreamer.install phonon-backend-gstreamer-4.9.0/debian/phonon-backend-gstreamer.install --- phonon-backend-gstreamer-4.8.2/debian/phonon-backend-gstreamer.install 2014-12-12 16:00:47.000000000 +0000 +++ phonon-backend-gstreamer-4.9.0/debian/phonon-backend-gstreamer.install 2016-05-18 16:13:02.000000000 +0000 @@ -1,3 +1,2 @@ usr/lib/*/qt4/plugins/phonon_backend/phonon_gstreamer.so usr/share/kde4/services/phononbackends/gstreamer.desktop - diff -Nru phonon-backend-gstreamer-4.8.2/debian/rules phonon-backend-gstreamer-4.9.0/debian/rules --- phonon-backend-gstreamer-4.8.2/debian/rules 2014-12-12 16:00:47.000000000 +0000 +++ phonon-backend-gstreamer-4.9.0/debian/rules 2016-05-18 16:13:02.000000000 +0000 @@ -33,5 +33,5 @@ $(overridden_command) -B obj-qt5 override_dh_strip: - $(overridden_command) -pphonon-backend-gstreamer --dbg-package=phonon-backend-gstreamer-dbg - $(overridden_command) -pphonon4qt5-backend-gstreamer --dbg-package=phonon4qt5-backend-gstreamer-dbg + $(overridden_command) -pphonon-backend-gstreamer --dbgsym-migration='phonon-backend-gstreamer-dbg (<= 4:4.9.0-1~~)' + $(overridden_command) -pphonon4qt5-backend-gstreamer --dbgsym-migration='phonon4qt5-backend-gstreamer-dbg (<= 4:4.9.0-1~~)' diff -Nru phonon-backend-gstreamer-4.8.2/debian/source/format phonon-backend-gstreamer-4.9.0/debian/source/format --- phonon-backend-gstreamer-4.8.2/debian/source/format 2014-12-29 21:17:22.000000000 +0000 +++ phonon-backend-gstreamer-4.9.0/debian/source/format 2016-05-18 16:13:02.000000000 +0000 @@ -1 +1 @@ -3.0 (quilt) \ No newline at end of file +3.0 (quilt) diff -Nru phonon-backend-gstreamer-4.8.2/debian/upstream/metadata phonon-backend-gstreamer-4.9.0/debian/upstream/metadata --- phonon-backend-gstreamer-4.8.2/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ phonon-backend-gstreamer-4.9.0/debian/upstream/metadata 2016-05-18 16:13:02.000000000 +0000 @@ -0,0 +1,7 @@ +Name: phonon-gstreamer +Changelog: https://quickgit.kde.org/?p=phonon-gstreamer.git&a=log +Contact: kde-devel@kde.org +Donation: https://www.kde.org/community/donations/index.php +Repository: https://anongit.kde.org/phonon-gstreamer.git +Repository-Browse: https://quickgit.kde.org/?p=phonon-gstreamer.git +Security-Contact: security@kde.org diff -Nru phonon-backend-gstreamer-4.8.2/debian/watch phonon-backend-gstreamer-4.9.0/debian/watch --- phonon-backend-gstreamer-4.8.2/debian/watch 2014-12-12 16:00:47.000000000 +0000 +++ phonon-backend-gstreamer-4.9.0/debian/watch 2016-05-18 16:13:02.000000000 +0000 @@ -1,3 +1,3 @@ version=3 -http://download.kde.org//stable/phonon/phonon-backend-gstreamer/([\d.]+)/ phonon-backend-gstreamer-([\d.]+).tar.xz +http://download.kde.org//stable/phonon/phonon-backend-gstreamer/([\d.]+)/phonon-backend-gstreamer-([\d.]+).tar.xz diff -Nru phonon-backend-gstreamer-4.8.2/.gitignore phonon-backend-gstreamer-4.9.0/.gitignore --- phonon-backend-gstreamer-4.8.2/.gitignore 1970-01-01 00:00:00.000000000 +0000 +++ phonon-backend-gstreamer-4.9.0/.gitignore 2016-04-18 04:25:19.000000000 +0000 @@ -0,0 +1,3 @@ +*.swp +build +build5 diff -Nru phonon-backend-gstreamer-4.8.2/gstreamer/CMakeLists.txt phonon-backend-gstreamer-4.9.0/gstreamer/CMakeLists.txt --- phonon-backend-gstreamer-4.8.2/gstreamer/CMakeLists.txt 2014-12-27 14:05:27.000000000 +0000 +++ phonon-backend-gstreamer-4.9.0/gstreamer/CMakeLists.txt 2016-04-18 04:25:19.000000000 +0000 @@ -88,18 +88,35 @@ list(APPEND phonon_gstreamer_SRCS glrenderer.cpp) endif () -if(NOT WIN32) +set(BUILD_X11RENDERER TRUE) +if (PHONON_BUILD_PHONON4QT5) + if (Qt5X11Extras_FOUND) + set(BUILD_X11RENDERER TRUE) + endif() +elseif (NOT WIN32) + set(BUILD_X11RENDERER TRUE) +endif() + +if (BUILD_X11RENDERER) set(phonon_gstreamer_SRCS ${phonon_gstreamer_SRCS} x11renderer.cpp) -endif(NOT WIN32) + add_definitions(-DBUILD_X11RENDERER) +endif() automoc4_add_library(phonon_gstreamer MODULE ${phonon_gstreamer_SRCS}) set_target_properties(phonon_gstreamer PROPERTIES PREFIX "" AUTOMOC_MOC_OPTIONS ${AUTOMOC_MOC_OPTIONS} ) + qt5_use_modules(phonon_gstreamer Core Widgets) + +if(Qt5X11Extras_FOUND) + qt5_use_modules(phonon_gstreamer X11Extras) + target_link_libraries(phonon_gstreamer Qt5::X11Extras) +endif(Qt5X11Extras_FOUND) + target_link_libraries(phonon_gstreamer ${PHONON_LIBRARY} ${GSTREAMER_LIBRARIES} ${GSTREAMER_BASE_LIBRARY} ${GSTREAMER_INTERFACE_LIBRARY} diff -Nru phonon-backend-gstreamer-4.8.2/gstreamer/devicemanager.cpp phonon-backend-gstreamer-4.9.0/gstreamer/devicemanager.cpp --- phonon-backend-gstreamer-4.8.2/gstreamer/devicemanager.cpp 2014-12-27 14:05:27.000000000 +0000 +++ phonon-backend-gstreamer-4.9.0/gstreamer/devicemanager.cpp 2016-04-18 04:25:19.000000000 +0000 @@ -32,6 +32,9 @@ #include #include +#if QT_VERSION > QT_VERSION_CHECK(5, 0, 0) && defined(BUILD_X11RENDERER) +#include +#endif /* * This class manages the list of currently @@ -355,17 +358,23 @@ if (m_videoSinkWidget == "software") { return new WidgetRenderer(parent); } -#ifndef Q_WS_QWS - else if (m_videoSinkWidget == "xwindow") { - return new X11Renderer(parent); - } else { - GstElementFactory *srcfactory = gst_element_factory_find("ximagesink"); - if (srcfactory) { - gst_object_unref(srcfactory); +#if defined(BUILD_X11RENDERER) +#if QT_VERSION > QT_VERSION_CHECK(5, 0, 0) + else if (QX11Info::isPlatformX11()) { +#else + else { +#endif + if (m_videoSinkWidget == "xwindow") { return new X11Renderer(parent); + } else { + GstElementFactory *srcfactory = gst_element_factory_find("ximagesink"); + if (srcfactory) { + gst_object_unref(srcfactory); + return new X11Renderer(parent); + } } } -#endif +#endif // BUILD_X11RENDERER return new WidgetRenderer(parent); } #endif //QT_NO_PHONON_VIDEO diff -Nru phonon-backend-gstreamer-4.8.2/gstreamer/gstreamer.desktop.cmake phonon-backend-gstreamer-4.9.0/gstreamer/gstreamer.desktop.cmake --- phonon-backend-gstreamer-4.8.2/gstreamer/gstreamer.desktop.cmake 2014-12-27 14:05:27.000000000 +0000 +++ phonon-backend-gstreamer-4.9.0/gstreamer/gstreamer.desktop.cmake 2016-04-18 04:25:19.000000000 +0000 @@ -10,6 +10,7 @@ InitialPreference=15 Name=GStreamer +Name[ast]=GStreamer Name[bg]=GStreamer Name[bs]=Gstreamer Name[ca]=GStreamer @@ -115,7 +116,7 @@ Comment[sr@latin]=GStreamer kao pozadina Phonona Comment[sv]=Phonon Gstreamer-gränssnitt Comment[th]=โปรแกรมเบื้องหลัง GStreamer ของ Phonon -Comment[tr]=Phonon GStreamer arkaucu +Comment[tr]=Phonon GStreamer arka ucu Comment[ug]=Phonon GStreamer نىڭ ئارقائۇچى Comment[uk]=Модуль використання GStreamer у Phonon Comment[x-test]=xxPhonon GStreamer backendxx diff -Nru phonon-backend-gstreamer-4.8.2/.reviewboardrc phonon-backend-gstreamer-4.9.0/.reviewboardrc --- phonon-backend-gstreamer-4.8.2/.reviewboardrc 1970-01-01 00:00:00.000000000 +0000 +++ phonon-backend-gstreamer-4.9.0/.reviewboardrc 2016-04-18 04:25:19.000000000 +0000 @@ -0,0 +1,4 @@ +REVIEWBOARD_URL = "https://git.reviewboard.kde.org" +REPOSITORY = 'git://anongit.kde.org/phonon-gstreamer' +TARGET_GROUPS = 'phonon' +TARGET_PEOPLE = 'dvratil'