[packages/ewebkit] - fix gstreamer header location detection

[baggins]

commit f178b3dc6244334aa2d851dc40af5e89de3b30f1
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Nov 22 13:51:18 2015 +0100

    - fix gstreamer header location detection

 ewebkit.spec            |  2 ++
 gstreamer-headers.patch | 75 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+)
---
diff --git a/ewebkit.spec b/ewebkit.spec
index ca145ed..ec59658 100644
--- a/ewebkit.spec
+++ b/ewebkit.spec
@@ -27,6 +27,7 @@ Patch3:		%{name}-build.patch
 Patch4:		%{name}-x32.patch
 Patch5:		%{name}-glib.patch
 Patch6:		%{name}-link.patch
+Patch7:		gstreamer-headers.patch
 URL:		http://trac.enlightenment.org/e/wiki/EWebKit
 BuildRequires:	OpenGL-devel
 BuildRequires:	atk-devel >= 1:2.10.0
@@ -139,6 +140,7 @@ Pliki nagłówkowe biblioteki WebKit-EFL.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 # replace -g2 with -g1 to not run into 4 GB ar format limit
diff --git a/gstreamer-headers.patch b/gstreamer-headers.patch
new file mode 100644
index 0000000..14986c6
--- /dev/null
+++ b/gstreamer-headers.patch
@@ -0,0 +1,75 @@
+--- efl-webkit/Source/cmake/FindGStreamer.cmake.orig	2014-01-16 11:15:20.000000000 +0100
++++ efl-webkit/Source/cmake/FindGStreamer.cmake	2015-11-22 13:21:55.021797509 +0100
+@@ -50,16 +50,16 @@
+ # Helper macro to find a GStreamer plugin (or GStreamer itself)
+ #   _component_prefix is prepended to the _INCLUDE_DIRS and _LIBRARIES variables (eg. "GSTREAMER_AUDIO")
+ #   _pkgconfig_name is the component's pkg-config name (eg. "gstreamer-1.0", or "gstreamer-video-1.0").
+-#   _header is the component's header, relative to the gstreamer-1.0 directory (eg. "gst/gst.h").
+ #   _library is the component's library name (eg. "gstreamer-1.0" or "gstvideo-1.0")
+-macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _header _library)
+-    pkg_check_modules(PC_${_component_prefix} QUIET ${_pkgconfig_name})
++macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _library)
+ 
+-    find_path(${_component_prefix}_INCLUDE_DIRS
+-        NAMES ${_header}
+-        HINTS ${PC_${_component_prefix}_INCLUDE_DIRS} ${PC_${_component_prefix}_INCLUDEDIR}
+-        PATH_SUFFIXES gstreamer-1.0
+-    )
++    string(REGEX MATCH "(.*)>=(.*)" _dummy "${_pkgconfig_name}")
++    if ("${CMAKE_MATCH_2}" STREQUAL "")
++        pkg_check_modules(PC_${_component_prefix} "${_pkgconfig_name} >= ${GStreamer_FIND_VERSION}")
++    else ()
++        pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name})
++    endif ()
++    set(${_component_prefix}_INCLUDE_DIRS ${PC_${_component_prefix}_INCLUDE_DIRS})
+ 
+     find_library(${_component_prefix}_LIBRARIES
+         NAMES ${_library}
+@@ -72,40 +72,18 @@
+ # ------------------------
+ 
+ # 1.1. Find headers and libraries
+-FIND_GSTREAMER_COMPONENT(GSTREAMER gstreamer-1.0 gst/gst.h gstreamer-1.0)
+-FIND_GSTREAMER_COMPONENT(GSTREAMER_BASE gstreamer-base-1.0 gst/gst.h gstbase-1.0)
+-
+-# 1.2. Check GStreamer version
+-if (GSTREAMER_INCLUDE_DIRS)
+-    if (EXISTS "${GSTREAMER_INCLUDE_DIRS}/gst/gstversion.h")
+-        file(READ "${GSTREAMER_INCLUDE_DIRS}/gst/gstversion.h" GSTREAMER_VERSION_CONTENTS)
+-
+-        string(REGEX MATCH "#define +GST_VERSION_MAJOR +\\(([0-9]+)\\)" _dummy "${GSTREAMER_VERSION_CONTENTS}")
+-        set(GSTREAMER_VERSION_MAJOR "${CMAKE_MATCH_1}")
+-
+-        string(REGEX MATCH "#define +GST_VERSION_MINOR +\\(([0-9]+)\\)" _dummy "${GSTREAMER_VERSION_CONTENTS}")
+-        set(GSTREAMER_VERSION_MINOR "${CMAKE_MATCH_1}")
+-
+-        string(REGEX MATCH "#define +GST_VERSION_MICRO +\\(([0-9]+)\\)" _dummy "${GSTREAMER_VERSION_CONTENTS}")
+-        set(GSTREAMER_VERSION_MICRO "${CMAKE_MATCH_1}")
+-
+-        set(GSTREAMER_VERSION "${GSTREAMER_VERSION_MAJOR}.${GSTREAMER_VERSION_MINOR}.${GSTREAMER_VERSION_MICRO}")
+-    endif ()
+-endif ()
+-
+-if ("${GStreamer_FIND_VERSION}" VERSION_GREATER "${GSTREAMER_VERSION}")
+-    message(FATAL_ERROR "Required version (" ${GStreamer_FIND_VERSION} ") is higher than found version (" ${GSTREAMER_VERSION} ")")
+-endif ()
++FIND_GSTREAMER_COMPONENT(GSTREAMER gstreamer-1.0 gstreamer-1.0)
++FIND_GSTREAMER_COMPONENT(GSTREAMER_BASE gstreamer-base-1.0 gstbase-1.0)
+ 
+ # -------------------------
+ # 2. Find GStreamer plugins
+ # -------------------------
+ 
+-FIND_GSTREAMER_COMPONENT(GSTREAMER_APP gstreamer-app-1.0 gst/app/gstappsink.h gstapp-1.0)
+-FIND_GSTREAMER_COMPONENT(GSTREAMER_AUDIO gstreamer-audio-1.0 gst/audio/audio.h gstaudio-1.0)
+-FIND_GSTREAMER_COMPONENT(GSTREAMER_FFT gstreamer-fft-1.0 gst/fft/gstfft.h gstfft-1.0)
+-FIND_GSTREAMER_COMPONENT(GSTREAMER_PBUTILS gstreamer-pbutils-1.0 gst/pbutils/pbutils.h gstpbutils-1.0)
+-FIND_GSTREAMER_COMPONENT(GSTREAMER_VIDEO gstreamer-video-1.0 gst/video/video.h gstvideo-1.0)
++FIND_GSTREAMER_COMPONENT(GSTREAMER_APP gstreamer-app-1.0 gstapp-1.0)
++FIND_GSTREAMER_COMPONENT(GSTREAMER_AUDIO gstreamer-audio-1.0 gstaudio-1.0)
++FIND_GSTREAMER_COMPONENT(GSTREAMER_FFT gstreamer-fft-1.0 gstfft-1.0)
++FIND_GSTREAMER_COMPONENT(GSTREAMER_PBUTILS gstreamer-pbutils-1.0 gstpbutils-1.0)
++FIND_GSTREAMER_COMPONENT(GSTREAMER_VIDEO gstreamer-video-1.0 gstvideo-1.0)
+ 
+ # ------------------------------------------------
+ # 3. Process the COMPONENTS passed to FIND_PACKAGE
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ewebkit.git/commitdiff/f178b3dc6244334aa2d851dc40af5e89de3b30f1