Hello community,
here is the log from the commit of package gstreamer-plugins-qt5 for
openSUSE:Factory checked in at 2018-05-29 10:43:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gstreamer-plugins-qt5 (Old)
and /work/SRC/openSUSE:Factory/.gstreamer-plugins-qt5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gstreamer-plugins-qt5"
Tue May 29 10:43:32 2018 rev:7 rq:612097 version:1.2.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/gstreamer-plugins-qt5/gstreamer-plugins-qt5.changes
2017-02-06 15:05:47.388968986 +0100
+++
/work/SRC/openSUSE:Factory/.gstreamer-plugins-qt5.new/gstreamer-plugins-qt5.changes
2018-05-29 10:43:34.939454297 +0200
@@ -1,0 +2,5 @@
+Thu May 24 22:51:19 UTC 2018 - [email protected]
+
+- Add fix-build-with-Qt-5_11.patch. Fixes build with Qt 5.11.
+
+-------------------------------------------------------------------
New:
----
fix-build-with-Qt-5_11.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gstreamer-plugins-qt5.spec ++++++
--- /var/tmp/diff_new_pack.mH5cFC/_old 2018-05-29 10:43:35.443435697 +0200
+++ /var/tmp/diff_new_pack.mH5cFC/_new 2018-05-29 10:43:35.443435697 +0200
@@ -1,7 +1,7 @@
#
# spec file for package gstreamer-plugins-qt5
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,22 +24,20 @@
Version: 1.2.0
Release: 0
Summary: C++/Qt bindings for GStreamer
-License: LGPL-2.1+
+License: LGPL-2.1-or-later
Group: Productivity/Multimedia/Other
-Url: http://gstreamer.freedesktop.org/wiki/QtGStreamer
+URL: http://gstreamer.freedesktop.org/wiki/QtGStreamer
Source:
http://gstreamer.freedesktop.org/src/qt-gstreamer/qt-gstreamer-%{version}.tar.xz
# PATCH-FIX-OPENSUSE fix_gstconfig_detection.diff
Patch0: fix_gstconfig_detection.diff
+# PATCH-FIX-UPSTREAM fix-build-with-Qt-5_11.patch
+Patch1: fix-build-with-Qt-5_11.patch
BuildRequires: bison
-%if 0%{?suse_version} > 1325
-BuildRequires: libboost_headers-devel
-%else
-BuildRequires: boost-devel
-%endif
BuildRequires: cmake >= 2.8.9
BuildRequires: doxygen
BuildRequires: flex
BuildRequires: kf5-filesystem
+BuildRequires: pkgconfig
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5OpenGL)
BuildRequires: pkgconfig(Qt5Qml)
@@ -55,7 +53,11 @@
BuildRequires: pkgconfig(gstreamer-pbutils-1.0)
BuildRequires: pkgconfig(gstreamer-plugins-base-1.0)
BuildRequires: pkgconfig(gstreamer-video-1.0)
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} > 1325
+BuildRequires: libboost_headers-devel
+%else
+BuildRequires: boost-devel
+%endif
%description
GStreamer is a streaming-media framework, based on graphs of filters
@@ -67,20 +69,16 @@
This package contains C++/Qt bindings for GStreamer.
-%prep
-%setup -q -n qt-gstreamer-%{version}
-%patch0 -p1
-
%package devel
Summary: Include files and libraries mandatory for development
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
+Requires: pkgconfig(Qt5Gui)
%if 0%{?suse_version} > 1325
Requires: libboost_headers-devel
%else
Requires: boost-devel
%endif
-Requires: pkgconfig(Qt5Gui)
%description devel
GStreamer is a streaming-media framework, based on graphs of filters
@@ -93,6 +91,9 @@
This package contains development files and headers for the C++/Qt
bindings for GStreamer.
+%prep
+%autosetup -p1 -n qt-gstreamer-%{version}
+
%build
%if "%{?_lib}" == "lib64"
SUFFIX="64"
@@ -109,8 +110,8 @@
%postun -p /sbin/ldconfig
%files
-%defattr(-,root,root)
-%doc COPYING HACKING NEWS README
+%license COPYING
+%doc HACKING NEWS README
%{_libdir}/libQt5GLib-2.0.so.*
%{_libdir}/libQt5GStreamer-%{gstnum}.so.*
%{_libdir}/libQt5GStreamerQuick-%{gstnum}.so.*
@@ -120,7 +121,6 @@
%{_libdir}/gstreamer-%{gstnum}/libgstqt5videosink.so
%files devel
-%defattr(-,root,root)
%{_libdir}/cmake/Qt5GStreamer/
%{_includedir}/Qt5GStreamer/
%{_libdir}/libQt5GLib-2.0.so
++++++ fix-build-with-Qt-5_11.patch ++++++
>From 1967da1ffcf04eddbc250c65d6f6efce4b77fe4b Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <[email protected]>
Date: Sun, 15 Apr 2018 23:46:50 +0200
Subject: Fix cmake with Qt 5.11_beta3 (dropping qt5_use_modules)
https://bugzilla.gnome.org/show_bug.cgi?id=795285
---
cmake/modules/FindQt4or5.cmake | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/cmake/modules/FindQt4or5.cmake b/cmake/modules/FindQt4or5.cmake
index 855a48e..d73b3a2 100644
--- a/cmake/modules/FindQt4or5.cmake
+++ b/cmake/modules/FindQt4or5.cmake
@@ -49,6 +49,16 @@ macro(_qt4or5_component_names_to_qt_components output_list)
list(REMOVE_DUPLICATES ${output_list})
endmacro()
+macro(_qt5_component_names_to_target_link_libaries output_list)
+ foreach(module ${ARGN})
+ _qt4or5_component_name_to_qt_component(qt_component ${module})
+ list(APPEND ${output_list} Qt5::${qt_component})
+ unset(qt_component)
+ endforeach()
+
+ list(REMOVE_DUPLICATES ${output_list})
+endmacro()
+
if (Qt4or5_FIND_QUIETLY)
set(_Qt4or5_FIND_PACKAGE_ARGS QUIET)
endif()
@@ -195,13 +205,13 @@ function(qt4or5_use_modules _target _link_type)
set(modules ${_link_type} ${ARGN})
endif()
- _qt4or5_component_names_to_qt_components(real_modules ${modules})
-
# Verify that Qt5 was found before using qt5_* macros,
# otherwise cmake will bail out if they are undefined.
if (${QT_VERSION} STREQUAL "5" AND Qt5Core_FOUND)
- qt5_use_modules(${_target} ${link_type} ${real_modules})
+ _qt5_component_names_to_target_link_libaries(real_modules ${modules})
+ target_link_libraries(${_target} ${link_type} ${real_modules})
elseif (${QT_VERSION} STREQUAL "4")
+ _qt4or5_component_names_to_qt_components(real_modules ${modules})
qt4_use_modules(${_target} ${link_type} ${real_modules})
endif()
endfunction()
--
cgit v1.1
