Hello community, here is the log from the commit of package gstreamer-plugins-qt5 for openSUSE:Factory checked in at 2015-12-09 19:51:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gstreamer-plugins-qt5 (Old) and /work/SRC/openSUSE:Factory/.gstreamer-plugins-qt5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gstreamer-plugins-qt5" Changes: -------- --- /work/SRC/openSUSE:Factory/gstreamer-plugins-qt5/gstreamer-plugins-qt5.changes 2014-11-14 09:18:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gstreamer-plugins-qt5.new/gstreamer-plugins-qt5.changes 2015-12-09 22:18:50.000000000 +0100 @@ -1,0 +2,6 @@ +Sat Dec 5 21:21:11 UTC 2015 - cgiboudeaux@gmx.com + +- Add fix_gstconfig_detection.diff. Fixes build with recent GStreamer + versions. + +------------------------------------------------------------------- New: ---- fix_gstconfig_detection.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gstreamer-plugins-qt5.spec ++++++ --- /var/tmp/diff_new_pack.LlCodU/_old 2015-12-09 22:18:51.000000000 +0100 +++ /var/tmp/diff_new_pack.LlCodU/_new 2015-12-09 22:18:51.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package gstreamer-plugins-qt +# spec file for package gstreamer-plugins-qt5 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -28,18 +28,20 @@ Group: Productivity/Multimedia/Other 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 BuildRequires: bison BuildRequires: boost-devel BuildRequires: cmake >= 2.8.9 BuildRequires: doxygen -BuildRequires: kf5-filesystem BuildRequires: flex +BuildRequires: kf5-filesystem BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Declarative) +BuildRequires: pkgconfig(Qt5OpenGL) BuildRequires: pkgconfig(Qt5Qml) BuildRequires: pkgconfig(Qt5Quick) BuildRequires: pkgconfig(Qt5Test) -BuildRequires: pkgconfig(Qt5OpenGL) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(glib-2.0) @@ -64,6 +66,7 @@ %prep %setup -q -n qt-gstreamer-%{version} +%patch0 -p1 %package devel Summary: Include files and libraries mandatory for development ++++++ fix_gstconfig_detection.diff ++++++ diff --git a/cmake/modules/FindGStreamer.cmake b/cmake/modules/FindGStreamer.cmake index dab91ac..22e5b20 100644 --- a/cmake/modules/FindGStreamer.cmake +++ b/cmake/modules/FindGStreamer.cmake @@ -47,6 +47,22 @@ find_path(GSTREAMER_INCLUDE_DIR HINTS ${PKG_GSTREAMER_INCLUDE_DIRS} ${PKG_GSTREAMER_INCLUDEDIR} PATH_SUFFIXES gstreamer-${GSTREAMER_ABI_VERSION}) +# Newer versions of GStreamer put gstconfig.h under $lib/gstreamer-${GSTREAMER_ABI_VERSION}/include +find_path(GSTREAMER_CONF_INCLUDE_DIR gst/gstconfig.h + PATHS + ${PKG_GSTREAMER_INCLUDE_DIRS} + PATH_SUFFIXES gstreamer-${GSTREAMER_ABI_VERSION}) + +if(NOT GSTREAMER_CONF_INCLUDE_DIR) + message(STATUS "GStreamer: WARNING: gstconfig.h not found") +endif() + +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() + if (PKG_GSTREAMER_PLUGIN_DIR) set(_GSTREAMER_PLUGIN_DIR ${PKG_GSTREAMER_PLUGIN_DIR}) else()