[GTK] Fix the condition to enable/disable GSTREAMER_GL
authormagomez@igalia.com <magomez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 21 Jun 2017 15:50:48 +0000 (15:50 +0000)
committermagomez@igalia.com <magomez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 21 Jun 2017 15:50:48 +0000 (15:50 +0000)
https://bugs.webkit.org/show_bug.cgi?id=173650

Reviewed by Carlos Garcia Campos.

If GSTREAMER_GL is enabled, check for the GStreamer version. If the version is < 1.10, disable
GSTREAMER_GL and continue. If the version is >= 1.10 but there's no gstreamer-gl package available
then fail.

* Source/cmake/FindGStreamer.cmake:
* Source/cmake/OptionsGTK.cmake:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@218631 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/cmake/FindGStreamer.cmake
Source/cmake/OptionsGTK.cmake

index d560a99..35305f4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2017-06-21  Miguel Gomez  <magomez@igalia.com>
 
+        [GTK] Fix the condition to enable/disable GSTREAMER_GL
+        https://bugs.webkit.org/show_bug.cgi?id=173650
+
+        Reviewed by Carlos Garcia Campos.
+
+        If GSTREAMER_GL is enabled, check for the GStreamer version. If the version is < 1.10, disable
+        GSTREAMER_GL and continue. If the version is >= 1.10 but there's no gstreamer-gl package available
+        then fail.
+
+        * Source/cmake/FindGStreamer.cmake:
+        * Source/cmake/OptionsGTK.cmake:
+
+2017-06-21  Miguel Gomez  <magomez@igalia.com>
+
         [GTK] Enable GStreamer GL by default on production builds
         https://bugs.webkit.org/show_bug.cgi?id=173406
 
index 77c2d9d..4577817 100644 (file)
@@ -85,7 +85,7 @@ FIND_GSTREAMER_COMPONENT(GSTREAMER_BASE gstreamer-base-1.0 gstbase-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_GL gstreamer-gl-1.0>=1.8.0 gstgl-1.0)
+FIND_GSTREAMER_COMPONENT(GSTREAMER_GL gstreamer-gl-1.0 gstgl-1.0)
 FIND_GSTREAMER_COMPONENT(GSTREAMER_MPEGTS gstreamer-mpegts-1.0>=1.4.0 gstmpegts-1.0)
 FIND_GSTREAMER_COMPONENT(GSTREAMER_PBUTILS gstreamer-pbutils-1.0 gstpbutils-1.0)
 FIND_GSTREAMER_COMPONENT(GSTREAMER_TAG gstreamer-tag-1.0 gsttag-1.0)
index 2bf9abc..94a5a9f 100644 (file)
@@ -364,12 +364,13 @@ if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
     endif ()
 
     if (USE_GSTREAMER_GL)
-        if (NOT PC_GSTREAMER_GL_FOUND)
-            message(FATAL_ERROR "GStreamerGL is needed for USE_GSTREAMER_GL.")
-        endif ()
         if (PC_GSTREAMER_VERSION VERSION_LESS "1.10")
             set(USE_GSTREAMER_GL OFF)
             message(STATUS "Disabling GSTREAMER_GL as the GStreamer version is older than 1.10.")
+        else ()
+            if (NOT PC_GSTREAMER_GL_FOUND)
+                message(FATAL_ERROR "GStreamerGL is needed for USE_GSTREAMER_GL.")
+            endif ()
         endif ()
     endif ()