[PlayStation] Update port options
https://bugs.webkit.org/show_bug.cgi?id=197723
Reviewed by Ross Kirsling.
.:
Update the options used.
* Source/cmake/OptionsPlayStation.cmake:
Tools:
ICU headers were missing from TestWTF.
* TestWebKitAPI/PlatformPlayStation.cmake:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@245083 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ChangeLog b/ChangeLog
index 2484488..21aca778 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2019-05-08 Don Olmstead <don.olmstead@sony.com>
+
+ [PlayStation] Update port options
+ https://bugs.webkit.org/show_bug.cgi?id=197723
+
+ Reviewed by Ross Kirsling.
+
+ Update the options used.
+
+ * Source/cmake/OptionsPlayStation.cmake:
+
2019-05-08 Ross Kirsling <ross.kirsling@sony.com>
Add .vs and .vscode directories to .gitignore.
diff --git a/Source/cmake/OptionsPlayStation.cmake b/Source/cmake/OptionsPlayStation.cmake
index 8d6556f..a4e8793 100644
--- a/Source/cmake/OptionsPlayStation.cmake
+++ b/Source/cmake/OptionsPlayStation.cmake
@@ -18,9 +18,10 @@
# Experimental features
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_APPLICATION_MANIFEST PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_PAINTING_API PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_TYPED_OM PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FILTERS_LEVEL_2 PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_REMOTE_INSPECTOR PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_WORKER PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VARIATION_FONTS PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
# Features to investigate
@@ -30,6 +31,9 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD PRIVATE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_AUDIO PRIVATE OFF)
+# Reenable after updating fontconfig
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VARIATION_FONTS PRIVATE OFF)
+
# No support planned
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTPDIR PRIVATE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GEOLOCATION PRIVATE OFF)
@@ -69,7 +73,6 @@
find_library(C_STD_LIBRARY c)
find_library(KERNEL_LIBRARY kernel)
-find_library(POSIX_COMPATABILITY_LIBRARY posixex)
find_package(Cairo REQUIRED)
find_package(CURL REQUIRED)
@@ -108,7 +111,9 @@
SET_AND_EXPOSE_TO_BUILD(USE_FREETYPE ON)
SET_AND_EXPOSE_TO_BUILD(USE_HARFBUZZ ON)
SET_AND_EXPOSE_TO_BUILD(USE_LIBWPE ON)
-SET_AND_EXPOSE_TO_BUILD(USE_INSPECTOR_SOCKET_SERVER ENABLE_REMOTE_INSPECTOR)
+
+SET_AND_EXPOSE_TO_BUILD(USE_INSPECTOR_SOCKET_SERVER ${ENABLE_REMOTE_INSPECTOR})
+SET_AND_EXPOSE_TO_BUILD(USE_UNIX_DOMAIN_SOCKETS ON)
# Rendering options
SET_AND_EXPOSE_TO_BUILD(ENABLE_GRAPHICS_CONTEXT_3D ON)
@@ -119,10 +124,9 @@
SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER ON)
SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER_GL ON)
SET_AND_EXPOSE_TO_BUILD(USE_TILED_BACKING_STORE ON)
-SET_AND_EXPOSE_TO_BUILD(USE_UNIX_DOMAIN_SOCKETS ON)
set(WTF_LIBRARY_TYPE STATIC)
-set(JavaScriptCore_LIBRARY_TYPE SHARED)
+set(JavaScriptCore_LIBRARY_TYPE STATIC)
set(WebCore_LIBRARY_TYPE STATIC)
set(ENABLE_API_TESTS ON)
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index bede58e..87ffd14 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+2019-05-08 Don Olmstead <don.olmstead@sony.com>
+
+ [PlayStation] Update port options
+ https://bugs.webkit.org/show_bug.cgi?id=197723
+
+ Reviewed by Ross Kirsling.
+
+ ICU headers were missing from TestWTF.
+
+ * TestWebKitAPI/PlatformPlayStation.cmake:
+
2019-05-08 Alex Christensen <achristensen@webkit.org>
Don't crash when DOMNode.addEventListener:listener:useCapture: is called with a nil listener
diff --git a/Tools/TestWebKitAPI/PlatformPlayStation.cmake b/Tools/TestWebKitAPI/PlatformPlayStation.cmake
index 952d043..abb8690f 100644
--- a/Tools/TestWebKitAPI/PlatformPlayStation.cmake
+++ b/Tools/TestWebKitAPI/PlatformPlayStation.cmake
@@ -10,6 +10,10 @@
generic/UtilitiesGeneric.cpp
)
+list(APPEND TestWTF_PRIVATE_INCLUDE_DIRECTORIES
+ ${ICU_INCLUDE_DIRS}
+)
+
list(APPEND TestWebCore_SOURCES
${test_main_SOURCES}
)
