qt-gstreamer/trunk/gstreamer-1.6.patch

   1 From e2ca8094aa8d0eac1c3a98df66fe94ce0c754088 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Santamar=C3=ADa?= <panfaust@gmail.com>
   3 Date: Fri, 2 Oct 2015 15:00:29 +0300
   4 Subject: Fix compilation with GStreamer >= 1.5.1
   5
   6 apply gstreamer pkg-config definitions To ensure gstreamer builds correctly,
   7 pick up its cflags in FindGstreamer and apply them to the build as definitions
   8
   9 https://lists.ubuntu.com/archives/kubuntu-devel/2015-August/009819.html
  10
  11 https://bugzilla.gnome.org/show_bug.cgi?id=751382
  12 ---
  13  CMakeLists.txt                    | 1 +
  14  cmake/modules/FindGStreamer.cmake | 1 +
  15  2 files changed, 2 insertions(+)
  16
  17 diff --git a/CMakeLists.txt b/CMakeLists.txt
  18 index 4d3e7dd..5744015 100644
  19 --- a/CMakeLists.txt
  20 +++ b/CMakeLists.txt
  21 @@ -106,6 +106,7 @@ find_package(GObject)
  22  macro_log_feature(GOBJECT_FOUND "GObject" "Required to build QtGLib" "http://www.gtk.org/" TRUE)
  23
  24  set(CMAKE_REQUIRED_INCLUDES ${QTGSTREAMER_INCLUDES})
  25 +add_definitions(${GSTREAMER_DEFINITIONS})
  26  include(CheckCXXSourceCompiles)
  27  check_cxx_source_compiles("
  28  #include <QtCore/QtGlobal>
  29 diff --git a/cmake/modules/FindGStreamer.cmake b/cmake/modules/FindGStreamer.cmake
  30 index dab91ac..fe6cde1 100644
  31 --- a/cmake/modules/FindGStreamer.cmake
  32 +++ b/cmake/modules/FindGStreamer.cmake
  33 @@ -36,6 +36,7 @@ if (PKG_CONFIG_FOUND)
  34      exec_program(${PKG_CONFIG_EXECUTABLE}
  35                   ARGS --variable pluginsdir gstreamer-${GSTREAMER_ABI_VERSION}
  36                   OUTPUT_VARIABLE PKG_GSTREAMER_PLUGIN_DIR)
  37 +    set(GSTREAMER_DEFINITIONS ${PKG_GSTREAMER_CFLAGS})
  38  endif()
  39
  40  find_library(GSTREAMER_LIBRARY
  41 --
  42 cgit v1.2.1
  43