Title: [227788] trunk
- Revision
- 227788
- Author
- [email protected]
- Date
- 2018-01-30 08:18:26 -0800 (Tue, 30 Jan 2018)
Log Message
[WebVR][GTK][WPE] Exclude OpenVR from tarballs
https://bugs.webkit.org/show_bug.cgi?id=182284
Reviewed by Michael Catanzaro.
.:
Added private build options for USE_OPENVR.
* Source/cmake/OptionsGTK.cmake:
* Source/cmake/OptionsWPE.cmake:
Tools:
* gtk/manifest.txt.in: Added ThirdParty/openvr to exclusions.
* wpe/manifest.txt.in: Ditto.
Modified Paths
Diff
Modified: trunk/ChangeLog (227787 => 227788)
--- trunk/ChangeLog 2018-01-30 16:13:15 UTC (rev 227787)
+++ trunk/ChangeLog 2018-01-30 16:18:26 UTC (rev 227788)
@@ -1,3 +1,15 @@
+2018-01-30 Sergio Villar Senin <[email protected]>
+
+ [WebVR][GTK][WPE] Exclude OpenVR from tarballs
+ https://bugs.webkit.org/show_bug.cgi?id=182284
+
+ Reviewed by Michael Catanzaro.
+
+ Added private build options for USE_OPENVR.
+
+ * Source/cmake/OptionsGTK.cmake:
+ * Source/cmake/OptionsWPE.cmake:
+
2018-01-30 Basuke Suzuki <[email protected]>
[WinCairo] Fix forwarding header conflict of WebKit on WinCairo
Modified: trunk/Source/cmake/OptionsGTK.cmake (227787 => 227788)
--- trunk/Source/cmake/OptionsGTK.cmake 2018-01-30 16:13:15 UTC (rev 227787)
+++ trunk/Source/cmake/OptionsGTK.cmake 2018-01-30 16:18:26 UTC (rev 227788)
@@ -87,6 +87,7 @@
# Private options specific to the GTK+ port. Changing these options is
# 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})
# FIXME: Can we use cairo-glesv2 to avoid this conflict?
WEBKIT_OPTION_CONFLICT(ENABLE_ACCELERATED_2D_CANVAS ENABLE_GLES2)
@@ -340,8 +341,6 @@
endif ()
endif ()
-SET_AND_EXPOSE_TO_BUILD(USE_OPENVR TRUE)
-
if (USE_UPOWER)
find_package(UPowerGLib)
if (NOT UPOWERGLIB_FOUND)
Modified: trunk/Source/cmake/OptionsWPE.cmake (227787 => 227788)
--- trunk/Source/cmake/OptionsWPE.cmake 2018-01-30 16:13:15 UTC (rev 227787)
+++ trunk/Source/cmake/OptionsWPE.cmake 2018-01-30 16:18:26 UTC (rev 227788)
@@ -33,6 +33,9 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL2 PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
+# Private options specific to the WPE port.
+WEBKIT_OPTION_DEFINE(USE_OPENVR "Whether to use OpenVR as WebVR backend." PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
+
if (CMAKE_SYSTEM_NAME MATCHES "Linux")
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOURCE_USAGE PRIVATE ON)
@@ -105,8 +108,6 @@
SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS TRUE)
SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS_THREADED TRUE)
-SET_AND_EXPOSE_TO_BUILD(USE_OPENVR TRUE)
-
set(FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders)
set(FORWARDING_HEADERS_WPE_DIR ${FORWARDING_HEADERS_DIR}/wpe)
set(FORWARDING_HEADERS_WPE_EXTENSION_DIR ${FORWARDING_HEADERS_DIR}/wpe-webextension)
Modified: trunk/Tools/ChangeLog (227787 => 227788)
--- trunk/Tools/ChangeLog 2018-01-30 16:13:15 UTC (rev 227787)
+++ trunk/Tools/ChangeLog 2018-01-30 16:18:26 UTC (rev 227788)
@@ -1,3 +1,13 @@
+2018-01-30 Sergio Villar Senin <[email protected]>
+
+ [WebVR][GTK][WPE] Exclude OpenVR from tarballs
+ https://bugs.webkit.org/show_bug.cgi?id=182284
+
+ Reviewed by Michael Catanzaro.
+
+ * gtk/manifest.txt.in: Added ThirdParty/openvr to exclusions.
+ * wpe/manifest.txt.in: Ditto.
+
2018-01-30 Yusuke Suzuki <[email protected]>
Unreviewed, try to fix JSCOnly build
Modified: trunk/Tools/gtk/manifest.txt.in (227787 => 227788)
--- trunk/Tools/gtk/manifest.txt.in 2018-01-30 16:13:15 UTC (rev 227787)
+++ trunk/Tools/gtk/manifest.txt.in 2018-01-30 16:18:26 UTC (rev 227788)
@@ -49,6 +49,7 @@
exclude Source/_javascript_Core/tests
exclude Source/ThirdParty/libwebrtc
exclude Source/ThirdParty/qunit
+exclude Source/ThirdParty/openvr
exclude Source/WebCore/platform/audio/resources
exclude Source/WebCore/bindings/scripts/test
exclude Source/WebCore/Resources
Modified: trunk/Tools/wpe/manifest.txt.in (227787 => 227788)
--- trunk/Tools/wpe/manifest.txt.in 2018-01-30 16:13:15 UTC (rev 227787)
+++ trunk/Tools/wpe/manifest.txt.in 2018-01-30 16:18:26 UTC (rev 227788)
@@ -49,6 +49,7 @@
exclude Source/_javascript_Core/tests
exclude Source/ThirdParty/libwebrtc
exclude Source/ThirdParty/qunit
+exclude Source/ThirdParty/openvr
exclude Source/WebCore/platform/audio/resources
exclude Source/WebCore/bindings/scripts/test
exclude Source/WebCore/Resources
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
