diff --git a/desktop/toolkit/qt5/qt5-gstreamer/files/qt-gstreamer-1.6.patch b/desktop/toolkit/qt5/qt5-gstreamer/files/qt-gstreamer-1.6.patch new file mode 100644 index 0000000000..75752da9eb --- /dev/null +++ b/desktop/toolkit/qt5/qt5-gstreamer/files/qt-gstreamer-1.6.patch @@ -0,0 +1,38 @@ +From e2ca8094aa8d0eac1c3a98df66fe94ce0c754088 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Santamar=C3=ADa?= +Date: Fri, 2 Oct 2015 15:00:29 +0300 +Subject: Fix compilation with GStreamer >= 1.5.1 + +apply gstreamer pkg-config definitions To ensure gstreamer builds correctly, +pick up its cflags in FindGstreamer and apply them to the build as definitions + +https://lists.ubuntu.com/archives/kubuntu-devel/2015-August/009819.html + +https://bugzilla.gnome.org/show_bug.cgi?id=751382 + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4d3e7dd..5744015 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -106,6 +106,7 @@ find_package(GObject) + macro_log_feature(GOBJECT_FOUND "GObject" "Required to build QtGLib" "http://www.gtk.org/" TRUE) + + set(CMAKE_REQUIRED_INCLUDES ${QTGSTREAMER_INCLUDES}) ++add_definitions(${GSTREAMER_DEFINITIONS}) + include(CheckCXXSourceCompiles) + check_cxx_source_compiles(" + #include +diff --git a/cmake/modules/FindGStreamer.cmake b/cmake/modules/FindGStreamer.cmake +index dab91ac..fe6cde1 100644 +--- a/cmake/modules/FindGStreamer.cmake ++++ b/cmake/modules/FindGStreamer.cmake +@@ -36,6 +36,7 @@ if (PKG_CONFIG_FOUND) + exec_program(${PKG_CONFIG_EXECUTABLE} + ARGS --variable pluginsdir gstreamer-${GSTREAMER_ABI_VERSION} + OUTPUT_VARIABLE PKG_GSTREAMER_PLUGIN_DIR) ++ set(GSTREAMER_DEFINITIONS ${PKG_GSTREAMER_CFLAGS}) + endif() + + find_library(GSTREAMER_LIBRARY +-- +cgit v0.10.2 \ No newline at end of file diff --git a/desktop/toolkit/qt5/qt5-gstreamer/pspec.xml b/desktop/toolkit/qt5/qt5-gstreamer/pspec.xml index 22be1ab1a1..cad8f72d1c 100644 --- a/desktop/toolkit/qt5/qt5-gstreamer/pspec.xml +++ b/desktop/toolkit/qt5/qt5-gstreamer/pspec.xml @@ -22,12 +22,13 @@ cmake boost-devel doxygen - gst-plugins-good - gstreamer-next gstreamer-next-devel gst-plugins-base-next-devel mesa-devel + + qt-gstreamer-1.6.patch + @@ -69,7 +70,7 @@ - 2016-05-01 + 2016-05-03 1.2.0 Release Bump PisiLinux Community