Add MIME Type Definitions for JPEG‑XL Support (#651)

Added and updated the code for jpegxl support:
* Updated cupsfilters-individual.convs.in
* Updated cupsfilters-universal.convs
* Updated cupsfilters.types
* Updated configure.ac

diff --git a/configure.ac b/configure.ac
index 2d4b147e2c87d3e54fcc35753a2aa7273120bee3..a73ad995d36844ce55dd3650ceb551c546b8d367 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -117,6 +117,15 @@ AC_SUBST(CUPS_SERVERBIN)
 # ========================
 PKG_CHECK_MODULES([LIBCUPSFILTERS], [libcupsfilters])
 
+======================
+# Check for libjxl (JPEG-XL)
+# ======================
+PKG_CHECK_MODULES([LIBJXL], [libjxl >= 0.7.0],
+  [have_libjxl=yes],
+  [have_libjxl=no]
+)
+AM_CONDITIONAL([HAVE_LIBJXL], [test "x$have_libjxl" = "xyes"])
+
 # ================
 # Check for libppd
 # ================

diff --git a/mime/cupsfilters-individual.convs.in b/mime/cupsfilters-individual.convs.in
index 29969348529b88d6721d793698fa0d84bdb8668c..3e67959538c0c284a1bf30a6ddacb3cad18ec41a 100644 (file)
--- a/mime/cupsfilters-individual.convs.in
+++ b/mime/cupsfilters-individual.convs.in
@@ -43,6 +43,7 @@ application/pdf               application/vnd.cups-pdf                66      pdftopdf
 image/pwg-raster       application/pdf                         32      pwgtopdf
 image/png              application/vnd.cups-pdf                65      imagetopdf
 image/jpeg             application/vnd.cups-pdf                65      imagetopdf
+@HAVE_LIBJXL_TRUE@image/jxl            application/vnd.cups-pdf                65      imagetopdf
 image/tiff             application/vnd.cups-pdf                65      imagetopdf
 application/vnd.cups-pdf-banner        application/pdf                 32      bannertopdf
 image/urf              application/pdf                         0       pwgtopdf
@@ -75,6 +76,7 @@ application/vnd.adobe-reader-postscript       application/vnd.cups-postscript 66      pstop
 application/PCLm               application/vnd.cups-raster     32      pclmtoraster
 image/png                      application/vnd.cups-raster     100     imagetoraster
 image/jpeg                     application/vnd.cups-raster     100     imagetoraster
+@HAVE_LIBJXL_TRUE@image/jxl                    application/vnd.cups-raster     100     imagetoraster
 image/tiff                     application/vnd.cups-raster     100     imagetoraster
 image/pwg-raster               application/vnd.cups-raster     100     pwgtoraster
 image/urf                      application/vnd.cups-raster     100     pwgtoraster

diff --git a/mime/cupsfilters-universal.convs b/mime/cupsfilters-universal.convs
index 00cca4544f9fa431ee93f5ff5df10b9e893f5a93..9bd2a9cab5bc0f8ff461ff8817d827e319e0f0c0 100644 (file)
--- a/mime/cupsfilters-universal.convs
+++ b/mime/cupsfilters-universal.convs
@@ -32,6 +32,7 @@
 #
 
 image/jpeg                      application/vnd.universal-input      0    -
+@HAVE_LIBJXL_TRUE@image/jxl     application/vnd.universal-input      0    -
 image/png                       application/vnd.universal-input      0    -
 image/tiff                      application/vnd.universal-input      0    -
 image/pwg-raster                application/vnd.universal-input      0    -

diff --git a/mime/cupsfilters.types b/mime/cupsfilters.types
index 19d7fe26502e48ea32270cd76edda98289326c60..b4e0db48d94efe710e42d7e5e6711c5ec7f25a93 100644 (file)
--- a/mime/cupsfilters.types
+++ b/mime/cupsfilters.types
@@ -91,6 +91,7 @@ image/x-xbitmap                       xbm string(0,"#define");
 image/x-xpixmap                        xpm string(3,"XPM")
 image/x-xwindowdump            xwd string(4,<00000007>)
 image/urf                      urf string(0,UNIRAST<00>)
+@HAVE_LIBJXL_TRUE@image/jxl    jxl string(0,"<0000000C4A584C20>") string(0,"<FF0A>")
 
 ########################################################################
 #