Merge pull request #1466 from clopez/libwpe-version-gamepad-cmake

[WPE][CMake] Allow building with older libwpe when ENABLE_GAMEPAD is not enabled

Source/cmake/OptionsWPE.cmake

@@ -18,7 +18,7 @@ find_package(SQLite3 REQUIRED)
 find_package(Threads REQUIRED)
 find_package(Unifdef REQUIRED)
 find_package(WebP REQUIRED COMPONENTS demux)
-find_package(WPE 1.16.2 REQUIRED)
+find_package(WPE REQUIRED)
 find_package(ZLIB REQUIRED)
 
 # TODO(277627): Remove once the SDKs include the package.
@@ -78,16 +78,17 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VARIATION_FONTS PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_CODECS PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_RTC PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBXR PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
 
 if (CMAKE_CXX_BYTE_ORDER STREQUAL "LITTLE_ENDIAN")
     WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_SKIA PRIVATE ON)
 else ()
     WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_SKIA PRIVATE OFF)
 endif ()
 
-if (WPE_VERSION VERSION_GREATER_EQUAL 1.13.90)
+if (WPE_VERSION VERSION_GREATER_EQUAL 1.16.2)
+    # ENABLE_GAMEPAD needs libwpe >= 1.16.2 and ENABLE_WEBXR needs ENABLE_GAMEPAD
     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD PUBLIC ON)
+    WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBXR PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
 endif ()
 
 # Public options specific to the WPE port. Do not add any options here unless
@@ -222,8 +223,8 @@ if (USE_ATK)
     endif ()
 endif ()
 
-if (ENABLE_GAMEPAD AND (NOT (WPE_VERSION VERSION_GREATER_EQUAL 1.13.90)))
-    message(FATAL_ERROR "libwpe>=1.13.90 is required for ENABLE_GAMEPAD")
+if (ENABLE_GAMEPAD AND (NOT (WPE_VERSION VERSION_GREATER_EQUAL 1.16.2)))
+    message(FATAL_ERROR "libwpe>=1.16.2 is required for ENABLE_GAMEPAD")
 endif ()
 
 if (ENABLE_SPEECH_SYNTHESIS)