package/wpe/wpewebkit: update config options for 2.38

Honour build configuration options for WebKit 2.38, trying to organize
groups of options in a logical way:

- Add a dummy BR2_PACKAGE_WPEWEBKIT_WEBDRIVER which is always set to
  enable for 2.22, this way it is possible to hoist the checks for the
  feature out of version conditionals.
- Group shared options among versions, e.g. 2.28 and 2.38 share a good
  deal of them and it is possible to use the same logic for both.
- Then there are only a few remaining options which only apply to 2.38,
  and those go into their own conditional section.

Signed-off-by: Adrian Perez de Castro <[email protected]>

Author: aperezdc

package/wpe/wpewebkit/Config.in

@@ -168,6 +168,20 @@ config BR2_PACKAGE_WPEWEBKIT_USE_GSTREAMER_WEBKIT_HTTP_SRC
 	help
 	  Use the WebKit network resource loader to download Media data over HTTP(S)
 
+config BR2_PACKAGE_WPEWEBKIT_ENABLE_TEXT_SINK
+	bool "Enable text sink"
+	default y
+	help
+	  Defines ENABLE_TEXT_SINK=ON
+
+config BR2_PACKAGE_WPEWEBKIT_WEBDRIVER
+	bool
+	default y
+
+endif
+
+if BR2_PACKAGE_WPEWEBKIT2_22 || BR2_PACKAGE_WPEWEBKIT2_38
+
 config BR2_PACKAGE_WPEWEBKIT_ENABLE_NATIVE_VIDEO
 	bool "Enable native video"
 	default y
@@ -180,12 +194,6 @@ config BR2_PACKAGE_WPEWEBKIT_ENABLE_NATIVE_AUDIO
 	help
 	  Defines ENABLE_NATIVE_AUDIO=ON
 
-config BR2_PACKAGE_WPEWEBKIT_ENABLE_TEXT_SINK
-	bool "Enable text sink"
-	default y
-	help
-	  Defines ENABLE_TEXT_SINK=ON
-
 endif
 
 config BR2_PACKAGE_WPEWEBKIT2_38_GST_DEPS

package/wpe/wpewebkit/wpewebkit.mk

@@ -38,10 +38,27 @@ WPEWEBKIT_CONF_OPTS = \
 	-DPORT=WPE \
 	-DCMAKE_EXPORT_COMPILE_COMMANDS=ON
 
-ifeq ($(BR2_PACKAGE_WPEWEBKIT2_22),y)
+ifeq ($(BR2_PACKAGE_WPEWEBKIT2_22)$(BR2_PACKAGE_WPEWEBKIT2_28),y)
+WPEWEBKIT_CONF_OPTS += \
+	-DENABLE_ACCELERATED_2D_CANVAS=ON
+endif
+
+ifeq ($(BR2_PACKAGE_WPEWEBKIT2_28),y)
+WPEWEBKIT_CONF_OPTS += \
+	-DSILENCE_CROSS_COMPILATION_NOTICES=ON
+endif
+
+ifeq ($(BR2_PACKAGE_WPEWEBKIT2_28)$(BR2_PACKAGE_WPEWEBKIT2_38),y)
+WPEWEBKIT_CONF_OPTS += \
+	-DENABLE_ACCESSIBILITY=OFF \
+	-DENABLE_API_TESTS=OFF \
+	-DENABLE_BUBBLEWRAP_SANDBOX=OFF \
+	-DENABLE_MINIBROWSER=OFF \
+	-DUSE_WOFF2=OFF
+endif
 
+ifeq ($(BR2_PACKAGE_WPEWEBKIT2_22),y)
 WPEWEBKIT_CONF_OPTS += \
-	-DENABLE_ACCELERATED_2D_CANVAS=ON \
 	-DENABLE_DATABASE_PROCESS=OFF \
 	-DENABLE_DEVICE_ORIENTATION=OFF \
 	-DENABLE_FETCH_API=OFF \
@@ -58,15 +75,12 @@ WPEWEBKIT_CONF_OPTS += \
 	-DENABLE_SUBTLE_CRYPTO=OFF \
 	-DENABLE_SVG_FONTS=OFF \
 	-DENABLE_TOUCH_EVENTS=OFF \
+	-DENABLE_VIDEO=ON \
+	-DENABLE_VIDEO_TRACK=ON \
 	-DENABLE_WEBASSEMBLY=OFF \
-	-DENABLE_WEBDRIVER=ON \
 	-DEXPORT_DEPRECATED_WEBKIT2_C_API=ON
-
 WPEWEBKIT_DEPENDENCIES += gstreamer1 gst1-plugins-base \
 	gst1-plugins-good gst1-plugins-bad
-WPEWEBKIT_CONF_OPTS += \
-	-DENABLE_VIDEO=ON \
-	-DENABLE_VIDEO_TRACK=ON
 
 ifeq ($(BR2_PACKAGE_WPEWEBKIT_ENABLE_NATIVE_VIDEO),y)
 WPEWEBKIT_CONF_OPTS += -DENABLE_NATIVE_VIDEO=ON
@@ -121,32 +135,30 @@ endif
 
 endif
 
-ifeq ($(BR2_PACKAGE_WPEWEBKIT2_28),y)
-
-WPEWEBKIT_CONF_OPTS += \
-	-DENABLE_ACCELERATED_2D_CANVAS=ON \
-	-DENABLE_ACCESSIBILITY=OFF \
-	-DENABLE_API_TESTS=OFF \
-	-DENABLE_BUBBLEWRAP_SANDBOX=OFF \
-	-DENABLE_MINIBROWSER=OFF \
-	-DSILENCE_CROSS_COMPILATION_NOTICES=ON \
-	-DUSE_WOFF2=OFF
+ifeq ($(BR2_PACKAGE_WPEWEBKIT2_28)$(BR2_PACKAGE_WPEWEBKIT2_38),y)
 
 ifeq ($(BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA),y)
 WPEWEBKIT_CONF_OPTS += \
-	-DENABLE_ENCRYPTED_MEDIA=ON \
+	-DENABLE_VIDEO=ON \
 	-DENABLE_MEDIA_SOURCE=ON \
+	-DENABLE_ENCRYPTED_MEDIA=ON \
 	-DENABLE_MEDIA_STATISTICS=ON \
-	-DENABLE_THUNDER=ON \
-	-DENABLE_VIDEO=ON \
 	-DENABLE_WEB_AUDIO=ON
 WPEWEBKIT_DEPENDENCIES += gstreamer1 gst1-plugins-base gst1-plugins-good
+
+ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_CLIENTLIBRARIES)$(BR2_PACKAGE_WPEFRAMEWORK_CDM),yy)
+WPEWEBKIT_DEPENDENCIES += wpeframework-clientlibraries
+WPEWEBKIT_CONF_OPTS += -DENABLE_THUNDER=ON
+else
+WPEWEBKIT_CONF_OPTS += -DENABLE_THUNDER=OFF
+endif
+
 else
 WPEWEBKIT_CONF_OPTS += \
-	-DENABLE_ENCRYPTED_MEDIA=OFF \
+	-DENABLE_VIDEO=OFF \
 	-DENABLE_MEDIA_SOURCE=OFF \
+	-DENABLE_ENCRYPTED_MEDIA=OFF \
 	-DENABLE_THUNDER=OFF \
-	-DENABLE_VIDEO=OFF \
 	-DENABLE_WEB_AUDIO=OFF
 endif
 
@@ -156,10 +168,29 @@ else
 WPEWEBKIT_CONF_OPTS += -DUSE_GSTREAMER_GL=OFF
 endif
 
-ifeq ($(BR2_PACKAGE_WPEWEBKIT_WEBDRIVER),y)
-WPEWEBKIT_CONF_OPTS += -DENABLE_WEBDRIVER=ON
+endif
+
+ifeq ($(BR2_PACKAGE_WPEWEBKIT2_38),y)
+WPEWEBKIT_CONF_OPTS += \
+	-DENABLE_INTROSPECTION=OFF \
+	-DUSE_LCMS=OFF
+
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+WPEWEBKIT_CONF_OPTS += -DENABLE_JOURNALD_LOG=ON
 else
-WPEWEBKIT_CONF_OPTS += -DENABLE_WEBDRIVER=OFF
+WPEWEBKIT_CONF_OPTS += -DENABLE_JOURNALD_LOG=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_WPEWEBKIT_ENABLE_NATIVE_VIDEO),y)
+WPEWEBKIT_CONF_OPTS += -DUSE_GSTREAMER_NATIVE_VIDEO=ON
+else
+WPEWEBKIT_CONF_OPTS += -DUSE_GSTREAMER_NATIVE_VIDEO=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_WPEWEBKIT_ENABLE_NATIVE_AUDIO),y)
+WPEWEBKIT_CONF_OPTS += -DUSE_GSTREAMER_NATIVE_AUDIO=ON
+else
+WPEWEBKIT_CONF_OPTS += -DUSE_GSTREAMER_NATIVE_AUDIO=OFF
 endif
 
 endif
@@ -189,6 +220,12 @@ else ifeq ($(BR2_PACKAGE_WPEWEBKIT_USE_PUNCH_HOLE_EXTERNAL),y)
 WPEWEBKIT_CONF_OPTS += -DUSE_HOLE_PUNCH_EXTERNAL=ON -DUSE_EXTERNAL_HOLEPUNCH=ON
 endif
 
+ifeq ($(BR2_PACKAGE_WPEWEBKIT_WEBDRIVER),y)
+WPEWEBKIT_CONF_OPTS += -DENABLE_WEBDRIVER=ON
+else
+WPEWEBKIT_CONF_OPTS += -DENABLE_WEBDRIVER=OFF
+endif
+
 ifeq ($(BR2_PACKAGE_WESTEROS),y)
 WPEWEBKIT_DEPENDENCIES += westeros
 WPEWEBKIT_CONF_OPTS += -DUSE_WPEWEBKIT_PLATFORM_WESTEROS=ON