Title: [286131] trunk
Revision
286131
Author
[email protected]
Date
2021-11-23 04:20:14 -0800 (Tue, 23 Nov 2021)

Log 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.

Modified Paths

Diff

Modified: trunk/ChangeLog (286130 => 286131)


--- trunk/ChangeLog	2021-11-23 12:00:09 UTC (rev 286130)
+++ trunk/ChangeLog	2021-11-23 12:20:14 UTC (rev 286131)
@@ -1,3 +1,16 @@
+2021-11-23  Adrian Perez de Castro  <[email protected]>
+
+        [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  <[email protected]>
 
         Add alexg's GitHub username to contributors.json

Modified: trunk/LayoutTests/ChangeLog (286130 => 286131)


--- trunk/LayoutTests/ChangeLog	2021-11-23 12:00:09 UTC (rev 286130)
+++ trunk/LayoutTests/ChangeLog	2021-11-23 12:20:14 UTC (rev 286131)
@@ -1,3 +1,12 @@
+2021-11-23  Adrian Perez de Castro  <[email protected]>
+
+        [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  <[email protected]>
 
         rem in media queries should be calculated using font-size:initial, not root element font-size

Modified: trunk/LayoutTests/platform/glib/TestExpectations (286130 => 286131)


--- trunk/LayoutTests/platform/glib/TestExpectations	2021-11-23 12:00:09 UTC (rev 286130)
+++ trunk/LayoutTests/platform/glib/TestExpectations	2021-11-23 12:20:14 UTC (rev 286131)
@@ -104,6 +104,10 @@
 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.
 fast/scrolling/rtl-scrollbars-elementFromPoint-static.html [ Pass ]
 fast/scrolling/rtl-scrollbars-iframe-offset.html [ Pass ]

Modified: trunk/Source/cmake/OptionsGTK.cmake (286130 => 286131)


--- trunk/Source/cmake/OptionsGTK.cmake	2021-11-23 12:00:09 UTC (rev 286130)
+++ trunk/Source/cmake/OptionsGTK.cmake	2021-11-23 12:20:14 UTC (rev 286131)
@@ -62,6 +62,7 @@
 WEBKIT_OPTION_DEFINE(ENABLE_X11_TARGET "Whether to enable support for the X11 windowing target." PUBLIC ON)
 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)
 WEBKIT_OPTION_DEFINE(USE_LIBNOTIFY "Whether to enable the default web notification implementation." PUBLIC ON)
@@ -420,6 +421,13 @@
     find_package(WaylandProtocols 1.12 REQUIRED)
 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)
     if (NOT LIBNOTIFY_FOUND)

Modified: trunk/Source/cmake/OptionsWPE.cmake (286130 => 286131)


--- trunk/Source/cmake/OptionsWPE.cmake	2021-11-23 12:00:09 UTC (rev 286130)
+++ trunk/Source/cmake/OptionsWPE.cmake	2021-11-23 12:20:14 UTC (rev 286131)
@@ -76,6 +76,7 @@
 WEBKIT_OPTION_DEFINE(ENABLE_JOURNALD_LOG "Whether to enable journald logging" PUBLIC ON)
 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)
 WEBKIT_OPTION_DEFINE(USE_SOUP2 "Whether to enable usage of Soup 2 instead of Soup 3." PUBLIC OFF)
@@ -169,6 +170,13 @@
     endif ()
 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)
     if (NOT OpenJPEG_FOUND)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to