qt5-gstreamer-1.6.patch 1.5 KB

123456789101112131415161718192021222324252627282930313233343536373839
  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. apply gstreamer pkg-config definitions To ensure gstreamer builds correctly,
  6. pick up its cflags in FindGstreamer and apply them to the build as definitions
  7. https://lists.ubuntu.com/archives/kubuntu-devel/2015-August/009819.html
  8. https://bugzilla.gnome.org/show_bug.cgi?id=751382
  9. diff --git a/CMakeLists.txt b/CMakeLists.txt
  10. index 4d3e7dd..5744015 100644
  11. --- a/CMakeLists.txt
  12. +++ b/CMakeLists.txt
  13. @@ -106,6 +106,7 @@ find_package(GObject)
  14. macro_log_feature(GOBJECT_FOUND "GObject" "Required to build QtGLib" "http://www.gtk.org/" TRUE)
  15. set(CMAKE_REQUIRED_INCLUDES ${QTGSTREAMER_INCLUDES})
  16. +add_definitions(${GSTREAMER_DEFINITIONS})
  17. include(CheckCXXSourceCompiles)
  18. check_cxx_source_compiles("
  19. #include <QtCore/QtGlobal>
  20. diff --git a/cmake/modules/FindGStreamer.cmake b/cmake/modules/FindGStreamer.cmake
  21. index dab91ac..fe6cde1 100644
  22. --- a/cmake/modules/FindGStreamer.cmake
  23. +++ b/cmake/modules/FindGStreamer.cmake
  24. @@ -36,6 +36,7 @@ if (PKG_CONFIG_FOUND)
  25. exec_program(${PKG_CONFIG_EXECUTABLE}
  26. ARGS --variable pluginsdir gstreamer-${GSTREAMER_ABI_VERSION}
  27. OUTPUT_VARIABLE PKG_GSTREAMER_PLUGIN_DIR)
  28. + set(GSTREAMER_DEFINITIONS ${PKG_GSTREAMER_CFLAGS})
  29. endif()
  30. find_library(GSTREAMER_LIBRARY
  31. --
  32. cgit v0.10.2