Title: [186110] trunk
- Revision
- 186110
- Author
- [email protected]
- Date
- 2015-06-30 00:17:52 -0700 (Tue, 30 Jun 2015)
Log Message
[CMake] Error when gst-plugins-base is missing is too confusing
https://bugs.webkit.org/show_bug.cgi?id=145682
Reviewed by Carlos Garcia Campos.
* Source/cmake/OptionsGTK.cmake: Error out if the required
GStreamer libraries are not found on the host.
Modified Paths
Diff
Modified: trunk/ChangeLog (186109 => 186110)
--- trunk/ChangeLog 2015-06-30 06:47:19 UTC (rev 186109)
+++ trunk/ChangeLog 2015-06-30 07:17:52 UTC (rev 186110)
@@ -1,3 +1,13 @@
+2015-06-30 Philippe Normand <[email protected]>
+
+ [CMake] Error when gst-plugins-base is missing is too confusing
+ https://bugs.webkit.org/show_bug.cgi?id=145682
+
+ Reviewed by Carlos Garcia Campos.
+
+ * Source/cmake/OptionsGTK.cmake: Error out if the required
+ GStreamer libraries are not found on the host.
+
2015-06-28 Philip Chimento <[email protected]>
CairoGL should be checked unconditionally
Modified: trunk/Source/cmake/OptionsGTK.cmake (186109 => 186110)
--- trunk/Source/cmake/OptionsGTK.cmake 2015-06-30 06:47:19 UTC (rev 186109)
+++ trunk/Source/cmake/OptionsGTK.cmake 2015-06-30 07:17:52 UTC (rev 186110)
@@ -354,18 +354,31 @@
if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
set(GSTREAMER_COMPONENTS app pbutils)
- SET_AND_EXPOSE_TO_BUILD(USE_GSTREAMER TRUE)
+
if (ENABLE_VIDEO)
list(APPEND GSTREAMER_COMPONENTS video mpegts tag gl)
endif ()
if (ENABLE_WEB_AUDIO)
list(APPEND GSTREAMER_COMPONENTS audio fft)
- SET_AND_EXPOSE_TO_BUILD(USE_WEBAUDIO_GSTREAMER TRUE)
endif ()
find_package(GStreamer 1.0.3 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})
+ if (ENABLE_WEB_AUDIO)
+ if (NOT PC_GSTREAMER_AUDIO_FOUND OR NOT PC_GSTREAMER_FFT_FOUND)
+ message(FATAL_ERROR "WebAudio requires the audio and fft GStreamer libraries. Please check your gst-plugins-base installation.")
+ else ()
+ SET_AND_EXPOSE_TO_BUILD(USE_WEBAUDIO_GSTREAMER TRUE)
+ endif ()
+ endif ()
+
+ if (ENABLE_VIDEO)
+ if (NOT PC_GSTREAMER_APP_FOUND OR NOT PC_GSTREAMER_PBUTILS_FOUND OR NOT PC_GSTREAMER_TAG_FOUND OR NOT PC_GSTREAMER_VIDEO_FOUND)
+ message(FATAL_ERROR "Video playback requires the following GStreamer libraries: app, pbutils, tag, video. Please check your gst-plugins-base installation.")
+ endif ()
+ endif ()
+
if (USE_GSTREAMER_MPEGTS)
if (NOT PC_GSTREAMER_MPEGTS_FOUND)
message(FATAL_ERROR "GStreamer MPEG-TS is needed for USE_GSTREAMER_MPEGTS.")
@@ -377,6 +390,8 @@
message(FATAL_ERROR "GStreamerGL is needed for USE_GSTREAMER_GL.")
endif ()
endif ()
+
+ SET_AND_EXPOSE_TO_BUILD(USE_GSTREAMER TRUE)
endif ()
if (ENABLE_X11_TARGET)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
