Hello community,
here is the log from the commit of package phonon-backend-gstreamer for
openSUSE:Factory checked in at 2016-04-28 16:51:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/phonon-backend-gstreamer (Old)
and /work/SRC/openSUSE:Factory/.phonon-backend-gstreamer.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "phonon-backend-gstreamer"
Changes:
--------
---
/work/SRC/openSUSE:Factory/phonon-backend-gstreamer/phonon-backend-gstreamer.changes
2015-11-24 22:29:35.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.phonon-backend-gstreamer.new/phonon-backend-gstreamer.changes
2016-04-28 16:51:53.000000000 +0200
@@ -1,0 +2,12 @@
+Sat Apr 23 10:55:29 UTC 2016 - [email protected]
+
+- Remove now unused automoc4 BuildRequires
+
+-------------------------------------------------------------------
+Sat Apr 23 00:04:47 UTC 2016 - [email protected]
+
+- Update to 4.9.0
+ * No changelog provided
+- Drop upstreamed Fix-finding-recent-versions-of-GStreamer.patch
+
+-------------------------------------------------------------------
Old:
----
Fix-finding-recent-versions-of-GStreamer.patch
phonon-backend-gstreamer-4.8.2.tar.xz
New:
----
phonon-backend-gstreamer-4.9.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ phonon-backend-gstreamer.spec ++++++
--- /var/tmp/diff_new_pack.gph6Wl/_old 2016-04-28 16:51:54.000000000 +0200
+++ /var/tmp/diff_new_pack.gph6Wl/_new 2016-04-28 16:51:54.000000000 +0200
@@ -18,16 +18,13 @@
%define _phonon_version 4.6.50
Name: phonon-backend-gstreamer
-Version: 4.8.2
+Version: 4.9.0
Release: 0
Summary: Phonon Multimedia Platform Abstraction
License: LGPL-2.1 or LGPL-3.0
Group: System/GUI/KDE
Url: http://phonon.kde.org/
-Source:
http://download.kde.org/stable/phonon/%{name}/%{version}/src/%{name}-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM Fix-finding-recent-versions-of-GStreamer.patch
-Patch0: Fix-finding-recent-versions-of-GStreamer.patch
-BuildRequires: automoc4
+Source:
http://download.kde.org/stable/phonon/%{name}/%{version}/%{name}-%{version}.tar.xz
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: kde4-filesystem
@@ -52,8 +49,7 @@
This is the GStreamer backend for Phonon.
%prep
-%setup -q
-%patch0 -p1
+%setup -q -n phonon-gstreamer-%{version}
%build
%cmake_kde4 -d build
++++++ phonon-backend-gstreamer-4.8.2.tar.xz ->
phonon-backend-gstreamer-4.9.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/phonon-backend-gstreamer-4.8.2/.gitignore
new/phonon-gstreamer-4.9.0/.gitignore
--- old/phonon-backend-gstreamer-4.8.2/.gitignore 1970-01-01
01:00:00.000000000 +0100
+++ new/phonon-gstreamer-4.9.0/.gitignore 2016-04-18 06:25:19.000000000
+0200
@@ -0,0 +1,3 @@
+*.swp
+build
+build5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/phonon-backend-gstreamer-4.8.2/.reviewboardrc
new/phonon-gstreamer-4.9.0/.reviewboardrc
--- old/phonon-backend-gstreamer-4.8.2/.reviewboardrc 1970-01-01
01:00:00.000000000 +0100
+++ new/phonon-gstreamer-4.9.0/.reviewboardrc 2016-04-18 06:25:19.000000000
+0200
@@ -0,0 +1,4 @@
+REVIEWBOARD_URL = "https://git.reviewboard.kde.org";
+REPOSITORY = 'git://anongit.kde.org/phonon-gstreamer'
+TARGET_GROUPS = 'phonon'
+TARGET_PEOPLE = 'dvratil'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/phonon-backend-gstreamer-4.8.2/CMakeLists.txt
new/phonon-gstreamer-4.9.0/CMakeLists.txt
--- old/phonon-backend-gstreamer-4.8.2/CMakeLists.txt 2014-12-27
15:05:27.000000000 +0100
+++ new/phonon-gstreamer-4.9.0/CMakeLists.txt 2016-04-18 06:25:19.000000000
+0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/phonon-backend-gstreamer-4.8.2/cmake/FindGStreamer.cmake
new/phonon-gstreamer-4.9.0/cmake/FindGStreamer.cmake
--- old/phonon-backend-gstreamer-4.8.2/cmake/FindGStreamer.cmake
2014-12-27 15:05:27.000000000 +0100
+++ new/phonon-gstreamer-4.9.0/cmake/FindGStreamer.cmake 2016-04-18
06:25:19.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/phonon-backend-gstreamer-4.8.2/gstreamer/CMakeLists.txt
new/phonon-gstreamer-4.9.0/gstreamer/CMakeLists.txt
--- old/phonon-backend-gstreamer-4.8.2/gstreamer/CMakeLists.txt 2014-12-27
15:05:27.000000000 +0100
+++ new/phonon-gstreamer-4.9.0/gstreamer/CMakeLists.txt 2016-04-18
06:25:19.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/phonon-backend-gstreamer-4.8.2/gstreamer/devicemanager.cpp
new/phonon-gstreamer-4.9.0/gstreamer/devicemanager.cpp
--- old/phonon-backend-gstreamer-4.8.2/gstreamer/devicemanager.cpp
2014-12-27 15:05:27.000000000 +0100
+++ new/phonon-gstreamer-4.9.0/gstreamer/devicemanager.cpp 2016-04-18
06:25:19.000000000 +0200
@@ -32,6 +32,9 @@
#include <gst/gst.h>
#include <QtCore/QSettings>
+#if QT_VERSION > QT_VERSION_CHECK(5, 0, 0) && defined(BUILD_X11RENDERER)
+#include <QtX11Extras/QX11Info>
+#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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/phonon-backend-gstreamer-4.8.2/gstreamer/gstreamer.desktop.cmake
new/phonon-gstreamer-4.9.0/gstreamer/gstreamer.desktop.cmake
--- old/phonon-backend-gstreamer-4.8.2/gstreamer/gstreamer.desktop.cmake
2014-12-27 15:05:27.000000000 +0100
+++ new/phonon-gstreamer-4.9.0/gstreamer/gstreamer.desktop.cmake
2016-04-18 06:25:19.000000000 +0200
@@ -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
