Changeset 243481 in webkit

Timestamp:

Mar 25, 2019, 7:18:13 PM (7 years ago)

Author:

Adrian Perez de Castro

Message:

[WPE][GTK] Make building WebVR (w/OpenVR) not depend on ENABLE_EXPERIMENTAL_FEATURES
​https://bugs.webkit.org/show_bug.cgi?id=196223

Reviewed by Michael Catanzaro.

Disentangle USE_OPENVR from ENABLE_EXPERIMENTAL_FEATURES, making it
unneeded to include ThirdParty/openvr/ in release tarballs.

• Source/cmake/OptionsGTK.cmake: Set USE_OPENVR to OFF by default,

instead of making it use the value of ENABLE_EXPERIMENTAL_FEATURES.

• Source/cmake/OptionsWPE.cmake: Ditto.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/OptionsGTK.cmake (modified) (1 diff)
• Source/cmake/OptionsWPE.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2019-03-25  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [WPE][GTK] Make building WebVR (w/OpenVR) not depend on ENABLE_EXPERIMENTAL_FEATURES
+        https://bugs.webkit.org/show_bug.cgi?id=196223
+
+        Reviewed by Michael Catanzaro.
+
+        Disentangle USE_OPENVR from ENABLE_EXPERIMENTAL_FEATURES, making it
+        unneeded to include ThirdParty/openvr/ in release tarballs.
+
+        * Source/cmake/OptionsGTK.cmake: Set USE_OPENVR to OFF by default,
+        instead of making it use the value of ENABLE_EXPERIMENTAL_FEATURES.
+        * Source/cmake/OptionsWPE.cmake: Ditto.
+
 2019-03-25  Xan López  <xan@igalia.com>
 

trunk/Source/cmake/OptionsGTK.cmake

@@ -90 +90 @@
 # completely unsupported. They are intended for use only by WebKit developers.
 WEBKIT_OPTION_DEFINE(USE_REDIRECTED_XCOMPOSITE_WINDOW "Whether to use a Redirected XComposite Window for accelerated compositing in X11." PRIVATE ON)
-WEBKIT_OPTION_DEFINE(USE_OPENVR "Whether to use OpenVR as WebVR backend." PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
+WEBKIT_OPTION_DEFINE(USE_OPENVR "Whether to use OpenVR as WebVR backend." PRIVATE OFF)
 
 # FIXME: Can we use cairo-glesv2 to avoid this conflict?

trunk/Source/cmake/OptionsWPE.cmake

@@ -68 +68 @@
 
 # Private options specific to the WPE port.
-WEBKIT_OPTION_DEFINE(USE_OPENVR "Whether to use OpenVR as WebVR backend." PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
+WEBKIT_OPTION_DEFINE(USE_OPENVR "Whether to use OpenVR as WebVR backend." PRIVATE OFF)
 WEBKIT_OPTION_DEFINE(USE_GSTREAMER_HOLEPUNCH "Whether to enable GStreamer holepunch" PRIVATE OFF)
 WEBKIT_OPTION_DEFINE(USE_EXTERNAL_HOLEPUNCH "Whether to enable external holepunch" PRIVATE OFF)