From 77e58dae634fa1b282c64d435d32a2998c671b39 Mon Sep 17 00:00:00 2001
From: Hannes Weisbach <hannes.weisbach@mailbox.tu-dresden.de>
Date: Sun, 7 Jun 2015 13:37:48 +0200
Subject: Add pbutils include directory to include paths

Add directory with pbutils headers to the include_directories directive
for the auto tests.

https://bugzilla.gnome.org/show_bug.cgi?id=750493
---
 tests/auto/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index fd09bf8..6b53366 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(${GSTREAMER_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${QTGSTREAMER_INCLUDES})
+include_directories(${GSTREAMER_INCLUDE_DIR} ${GSTREAMER_PBUTILS_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${QTGSTREAMER_INCLUDES})
 add_definitions(${QTGSTREAMER_DEFINITIONS} -DGST_DISABLE_XML -DGST_DISABLE_LOADSAVE)
 add_definitions(-DSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${QTGSTREAMER_FLAGS}")
-- 
cgit v1.2.3


From 1d2edcc9562c8826fd17b5233691f4a313ab71c7 Mon Sep 17 00:00:00 2001
From: Heiko Becker <heirecka@exherbo.org>
Date: Fri, 7 Nov 2014 00:11:02 +0100
Subject: Workaround build failures with boost>=1.57 and moc

Otherwise I get the following error message:
'usr/include/boost/type_traits/detail/has_binary_operator.hp:50:
Parse error at "BOOST_JOIN"'. See
https://bugreports.qt-project.org/browse/QTBUG-22829 for details.

The old workaround to define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED
doesn't seem to work here.

https://bugzilla.gnome.org/show_bug.cgi?id=739752
---
 src/QGlib/connect.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/QGlib/connect.cpp b/src/QGlib/connect.cpp
index 9ff6fde..58a3367 100644
--- a/src/QGlib/connect.cpp
+++ b/src/QGlib/connect.cpp
@@ -21,8 +21,10 @@
 #include <QtCore/QHash>
 #include <QtCore/QMutex>
 #include <boost/multi_index_container.hpp>
+#ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829
 #include <boost/multi_index/sequenced_index.hpp>
 #include <boost/multi_index/ordered_index.hpp>
+#endif
 #include <boost/multi_index/member.hpp>
 
 namespace QGlib {
-- 
cgit v1.2.3


From e2ca8094aa8d0eac1c3a98df66fe94ce0c754088 Mon Sep 17 00:00:00 2001
From: José Manuel Santamaría <panfaust@gmail.com>
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
---
 CMakeLists.txt                    | 1 +
 cmake/modules/FindGStreamer.cmake | 1 +
 2 files changed, 2 insertions(+)

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 <QtCore/QtGlobal>
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 v1.2.3