blob: d5f648568f31f6c3fd20cd369e16042cbf861ece [file] [log] [blame]
Patrick Williamsb48b7b42016-08-17 15:04:38 -05001From bea27fd919b64ee8d97996409e279e1e83d13594 Mon Sep 17 00:00:00 2001
2From: Jean-Louis Dupond <jean-louis@dupond.be>
3Date: Sun, 4 Oct 2015 18:17:33 +0200
4Subject: [PATCH] FindGStreamer_1_0: fix build failure for new gstreamer
5 versions
6
7---
8 cmake/FindGStreamer_1_0.cmake | 30 +++++++++++++++---------------
9 1 file changed, 15 insertions(+), 15 deletions(-)
10
11diff --git a/cmake/FindGStreamer_1_0.cmake b/cmake/FindGStreamer_1_0.cmake
12index f7bf990..3aa8fc6 100644
13--- a/cmake/FindGStreamer_1_0.cmake
14+++ b/cmake/FindGStreamer_1_0.cmake
15@@ -53,17 +53,17 @@ set(GSTREAMER_1_0_MINIMUM_VERSION 1.0.5)
16 # Helper macro to find a Gstreamer plugin (or Gstreamer itself)
17 # _component_prefix is prepended to the _INCLUDE_DIRS and _LIBRARIES variables (eg. "GSTREAMER_1_0_AUDIO")
18 # _pkgconfig_name is the component's pkg-config name (eg. "gstreamer-1.0", or "gstreamer-video-1.0").
19-# _header is the component's header, relative to the gstreamer-1.0 directory (eg. "gst/gst.h").
20 # _library is the component's library name (eg. "gstreamer-1.0" or "gstvideo-1.0")
21-macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _header _library)
22+macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _library)
23 # FIXME: The QUIET keyword can be used once we require CMake 2.8.2.
24- pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name})
25
26- find_path(${_component_prefix}_INCLUDE_DIRS
27- NAMES ${_header}
28- HINTS ${PC_${_component_prefix}_INCLUDE_DIRS} ${PC_${_component_prefix}_INCLUDEDIR}
29- PATH_SUFFIXES gstreamer-1.0
30- )
31+ string(REGEX MATCH "(.*)>=(.*)" _dummy "${_pkgconfig_name}")
32+ if ("${CMAKE_MATCH_2}" STREQUAL "")
33+ pkg_check_modules(PC_${_component_prefix} "${_pkgconfig_name} >= ${GStreamer_FIND_VERSION}")
34+ else ()
35+ pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name})
36+ endif ()
37+ set(${_component_prefix}_INCLUDE_DIRS ${PC_${_component_prefix}_INCLUDE_DIRS})
38
39 find_library(${_component_prefix}_LIBRARIES
40 NAMES ${_library} gstreamer_android
41@@ -78,8 +78,8 @@ endmacro()
42 # 1.1. Find headers and libraries
43 set(GLIB_ROOT_DIR ${GSTREAMER_1_0_ROOT_DIR})
44 find_package(Glib REQUIRED)
45-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gst/gst.h gstreamer-1.0)
46-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_BASE gstreamer-base-1.0 gst/gst.h gstbase-1.0)
47+FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gstreamer-1.0)
48+FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_BASE gstreamer-base-1.0 gstbase-1.0)
49
50 # 1.2. Check Gstreamer version
51 if (GSTREAMER_1_0_INCLUDE_DIRS)
52@@ -110,11 +110,11 @@ endif ()
53 # 2. Find Gstreamer plugins
54 # -------------------------
55
56-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_APP gstreamer-app-1.0 gst/app/gstappsink.h gstapp-1.0)
57-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_AUDIO gstreamer-audio-1.0 gst/audio/audio.h gstaudio-1.0)
58-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_FFT gstreamer-fft-1.0 gst/fft/gstfft.h gstfft-1.0)
59-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_PBUTILS gstreamer-pbutils-1.0 gst/pbutils/pbutils.h gstpbutils-1.0)
60-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_VIDEO gstreamer-video-1.0 gst/video/video.h gstvideo-1.0)
61+FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_APP gstreamer-app-1.0 gstapp-1.0)
62+FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_AUDIO gstreamer-audio-1.0 gstaudio-1.0)
63+FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_FFT gstreamer-fft-1.0 gstfft-1.0)
64+FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_PBUTILS gstreamer-pbutils-1.0 gstpbutils-1.0)
65+FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_VIDEO gstreamer-video-1.0 gstvideo-1.0)
66
67 # ------------------------------------------------
68 # 3. Process the COMPONENTS passed to FIND_PACKAGE
69--
702.6.4
71