Changeset 286131 in webkit

Timestamp:

Nov 23, 2021, 4:20:14 AM (5 years ago)

Author:

Adrian Perez de Castro

Message:

[WPE][GTK] Allow enabling JPEG-XL support at build time
​https://bugs.webkit.org/show_bug.cgi?id=233325

Reviewed by Michael Catanzaro.

.:

Adds a new USE_JPEGXL build option, disabled by default for release builds and
enabled for developer builds.

• Source/cmake/OptionsGTK.cmake: Add USE_JPEGXL build option.
• Source/cmake/OptionsWPE.cmake: Ditto.

LayoutTests:

• platform/glib/TestExpectations: Unskip JPEG-XL tests for the GTK and WPE ports.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/glib/TestExpectations (modified) (1 diff)
• Source/cmake/OptionsGTK.cmake (modified) (2 diffs)
• Source/cmake/OptionsWPE.cmake (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2021-11-23  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [WPE][GTK] Allow enabling JPEG-XL support at build time
+        https://bugs.webkit.org/show_bug.cgi?id=233325
+
+        Reviewed by Michael Catanzaro.
+
+        Adds a new USE_JPEGXL build option, disabled by default for release builds and
+        enabled for developer builds.
+
+        * Source/cmake/OptionsGTK.cmake: Add USE_JPEGXL build option.
+        * Source/cmake/OptionsWPE.cmake: Ditto.
+
 2021-11-22  Alejandro G. Castro  <alex@igalia.com>
 

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-11-23  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [WPE][GTK] Allow enabling JPEG-XL support at build time
+        https://bugs.webkit.org/show_bug.cgi?id=233325
+
+        Reviewed by Michael Catanzaro.
+
+        * platform/glib/TestExpectations: Unskip JPEG-XL tests for the GTK and WPE ports.
+
 2021-11-22  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/LayoutTests/platform/glib/TestExpectations

@@ -104 +104 @@
 fast/text/emoji-gender-8.html [ Pass ]
 fast/text/emoji-gender-9.html [ Pass ]
+
+# JPEG-XL tests
+fast/images/jpegxl-as-image.html [ Pass ]
+fast/images/jpegxl-image-decoding.html [ Pass ]
 
 # Some Apple ports don't support RTL scrollbars.

trunk/Source/cmake/OptionsGTK.cmake

@@ -63 +63 @@
 WEBKIT_OPTION_DEFINE(USE_AVIF "Whether to enable support for AVIF images." PUBLIC ${ENABLE_EXPERIMENTAL_FEATURES})
 WEBKIT_OPTION_DEFINE(USE_GTK4 "Whether to enable usage of GTK4 instead of GTK3." PUBLIC OFF)
+WEBKIT_OPTION_DEFINE(USE_JPEGXL "Whether to enable support for JPEG-XL images." PUBLIC ${ENABLE_EXPERIMENTAL_FEATURES})
 WEBKIT_OPTION_DEFINE(USE_LCMS "Whether to enable support for image color management using libcms2." PUBLIC ON)
 WEBKIT_OPTION_DEFINE(USE_LIBHYPHEN "Whether to enable the default automatic hyphenation implementation." PUBLIC ON)
@@ -421 +422 @@
 endif ()
 
+if (USE_JPEGXL)
+    find_package(JPEGXL)
+    if (NOT JPEGXL_FOUND)
+        message(FATAL_ERROR "libjxl is required for USE_JPEGXL")
+    endif ()
+endif ()
+
 if (USE_LIBNOTIFY)
     find_package(LibNotify)

trunk/Source/cmake/OptionsWPE.cmake

@@ -77 +77 @@
 WEBKIT_OPTION_DEFINE(ENABLE_WPE_QT_API "Whether to enable support for the Qt5/QML plugin" PUBLIC ${ENABLE_DEVELOPER_MODE})
 WEBKIT_OPTION_DEFINE(USE_AVIF "Whether to enable support for AVIF images." PUBLIC ${ENABLE_EXPERIMENTAL_FEATURES})
+WEBKIT_OPTION_DEFINE(USE_JPEGXL "Whether to enable support for JPEG-XL images." PUBLIC ${ENABLE_EXPERIMENTAL_FEATURES})
 WEBKIT_OPTION_DEFINE(USE_LCMS "Whether to enable support for image color management using libcms2." PUBLIC ON)
 WEBKIT_OPTION_DEFINE(USE_OPENJPEG "Whether to enable support for JPEG2000 images." PUBLIC ON)
@@ -170 +171 @@
 endif ()
 
+if (USE_JPEGXL)
+    find_package(JPEGXL)
+    if (NOT JPEGXL_FOUND)
+        message(FATAL_ERROR "libjxl is required for USE_JPEGXL")
+    endif ()
+endif ()
+
 if (USE_OPENJPEG)
     find_package(OpenJPEG 2.2.0)