Dear maintainer,
the provides version for libjpegli62 was incorrect, sorry for that, the
updated attached patch would be the correct one to look at as example
for updating the packaging to 0.10.1.
With best regards,
Julian Wollrath
--
() ascii ribbon campaign - against html e-mail
/\ - against proprietary attachments
diff --git a/debian/changelog b/debian/changelog
index 98ba746..b45cf38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+jpeg-xl (0.10.1-0.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * New upstream version 0.10.1
+ * Build GDK pixbuf plugin. Closes: #1001786
+ * Build libjpegli. Closes: #1041234
+
+ -- Julian Wollrath <jwollr...@web.de> Sun, 03 Mar 2024 11:38:22 +0100
+
jpeg-xl (0.8.2-1) experimental; urgency=medium
* New upstream version 0.8.2
diff --git a/debian/cjpeg_hdr.1.in b/debian/cjpeg_hdr.1.in
deleted file mode 100644
index 382fb1e..0000000
--- a/debian/cjpeg_hdr.1.in
+++ /dev/null
@@ -1,81 +0,0 @@
-[NAME]
-cjpeg_hdr - cjpeg_hdr
-
-[DESCRIPTION]
-# High bit depth JPEG encoder
-`cjpeg_hdr` is an (experimental) JPEG encoder that can preserve a higher bit
-depth than a traditional JPEG encoder. In particular, it may be used to produce
-HDR JPEGs that do not show obvious signs of banding.
-
-Note that at this point in time `cjpeg_hdr` does not attempt to actually
-*compress* the image - it behaves in the same way as a "quality 100" JPEG
-encoder would normally do, i.e. no quantization, to achieve the maximum
-possible visual quality. Moreover, no Huffman optimization is performed.
-
-## Generating HBD JPEGs
-Note: this and the following sections assume that `libjxl` has been built in
-the `build/` directory, either by using CMake or by running `./ci.sh opt`.
-
-It should be sufficient to run `build/tools/cjpeg_hdr input_image output.jpg`.
-Various input formats are supported, including NetBPM and (8- or 16-bit) PNG.
-
-If the PNG image includes a colour profile, it will be copied in the resulting
-JPEG image. If this colour profile approximates the PQ or HLG transfer curves,
-some applications will consider the resulting image to be HDR.
-
-To attach a PQ profile to an image without a colour profile (or with a
-different colour profile), the following command can be used:
-
-```
- build/tools/decode_and_encode input RGB_D65_202_Rel_PeQ output_with_pq.png 16
-```
-
-Similarly, to attach an HLG profile, the following command can be used
-
-```
- build/tools/decode_and_encode input RGB_D65_202_Rel_HLG output_with_pq.png 16
-```
-
-## Decoding HBD JPEGs
-HBD JPEGs are fully retrocompatible with libjpeg, and any JPEG viewer ought to
-be able to visualize them. Nonetheless, to achieve the best visual quality, a
-high bit depth decoder should be used.
-
-Such a decoder does not exist today. As a workaround, it is possible to do a
-lossless conversion to JPEG XL and then view the resulting image:
-
-```
- build/tools/cjxl --jpeg_transcode_disable_cfl hbd.jpeg hbd.jxl
-```
-
-The resulting JPEG XL file can be visualized, for example, in a browser,
-assuming that the corresponding flag is enabled in the settings.
-
-In particular, if the HBD JPEG has a PQ or HLG profile attached and the current
-display is an HDR display, Chrome ought to visualize the image as HDR content.
-
-It is also possible to convert the JPEG XL file back to a 16-bit PNG:
-
-```
- build/tools/djxl hbd.jxl --bits_per_sample=16 output.png
-```
-
-Note however that as of today (2 Nov 2021) Chrome does not interpret such a PNG
-as an HDR image, even if a PQ or HLG profile is attached. Thus, to display the
-HDR image correctly it is recommended to either display the JPEG XL image
-directly or to convert the PNG to a format that Chrome interprets as HDR, such
-as AVIF. This can be done with the following command for a PQ image:
-
-```
- avifenc -l -y 444 --depth 10 --cicp 9/16/9 image.png output.avif
-```
-
-and the following one for an HLG image:
-
-```
- avifenc -l -y 444 --depth 10 --cicp 9/18/9 image.png output.avif
-```
-
-[AUTHOR]
-This manual page was written by Mathieu Malaterre <ma...@debian.org> for the
-Debian GNU/Linux system (but may be used by others).
diff --git a/debian/control b/debian/control
index fd9dce2..39820e9 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Build-Depends: asciidoc-base,
help2man,
libavif-dev (>= 0.10.1),
libbrotli-dev,
+ libgdk-pixbuf-2.0-dev,
libgflags-dev,
libgif-dev (>= 5.1),
libgmock-dev <!nocheck>,
@@ -25,7 +26,7 @@ Build-Depends: asciidoc-base,
libpng-dev,
libwebp-dev (>= 1.3),
ninja-build,
- pkg-config
+ pkgconf
Build-Depends-Indep: doxygen, graphviz
Homepage: https://github.com/libjxl/libjxl
Vcs-Git: https://salsa.debian.org/debian-phototools-team/libjxl.git
@@ -52,7 +53,7 @@ Architecture: any
Section: libdevel
Depends: libbrotli-dev,
libhwy-dev,
- libjxl0.8 (= ${binary:Version}),
+ libjxl0.10 (= ${binary:Version}),
liblcms-dev,
${misc:Depends}
Multi-Arch: same
@@ -65,7 +66,7 @@ Description: JPEG XL Image Coding System - "JXL" (development files)
.
This package installs development files.
-Package: libjxl0.8
+Package: libjxl0.10
Architecture: any
Multi-Arch: same
Section: libs
@@ -107,6 +108,16 @@ Description: JPEG XL Image Coding System - "JXL" (dev command line utility)
.
This package installs the devtools command line utilities.
+Package: libjxl-gdk-pixbuf
+Architecture: any
+Multi-Arch: same
+Section: libs
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Description: JPEG XL Plugin for gdk-pixbuf
+ This package installs the required files for reading JPEG XL files in
+ GTK applications.
+
Package: libjpegxl-java
Architecture: amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x alpha ia64 m68k powerpc ppc64 sh4 sparc64 x32
Section: java
@@ -120,3 +131,50 @@ Description: JPEG XL Image Coding System - "JXL" (java bindings)
several features that help transition from the legacy JPEG format.
.
This package installs the Java Bindings.
+
+Package: libjpegli62
+Architecture: any
+Multi-Arch: same
+Section: libs
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Conflicts: libjpeg62, libjpeg62-turbo
+Replaces: libjpeg62, libjpeg62-turbo
+Provides: libjpeg62-turbo (= 1:2.0.2)
+Description: Improved JPEG encoder and decoder implementation (shared libraries)
+ JPEGLIS provides a JPEG encoder and decoder implementation that is
+ API and ABI compatible with libjpeg62.
+ .
+ This package installs jpegli shared libraries.
+
+Package: libjpegli62-dev
+Architecture: any
+Section: libdevel
+Multi-Arch: same
+Depends: libc-dev, libjpegli62 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libjpeg62-dev,
+ libjpeg62-turbo-dev,
+ libjpeg7-dev,
+ libjpeg8-dev,
+ libjpeg9-dev
+Replaces: libjpeg62-dev,
+ libjpeg62-turbo-dev,
+ libjpeg7-dev,
+ libjpeg8-dev,
+ libjpeg9-dev
+Provides: libjpeg-dev
+Description: Improved JPEG encoder and decoder implementation (development files)
+ JPEGLIS provides a JPEG encoder and decoder implementation that is
+ API and ABI compatible with libjpeg62.
+ .
+ This package installs jpegli jpeg62 headers.
+
+Package: libjpegli-tools
+Architecture: any
+Section: utils
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Improved JPEG encoder and decoder implementation (command line utility)
+ JPEGLIS provides a JPEG encoder and decoder implementation that is
+ API and ABI compatible with libjpeg62.
+ .
+ This package installs the JPEGLI tools command line utilities.
diff --git a/debian/control.in b/debian/control.in
index c2e3117..cc104b8 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -12,6 +12,7 @@ Build-Depends: asciidoc-base,
help2man,
libavif-dev (>= 0.10.1),
libbrotli-dev,
+ libgdk-pixbuf-2.0-dev,
libgflags-dev,
libgif-dev (>= 5.1),
libgmock-dev <!nocheck>,
@@ -25,7 +26,7 @@ Build-Depends: asciidoc-base,
libpng-dev,
libwebp-dev (>= 1.3),
ninja-build,
- pkg-config
+ pkgconf
Build-Depends-Indep: doxygen, graphviz
Homepage: https://github.com/libjxl/libjxl
Vcs-Git: https://salsa.debian.org/debian-phototools-team/libjxl.git
@@ -52,7 +53,7 @@ Architecture: any
Section: libdevel
Depends: libbrotli-dev,
libhwy-dev,
- libjxl0.8 (= ${binary:Version}),
+ libjxl0.10 (= ${binary:Version}),
liblcms-dev,
${misc:Depends}
Multi-Arch: same
@@ -65,7 +66,7 @@ Description: JPEG XL Image Coding System - "JXL" (development files)
.
This package installs development files.
-Package: libjxl0.8
+Package: libjxl0.10
Architecture: any
Multi-Arch: same
Section: libs
@@ -107,6 +108,16 @@ Description: JPEG XL Image Coding System - "JXL" (dev command line utility)
.
This package installs the devtools command line utilities.
+Package: libjxl-gdk-pixbuf
+Architecture: any
+Multi-Arch: same
+Section: libs
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Description: JPEG XL Plugin for gdk-pixbuf
+ This package installs the required files for reading JPEG XL files in
+ GTK applications.
+
Package: libjpegxl-java
Architecture: @JAVA_ARCHS@
Section: java
@@ -120,3 +131,50 @@ Description: JPEG XL Image Coding System - "JXL" (java bindings)
several features that help transition from the legacy JPEG format.
.
This package installs the Java Bindings.
+
+Package: libjpegli62
+Architecture: any
+Multi-Arch: same
+Section: libs
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Conflicts: libjpeg62, libjpeg62-turbo
+Replaces: libjpeg62, libjpeg62-turbo
+Provides: libjpeg62-turbo (= 1:1.3.1)
+Description: Improved JPEG encoder and decoder implementation (shared libraries)
+ JPEGLIS provides a JPEG encoder and decoder implementation that is
+ API and ABI compatible with libjpeg62.
+ .
+ This package installs jpegli shared libraries.
+
+Package: libjpegli62-dev
+Architecture: any
+Section: libdevel
+Multi-Arch: same
+Depends: libc-dev, libjpegli62 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libjpeg62-dev,
+ libjpeg62-turbo-dev,
+ libjpeg7-dev,
+ libjpeg8-dev,
+ libjpeg9-dev
+Replaces: libjpeg62-dev,
+ libjpeg62-turbo-dev,
+ libjpeg7-dev,
+ libjpeg8-dev,
+ libjpeg9-dev
+Provides: libjpeg-dev
+Description: Improved JPEG encoder and decoder implementation (development files)
+ JPEGLIS provides a JPEG encoder and decoder implementation that is
+ API and ABI compatible with libjpeg62.
+ .
+ This package installs jpegli jpeg62 headers.
+
+Package: libjpegli-tools
+Architecture: any
+Section: utils
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Improved JPEG encoder and decoder implementation (command line utility)
+ JPEGLIS provides a JPEG encoder and decoder implementation that is
+ API and ABI compatible with libjpeg62.
+ .
+ This package installs the JPEGLI tools command line utilities.
diff --git a/debian/fuzzer_corpus.1.in b/debian/fuzzer_corpus.1.in
deleted file mode 100644
index 0a307b9..0000000
--- a/debian/fuzzer_corpus.1.in
+++ /dev/null
@@ -1,6 +0,0 @@
-[NAME]
-fuzzer_corpus - fuzzer_corpus
-
-[AUTHOR]
-This manual page was written by Mathieu Malaterre <ma...@debian.org> for the
-Debian GNU/Linux system (but may be used by others).
diff --git a/debian/libjxl-devtools.install b/debian/libjxl-devtools.install
index 7fdd98e..8e90896 100644
--- a/debian/libjxl-devtools.install
+++ b/debian/libjxl-devtools.install
@@ -2,7 +2,6 @@ usr/bin/benchmark_xl
usr/bin/butteraugli_main
usr/bin/decode_and_encode
usr/bin/display_to_hlg
-usr/bin/fuzzer_corpus
usr/bin/generate_lut_template
usr/bin/jxl_from_tree
usr/bin/pq_to_hlg
diff --git a/debian/libjxl-devtools.manpages b/debian/libjxl-devtools.manpages
index f9239df..04fccbf 100644
--- a/debian/libjxl-devtools.manpages
+++ b/debian/libjxl-devtools.manpages
@@ -2,7 +2,6 @@ debian/benchmark_xl.1
debian/butteraugli_main.1
debian/decode_and_encode.1
debian/display_to_hlg.1
-debian/fuzzer_corpus.1
debian/generate_lut_template.1
debian/jxl_from_tree.1
debian/pq_to_hlg.1
diff --git a/debian/libjxl-tools.install b/debian/libjxl-tools.install
index 3da963a..cd5227b 100644
--- a/debian/libjxl-tools.install
+++ b/debian/libjxl-tools.install
@@ -1,4 +1,3 @@
-usr/bin/cjpeg_hdr
usr/bin/cjxl
usr/bin/djxl
usr/bin/jxlinfo
diff --git a/debian/libjxl-tools.manpages b/debian/libjxl-tools.manpages
index b79694f..ad4763b 100644
--- a/debian/libjxl-tools.manpages
+++ b/debian/libjxl-tools.manpages
@@ -1,2 +1 @@
-debian/cjpeg_hdr.1
debian/jxlinfo.1
diff --git a/debian/libjxl0.8.install b/debian/libjxl0.8.install
deleted file mode 100644
index cd157a7..0000000
--- a/debian/libjxl0.8.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libjxl*.so.*
diff --git a/debian/libjxl0.8.symbols b/debian/libjxl0.8.symbols
deleted file mode 100644
index a9e9658..0000000
--- a/debian/libjxl0.8.symbols
+++ /dev/null
@@ -1,121 +0,0 @@
-libjxl.so.0.8 libjxl0.8 #MINVER#
-* Build-Depends-Package: libjxl-dev
- JXL_0@JXL_0 0.6.1
- JxlButteraugliApiCreate@JXL_0 0.6.1
- JxlButteraugliApiDestroy@JXL_0 0.6.1
- JxlButteraugliApiSetHFAsymmetry@JXL_0 0.6.1
- JxlButteraugliApiSetIntensityTarget@JXL_0 0.6.1
- JxlButteraugliApiSetParallelRunner@JXL_0 0.6.1
- JxlButteraugliCompute@JXL_0 0.6.1
- JxlButteraugliResultDestroy@JXL_0 0.6.1
- JxlButteraugliResultGetDistance@JXL_0 0.6.1
- JxlButteraugliResultGetDistmap@JXL_0 0.6.1
- JxlButteraugliResultGetMaxDistance@JXL_0 0.6.1
- JxlColorEncodingSetToLinearSRGB@JXL_0 0.6.1
- JxlColorEncodingSetToSRGB@JXL_0 0.6.1
- JxlDecoderCloseInput@JXL_0 0.7.0
- JxlDecoderCreate@JXL_0 0.6.1
- JxlDecoderDefaultPixelFormat@JXL_0 0.6.1
- JxlDecoderDestroy@JXL_0 0.6.1
- JxlDecoderExtraChannelBufferSize@JXL_0 0.6.1
- JxlDecoderFlushImage@JXL_0 0.6.1
- JxlDecoderGetBasicInfo@JXL_0 0.6.1
- JxlDecoderGetBoxSizeRaw@JXL_0 0.7.0
- JxlDecoderGetBoxType@JXL_0 0.7.0
- JxlDecoderGetColorAsEncodedProfile@JXL_0 0.6.1
- JxlDecoderGetColorAsICCProfile@JXL_0 0.6.1
- JxlDecoderGetExtraChannelBlendInfo@JXL_0 0.7.0
- JxlDecoderGetExtraChannelInfo@JXL_0 0.6.1
- JxlDecoderGetExtraChannelName@JXL_0 0.6.1
- JxlDecoderGetFrameHeader@JXL_0 0.6.1
- JxlDecoderGetFrameName@JXL_0 0.6.1
- JxlDecoderGetICCProfileSize@JXL_0 0.6.1
- JxlDecoderGetIntendedDownsamplingRatio@JXL_0 0.7.0
- JxlDecoderImageOutBufferSize@JXL_0 0.6.1
- JxlDecoderPreviewOutBufferSize@JXL_0 0.6.1
- JxlDecoderProcessInput@JXL_0 0.6.1
- JxlDecoderReleaseBoxBuffer@JXL_0 0.7.0
- JxlDecoderReleaseInput@JXL_0 0.6.1
- JxlDecoderReleaseJPEGBuffer@JXL_0 0.6.1
- JxlDecoderReset@JXL_0 0.6.1
- JxlDecoderRewind@JXL_0 0.6.1
- JxlDecoderSetBoxBuffer@JXL_0 0.7.0
- JxlDecoderSetCoalescing@JXL_0 0.7.0
- JxlDecoderSetDecompressBoxes@JXL_0 0.7.0
- JxlDecoderSetDesiredIntensityTarget@JXL_0 0.7.0
- JxlDecoderSetExtraChannelBuffer@JXL_0 0.6.1
- JxlDecoderSetImageOutBitDepth@JXL_0 0.8.0
- JxlDecoderSetImageOutBuffer@JXL_0 0.6.1
- JxlDecoderSetImageOutCallback@JXL_0 0.6.1
- JxlDecoderSetInput@JXL_0 0.6.1
- JxlDecoderSetJPEGBuffer@JXL_0 0.6.1
- JxlDecoderSetKeepOrientation@JXL_0 0.6.1
- JxlDecoderSetMultithreadedImageOutCallback@JXL_0 0.7.0
- JxlDecoderSetParallelRunner@JXL_0 0.6.1
- JxlDecoderSetPreferredColorProfile@JXL_0 0.6.1
- JxlDecoderSetPreviewOutBuffer@JXL_0 0.6.1
- JxlDecoderSetProgressiveDetail@JXL_0 0.7.0
- JxlDecoderSetRenderSpotcolors@JXL_0 0.7.0
- JxlDecoderSetUnpremultiplyAlpha@JXL_0 0.7.0
- JxlDecoderSizeHintBasicInfo@JXL_0 0.6.1
- JxlDecoderSkipCurrentFrame@JXL_0 0.7.0
- JxlDecoderSkipFrames@JXL_0 0.6.1
- JxlDecoderSubscribeEvents@JXL_0 0.6.1
- JxlDecoderVersion@JXL_0 0.6.1
- JxlEncoderAddBox@JXL_0 0.7.0
- JxlEncoderAddImageFrame@JXL_0 0.6.1
- JxlEncoderAddJPEGFrame@JXL_0 0.6.1
- JxlEncoderAllowExpertOptions@JXL_0 0.8.0
- JxlEncoderCloseBoxes@JXL_0 0.7.0
- JxlEncoderCloseFrames@JXL_0 0.7.0
- JxlEncoderCloseInput@JXL_0 0.6.1
- JxlEncoderCreate@JXL_0 0.6.1
- JxlEncoderDestroy@JXL_0 0.6.1
- JxlEncoderFrameSettingsCreate@JXL_0 0.7.0
- JxlEncoderFrameSettingsSetFloatOption@JXL_0 0.7.0
- JxlEncoderFrameSettingsSetOption@JXL_0 0.7.0
- JxlEncoderGetError@JXL_0 0.7.0
- JxlEncoderGetRequiredCodestreamLevel@JXL_0 0.7.0
- JxlEncoderInitBasicInfo@JXL_0 0.6.1
- JxlEncoderInitBlendInfo@JXL_0 0.7.0
- JxlEncoderInitExtraChannelInfo@JXL_0 0.7.0
- JxlEncoderInitFrameHeader@JXL_0 0.7.0
- JxlEncoderOptionsCreate@JXL_0 0.6.1
- JxlEncoderOptionsSetDecodingSpeed@JXL_0 0.6.1
- JxlEncoderOptionsSetDistance@JXL_0 0.6.1
- JxlEncoderOptionsSetEffort@JXL_0 0.6.1
- JxlEncoderOptionsSetLossless@JXL_0 0.6.1
- JxlEncoderProcessOutput@JXL_0 0.6.1
- JxlEncoderReset@JXL_0 0.6.1
- JxlEncoderSetBasicInfo@JXL_0 0.6.1
- JxlEncoderSetCms@JXL_0 0.7.0
- JxlEncoderSetCodestreamLevel@JXL_0 0.7.0
- JxlEncoderSetColorEncoding@JXL_0 0.6.1
- JxlEncoderSetExtraChannelBlendInfo@JXL_0 0.7.0
- JxlEncoderSetExtraChannelBuffer@JXL_0 0.7.0
- JxlEncoderSetExtraChannelInfo@JXL_0 0.7.0
- JxlEncoderSetExtraChannelName@JXL_0 0.7.0
- JxlEncoderSetFrameBitDepth@JXL_0 0.8.0
- JxlEncoderSetFrameDistance@JXL_0 0.7.0
- JxlEncoderSetFrameHeader@JXL_0 0.7.0
- JxlEncoderSetFrameLossless@JXL_0 0.7.0
- JxlEncoderSetFrameName@JXL_0 0.7.0
- JxlEncoderSetICCProfile@JXL_0 0.6.1
- JxlEncoderSetParallelRunner@JXL_0 0.6.1
- JxlEncoderStoreJPEGMetadata@JXL_0 0.6.1
- JxlEncoderUseBoxes@JXL_0 0.7.0
- JxlEncoderUseContainer@JXL_0 0.6.1
- JxlEncoderVersion@JXL_0 0.6.1
- JxlSignatureCheck@JXL_0 0.6.1
-libjxl_threads.so.0.8 libjxl0.8 #MINVER#
-* Build-Depends-Package: libjxl-dev
- JXL_0@JXL_0 0.6.1
- JxlResizableParallelRunner@JXL_0 0.6.1
- JxlResizableParallelRunnerCreate@JXL_0 0.6.1
- JxlResizableParallelRunnerDestroy@JXL_0 0.6.1
- JxlResizableParallelRunnerSetThreads@JXL_0 0.6.1
- JxlResizableParallelRunnerSuggestThreads@JXL_0 0.6.1
- JxlThreadParallelRunner@JXL_0 0.6.1
- JxlThreadParallelRunnerCreate@JXL_0 0.6.1
- JxlThreadParallelRunnerDefaultNumWorkerThreads@JXL_0 0.6.1
- JxlThreadParallelRunnerDestroy@JXL_0 0.6.1
diff --git a/debian/patches/0008-Fix-conformance-test.patch b/debian/patches/0008-Fix-conformance-test.patch
deleted file mode 100644
index ed2c439..0000000
--- a/debian/patches/0008-Fix-conformance-test.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Boyuan Yang <by...@debian.org>
-Date: Fri, 22 Sep 2023 17:34:23 -0400
-Subject: Fix conformance test
-
-Bug-Debian: https://bugs.debian.org/1051560
-
----
- tools/conformance/generator.py | 2 +-
- tools/conformance/tooling_test.sh | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tools/conformance/generator.py b/tools/conformance/generator.py
-index e2a9b2e..d59c3f4 100755
---- a/tools/conformance/generator.py
-+++ b/tools/conformance/generator.py
-@@ -67,7 +67,7 @@ def GenerateConformanceCorpus(args):
- cmd.extend(['--icc_out', pixel_prefix + '.icc'])
-
- # Decode and generate the reference files.
-- subprocess.check_call(cmd)
-+ subprocess.check_call(' '.join(cmd), shell=True)
-
- with open(metadata_filename, 'r') as f:
- metadata = json.load(f)
-diff --git a/tools/conformance/tooling_test.sh b/tools/conformance/tooling_test.sh
-index 95adefb..892b7a2 100755
---- a/tools/conformance/tooling_test.sh
-+++ b/tools/conformance/tooling_test.sh
-@@ -41,6 +41,7 @@ main() {
- build_dir=$(realpath "${MYDIR}/../../build")
- fi
-
-+ export LD_LIBRARY_PATH=${build_dir}
- local decoder="${build_dir}/tools/djxl"
- "${MYDIR}/generator.py" \
- --decoder="${decoder}" \
diff --git a/debian/patches/0009-fast_dct-inl.h-Include-std-headers-to-solve-missing-.patch b/debian/patches/0009-fast_dct-inl.h-Include-std-headers-to-solve-missing-.patch
deleted file mode 100644
index 390b3d7..0000000
--- a/debian/patches/0009-fast_dct-inl.h-Include-std-headers-to-solve-missing-.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Boyuan Yang <by...@debian.org>
-Date: Sat, 7 Oct 2023 20:24:01 -0400
-Subject: fast_dct-inl.h: Include std headers to solve missing std::round on
- arm64
-
-Using std::round() needs at least <cmath>, and possibly <array>.
-This patch is a hotfix to circumvent build errors caused by the
-missing of headers on arm64.
-
-Ref: https://buildd.debian.org/status/fetch.php?pkg=jpeg-xl&arch=arm64&ver=0.7.0-10.1&stamp=1696704163&raw=0
----
- lib/jxl/fast_dct-inl.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-Index: libjxl/lib/jxl/fast_dct-inl.h
-===================================================================
---- libjxl.orig/lib/jxl/fast_dct-inl.h
-+++ libjxl/lib/jxl/fast_dct-inl.h
-@@ -17,6 +17,9 @@
-
- #include "lib/jxl/base/status.h"
-
-+#include <cmath>
-+#include <array>
-+
- HWY_BEFORE_NAMESPACE();
- namespace jxl {
- namespace HWY_NAMESPACE {
diff --git a/debian/patches/22d12d74e7bc56b09cfb1973aa89ec8d714fa3fc.patch b/debian/patches/22d12d74e7bc56b09cfb1973aa89ec8d714fa3fc.patch
deleted file mode 100644
index 61014cd..0000000
--- a/debian/patches/22d12d74e7bc56b09cfb1973aa89ec8d714fa3fc.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 22d12d74e7bc56b09cfb1973aa89ec8d714fa3fc Mon Sep 17 00:00:00 2001
-From: Eastdong <31920925+ie...@users.noreply.github.com>
-Date: Thu, 23 Feb 2023 06:08:36 +0800
-Subject: [PATCH] Add missing <atomic> content to fix gcc compilation for RISCV
- architecture. (#2211)
-
-* Add missing <atomic> content to fix gcc compilation for RISCV architecture.
-
-* add name to AUTHORS
-
-* lint fix
-
-Co-authored-by: Moritz Firsching <firsch...@google.com>
----
- AUTHORS | 1 +
- lib/jxl/enc_xyb.cc | 1 +
- 2 files changed, 2 insertions(+)
-
-Index: libjxl/AUTHORS
-===================================================================
---- libjxl.orig/AUTHORS
-+++ libjxl/AUTHORS
-@@ -30,6 +30,7 @@ Daniel Novomeský <dnovome...@gmail.com>
- David Burnett <vargols...@gmail.com>
- Dirk Lemstra <d...@lemstra.org>
- Don Olmstead <don.j.olmst...@gmail.com>
-+Dong Xu <xdong...@gmail.com>
- Even Rouault <even.roua...@spatialys.com>
- Fred Brennan <copypa...@kittens.ph>
- Heiko Becker <heire...@exherbo.org>
-Index: libjxl/lib/jxl/enc_xyb.cc
-===================================================================
---- libjxl.orig/lib/jxl/enc_xyb.cc
-+++ libjxl/lib/jxl/enc_xyb.cc
-@@ -6,6 +6,7 @@
- #include "lib/jxl/enc_xyb.h"
-
- #include <algorithm>
-+#include <atomic>
- #include <cstdlib>
-
- #undef HWY_TARGET_INCLUDE
diff --git a/debian/patches/383df4487f59da140fd1ce112548a2cd11e4eaeb.patch b/debian/patches/383df4487f59da140fd1ce112548a2cd11e4eaeb.patch
deleted file mode 100644
index c542ac5..0000000
--- a/debian/patches/383df4487f59da140fd1ce112548a2cd11e4eaeb.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 383df4487f59da140fd1ce112548a2cd11e4eaeb Mon Sep 17 00:00:00 2001
-From: Sami Boukortt <sbouko...@google.com>
-Date: Thu, 22 Jun 2023 12:26:25 +0200
-Subject: [PATCH] Make sure to read the rendering intent before the CICP tag
-
-The code that reads the CICP tag exits the function if it succeeds, but
-it should not skip reading the rendering intent, so make sure to have
-already done it by that point.
----
- lib/jxl/enc_color_management.cc | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-Index: libjxl/lib/jxl/enc_color_management.cc
-===================================================================
---- libjxl.orig/lib/jxl/enc_color_management.cc
-+++ libjxl/lib/jxl/enc_color_management.cc
-@@ -922,6 +922,14 @@ Status ColorEncoding::SetFieldsFromICC()
- Profile profile;
- JXL_RETURN_IF_ERROR(DecodeProfile(context, icc_, &profile));
-
-+ const cmsUInt32Number rendering_intent32 =
-+ cmsGetHeaderRenderingIntent(profile.get());
-+ if (rendering_intent32 > 3) {
-+ return JXL_FAILURE("Invalid rendering intent %u\n", rendering_intent32);
-+ }
-+ // ICC and RenderingIntent have the same values (0..3).
-+ rendering_intent = static_cast<RenderingIntent>(rendering_intent32);
-+
- static constexpr size_t kCICPSize = 12;
- static constexpr auto kCICPSignature =
- static_cast<cmsTagSignature>(0x63696370);
-@@ -933,14 +941,6 @@ Status ColorEncoding::SetFieldsFromICC()
- return true;
- }
-
-- const cmsUInt32Number rendering_intent32 =
-- cmsGetHeaderRenderingIntent(profile.get());
-- if (rendering_intent32 > 3) {
-- return JXL_FAILURE("Invalid rendering intent %u\n", rendering_intent32);
-- }
-- // ICC and RenderingIntent have the same values (0..3).
-- rendering_intent = static_cast<RenderingIntent>(rendering_intent32);
--
- SetColorSpace(ColorSpaceFromProfile(profile));
- if (cmsGetColorSpace(profile.get()) == cmsSigCmykData) {
- cmyk_ = true;
diff --git a/debian/patches/bigendian.patch b/debian/patches/bigendian.patch
deleted file mode 100644
index c3d321e..0000000
--- a/debian/patches/bigendian.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: Remove failing tests on big-endian
- This test has been heavily modified in git/main branch and does not fails
- anymore on big-endian architectures.
-Author: Mathieu Malaterre <ma...@debian.org>
-Bug-Debian: https://bugs.debian.org/1029698
-Forwarded: https://github.com/libjxl/libjxl/issues/2433
-Last-Update: 2023-10-11
-
-Index: libjxl/lib/jpegli/decode_api_test.cc
-===================================================================
---- libjxl.orig/lib/jpegli/decode_api_test.cc
-+++ libjxl/lib/jpegli/decode_api_test.cc
-@@ -143,6 +143,7 @@ bool LoadNextChunk(const TestConfig& con
-
- class DecodeAPITestParam : public ::testing::TestWithParam<TestConfig> {};
-
-+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
- TEST_P(DecodeAPITestParam, TestAPI) {
- TestConfig config = GetParam();
- const std::vector<uint8_t> compressed = ReadTestData(config.fn.c_str());
-@@ -414,6 +415,7 @@ TEST_P(DecodeAPITestParam, TestAPI) {
-
- jpegli_destroy_decompress(&cinfo);
- }
-+#endif
-
- std::vector<TestConfig> GenerateTests() {
- std::vector<TestConfig> all_tests;
-@@ -590,9 +592,11 @@ std::string TestDescription(
- return name.str();
- }
-
-+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
- JPEGLI_INSTANTIATE_TEST_SUITE_P(DecodeAPITest, DecodeAPITestParam,
- testing::ValuesIn(GenerateTests()),
- TestDescription);
-+#endif
-
- } // namespace
- } // namespace jpegli
diff --git a/debian/patches/continuefinalnonessentialboxtest.patch b/debian/patches/continuefinalnonessentialboxtest.patch
deleted file mode 100644
index 563d460..0000000
--- a/debian/patches/continuefinalnonessentialboxtest.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Remove failing test for now
-Author: Mathieu Malaterre <ma...@debian.org>
-Forwarded: https://github.com/libjxl/libjxl/issues/1710
-Last-Update: 2022-08-22
-
-Index: libjxl/lib/jxl/decode_test.cc
-===================================================================
---- libjxl.orig/lib/jxl/decode_test.cc
-+++ libjxl/lib/jxl/decode_test.cc
-@@ -4862,7 +4862,7 @@ TEST(DecodeTest, JXL_TRANSCODE_JPEG_TEST
- VerifyJPEGReconstruction(jxl, jpeg);
- }
-
--TEST(DecodeTest, ContinueFinalNonEssentialBoxTest) {
-+TEST(DecodeTest, DISABLED_ContinueFinalNonEssentialBoxTest) {
- size_t xsize = 80, ysize = 90;
- std::vector<uint8_t> pixels = jxl::test::GetSomeTestImage(xsize, ysize, 4, 0);
- jxl::TestCodestreamParams params;
diff --git a/debian/patches/do_not_force_cxx11.patch b/debian/patches/do_not_force_cxx11.patch
index 0e43555..f17cf68 100644
--- a/debian/patches/do_not_force_cxx11.patch
+++ b/debian/patches/do_not_force_cxx11.patch
@@ -9,7 +9,7 @@ Index: libjxl/CMakeLists.txt
===================================================================
--- libjxl.orig/CMakeLists.txt
+++ libjxl/CMakeLists.txt
-@@ -210,9 +210,9 @@ find_package(Threads REQUIRED)
+@@ -246,9 +246,9 @@ find_package(Threads REQUIRED)
# These settings are important to drive check_cxx_source_compiles
# See CMP0067 (min cmake version is 3.10 anyway)
@@ -25,12 +25,12 @@ Index: libjxl/lib/CMakeLists.txt
===================================================================
--- libjxl.orig/lib/CMakeLists.txt
+++ libjxl/lib/CMakeLists.txt
-@@ -39,7 +39,7 @@ set(JPEGXL_INTERNAL_FLAGS
- # WARN_FLAGS
- -Wall
- -Wextra
-- -Wc++11-compat
-+ -Wc++17-compat
- -Warray-bounds
- -Wformat-security
- -Wimplicit-fallthrough
+@@ -39,7 +39,7 @@ else ()
+ # WARN_FLAGS
+ -Wall
+ -Wextra
+- -Wc++11-compat
++ -Wc++17-compat
+ -Warray-bounds
+ -Wformat-security
+ -Wimplicit-fallthrough
diff --git a/debian/patches/f0973c3bb1203b2382cd7c7251de584fa693273c.patch b/debian/patches/f0973c3bb1203b2382cd7c7251de584fa693273c.patch
deleted file mode 100644
index 6ed98a5..0000000
--- a/debian/patches/f0973c3bb1203b2382cd7c7251de584fa693273c.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From f0973c3bb1203b2382cd7c7251de584fa693273c Mon Sep 17 00:00:00 2001
-From: Sami Boukortt <sbouko...@google.com>
-Date: Mon, 26 Jun 2023 15:06:17 +0200
-Subject: [PATCH] Fix decode_test with lcms2
-
-Co-authored-by: Zoltan Szabadka <szaba...@google.com>
-Co-authored-by: Luca Versari <vel...@google.com>
----
- lib/jxl/decode_test.cc | 17 +++++++++++------
- 1 file changed, 11 insertions(+), 6 deletions(-)
-
-Index: libjxl/lib/jxl/decode_test.cc
-===================================================================
---- libjxl.orig/lib/jxl/decode_test.cc
-+++ libjxl/lib/jxl/decode_test.cc
-@@ -3736,13 +3736,18 @@ void AnalyzeCodestream(const jxl::Padded
- jxl::Span<const uint8_t>(codestream.data(), codestream.size()));
- ASSERT_EQ(br.ReadFixedBits<16>(), 0x0AFF);
- jxl::CodecMetadata metadata;
-- EXPECT_TRUE(ReadSizeHeader(&br, &metadata.size));
-- EXPECT_TRUE(ReadImageMetadata(&br, &metadata.m));
-+ ASSERT_TRUE(ReadSizeHeader(&br, &metadata.size));
-+ ASSERT_TRUE(ReadImageMetadata(&br, &metadata.m));
- streampos->basic_info =
- add_offset(br.TotalBitsConsumed() / jxl::kBitsPerByte);
- metadata.transform_data.nonserialized_xyb_encoded = metadata.m.xyb_encoded;
-- EXPECT_TRUE(jxl::Bundle::Read(&br, &metadata.transform_data));
-- EXPECT_TRUE(br.JumpToByteBoundary());
-+ ASSERT_TRUE(jxl::Bundle::Read(&br, &metadata.transform_data));
-+ if (metadata.m.color_encoding.WantICC()) {
-+ jxl::PaddedBytes icc;
-+ ASSERT_TRUE(jxl::ReadICC(&br, &icc));
-+ ASSERT_TRUE(metadata.m.color_encoding.SetICCRaw(std::move(icc)));
-+ }
-+ ASSERT_TRUE(br.JumpToByteBoundary());
- bool has_preview = metadata.m.have_preview;
- while (br.TotalBitsConsumed() < br.TotalBytes() * jxl::kBitsPerByte) {
- FramePositions p;
-@@ -3752,7 +3757,7 @@ void AnalyzeCodestream(const jxl::Padded
- frame_header.nonserialized_is_preview = true;
- has_preview = false;
- }
-- EXPECT_TRUE(ReadFrameHeader(&br, &frame_header));
-+ ASSERT_TRUE(ReadFrameHeader(&br, &frame_header));
- p.header_end =
- add_offset(jxl::DivCeil(br.TotalBitsConsumed(), jxl::kBitsPerByte));
- jxl::FrameDimensions frame_dim = frame_header.ToFrameDimensions();
-@@ -3762,7 +3767,7 @@ void AnalyzeCodestream(const jxl::Padded
- frame_header.passes.num_passes, /*has_ac_global=*/true);
- std::vector<uint64_t> section_offsets;
- std::vector<uint32_t> section_sizes;
-- EXPECT_TRUE(ReadGroupOffsets(toc_entries, &br, §ion_offsets,
-+ ASSERT_TRUE(ReadGroupOffsets(toc_entries, &br, §ion_offsets,
- §ion_sizes, &groups_total_size));
- EXPECT_EQ(br.TotalBitsConsumed() % jxl::kBitsPerByte, 0);
- size_t sections_start = br.TotalBitsConsumed() / jxl::kBitsPerByte;
diff --git a/debian/patches/hwy.patch b/debian/patches/hwy.patch
deleted file mode 100644
index b035c0c..0000000
--- a/debian/patches/hwy.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-Description: Transition to hwy config.cmake
-Author: Mathieu Malaterre <ma...@debian.org>
-Forwarded: no
-Last-Update: 2023-02-01
-
-Index: libjxl/third_party/CMakeLists.txt
-===================================================================
---- libjxl.orig/third_party/CMakeLists.txt
-+++ libjxl/third_party/CMakeLists.txt
-@@ -30,7 +30,7 @@ if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/highway/LICENSE"
- ${PROJECT_BINARY_DIR}/LICENSE.highway COPYONLY)
- else()
-- find_package(HWY 0.15.0)
-+ find_package(HWY 1.0.0)
- if (NOT HWY_FOUND)
- message(FATAL_ERROR
- "Highway library (hwy) not found. Install libhwy-dev or download it "
-Index: libjxl/lib/jxl.cmake
-===================================================================
---- libjxl.orig/lib/jxl.cmake
-+++ libjxl/lib/jxl.cmake
-@@ -365,7 +365,7 @@ set(JPEGXL_INTERNAL_SOURCES_ENC
- set_source_files_properties(jxl/enc_fast_lossless.cc PROPERTIES COMPILE_FLAGS -O3)
-
- set(JPEGXL_DEC_INTERNAL_LIBS
-- hwy
-+ hwy::hwy
- Threads::Threads
- ${ATOMICS_LIBRARIES}
- )
-@@ -425,7 +425,7 @@ set_property(TARGET jxl_dec-obj PROPERTY
- target_include_directories(jxl_dec-obj PUBLIC
- "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>"
- "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
-- "$<BUILD_INTERFACE:$<TARGET_PROPERTY:hwy,INTERFACE_INCLUDE_DIRECTORIES>>"
-+ "$<BUILD_INTERFACE:$<TARGET_PROPERTY:hwy::hwy,INTERFACE_INCLUDE_DIRECTORIES>>"
- "$<BUILD_INTERFACE:$<TARGET_PROPERTY:brotlicommon-static,INTERFACE_INCLUDE_DIRECTORIES>>"
- )
- target_compile_definitions(jxl_dec-obj PUBLIC
-@@ -443,7 +443,7 @@ set_property(TARGET jxl_enc-obj PROPERTY
- target_include_directories(jxl_enc-obj PUBLIC
- ${PROJECT_SOURCE_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}/include
-- $<TARGET_PROPERTY:hwy,INTERFACE_INCLUDE_DIRECTORIES>
-+ $<TARGET_PROPERTY:hwy::hwy,INTERFACE_INCLUDE_DIRECTORIES>
- $<TARGET_PROPERTY:brotlicommon-static,INTERFACE_INCLUDE_DIRECTORIES>
- )
- target_compile_definitions(jxl_enc-obj PUBLIC
-Index: libjxl/lib/jxl_extras.cmake
-===================================================================
---- libjxl.orig/lib/jxl_extras.cmake
-+++ libjxl/lib/jxl_extras.cmake
-@@ -81,7 +81,7 @@ target_include_directories(jxl_extras_co
- ${PROJECT_SOURCE_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}/include
- ${CMAKE_CURRENT_BINARY_DIR}/include
-- $<TARGET_PROPERTY:hwy,INTERFACE_INCLUDE_DIRECTORIES>
-+ $<TARGET_PROPERTY:hwy::hwy,INTERFACE_INCLUDE_DIRECTORIES>
- )
- set(JXL_EXTRAS_CODEC_INTERNAL_LIBRARIES)
- set(JXL_EXTRAS_CODEC_PUBLIC_COMPILE_DEFINITIONS)
-Index: libjxl/CMakeLists.txt
-===================================================================
---- libjxl.orig/CMakeLists.txt
-+++ libjxl/CMakeLists.txt
-@@ -22,6 +22,8 @@ if(POLICY CMP0083)
- endif()
-
- project(LIBJXL LANGUAGES C CXX)
-+# Make sure HWY variable are at top-level:
-+find_package(HWY 1.0.0 REQUIRED)
-
- include(CheckCXXSourceCompiles)
- check_cxx_source_compiles(
-Index: libjxl/cmake/FindHWY.cmake
-===================================================================
---- libjxl.orig/cmake/FindHWY.cmake
-+++ /dev/null
-@@ -1,66 +0,0 @@
--# Copyright (c) the JPEG XL Project Authors. All rights reserved.
--#
--# Use of this source code is governed by a BSD-style
--# license that can be found in the LICENSE file.
--
--find_package(PkgConfig QUIET)
--if (PkgConfig_FOUND)
-- pkg_check_modules(PC_HWY QUIET libhwy)
-- set(HWY_VERSION ${PC_HWY_VERSION})
--endif ()
--
--find_path(HWY_INCLUDE_DIR
-- NAMES hwy/highway.h
-- HINTS ${PC_HWY_INCLUDEDIR} ${PC_HWY_INCLUDE_DIRS}
--)
--
--find_library(HWY_LIBRARY
-- NAMES ${HWY_NAMES} hwy
-- HINTS ${PC_HWY_LIBDIR} ${PC_HWY_LIBRARY_DIRS}
--)
--
--if (HWY_INCLUDE_DIR AND NOT HWY_VERSION)
-- if (EXISTS "${HWY_INCLUDE_DIR}/hwy/highway.h")
-- file(READ "${HWY_INCLUDE_DIR}/hwy/highway.h" HWY_VERSION_CONTENT)
--
-- string(REGEX MATCH "#define HWY_MAJOR +([0-9]+)" _dummy "${HWY_VERSION_CONTENT}")
-- set(HWY_VERSION_MAJOR "${CMAKE_MATCH_1}")
--
-- string(REGEX MATCH "#define +HWY_MINOR +([0-9]+)" _dummy "${HWY_VERSION_CONTENT}")
-- set(HWY_VERSION_MINOR "${CMAKE_MATCH_1}")
--
-- string(REGEX MATCH "#define +HWY_PATCH +([0-9]+)" _dummy "${HWY_VERSION_CONTENT}")
-- set(HWY_VERSION_PATCH "${CMAKE_MATCH_1}")
--
-- set(HWY_VERSION "${HWY_VERSION_MAJOR}.${HWY_VERSION_MINOR}.${HWY_VERSION_PATCH}")
-- endif ()
--endif ()
--
--include(FindPackageHandleStandardArgs)
--find_package_handle_standard_args(HWY
-- FOUND_VAR HWY_FOUND
-- REQUIRED_VARS HWY_LIBRARY HWY_INCLUDE_DIR
-- VERSION_VAR HWY_VERSION
--)
--
--if (HWY_LIBRARY AND NOT TARGET hwy)
-- add_library(hwy INTERFACE IMPORTED GLOBAL)
--
-- if(CMAKE_VERSION VERSION_LESS "3.13.5")
-- set_property(TARGET hwy PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${HWY_INCLUDE_DIR})
-- target_link_libraries(hwy INTERFACE ${HWY_LIBRARY})
-- set_property(TARGET hwy PROPERTY INTERFACE_COMPILE_OPTIONS ${PC_HWY_CFLAGS_OTHER})
-- else()
-- target_include_directories(hwy INTERFACE ${HWY_INCLUDE_DIR})
-- target_link_libraries(hwy INTERFACE ${HWY_LIBRARY})
-- target_link_options(hwy INTERFACE ${PC_HWY_LDFLAGS_OTHER})
-- target_compile_options(hwy INTERFACE ${PC_HWY_CFLAGS_OTHER})
-- endif()
--endif()
--
--mark_as_advanced(HWY_INCLUDE_DIR HWY_LIBRARY)
--
--if (HWY_FOUND)
-- set(HWY_LIBRARIES ${HWY_LIBRARY})
-- set(HWY_INCLUDE_DIRS ${HWY_INCLUDE_DIR})
--endif ()
-Index: libjxl/lib/jpegli.cmake
-===================================================================
---- libjxl.orig/lib/jpegli.cmake
-+++ libjxl/lib/jpegli.cmake
-@@ -41,7 +41,7 @@ set(JPEGLI_INTERNAL_SOURCES
- )
-
- set(JPEGLI_INTERNAL_LIBS
-- hwy
-+ hwy::hwy
- jxl-static
- Threads::Threads
- ${ATOMICS_LIBRARIES}
-@@ -55,7 +55,7 @@ target_include_directories(jpegli-static
- "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>"
- "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
- "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>"
-- "$<BUILD_INTERFACE:$<TARGET_PROPERTY:hwy,INTERFACE_INCLUDE_DIRECTORIES>>"
-+ "$<BUILD_INTERFACE:$<TARGET_PROPERTY:hwy::hwy,INTERFACE_INCLUDE_DIRECTORIES>>"
- )
- target_include_directories(jpegli-static PUBLIC "${JPEG_INCLUDE_DIRS}")
- target_link_libraries(jpegli-static PUBLIC ${JPEGLI_INTERNAL_LIBS})
-@@ -86,7 +86,7 @@ foreach (TESTFILE IN LISTS TEST_FILES)
- -DTEST_DATA_PATH="${JPEGXL_TEST_DATA_PATH}")
- target_include_directories(${TESTNAME} PRIVATE "${PROJECT_SOURCE_DIR}")
- target_link_libraries(${TESTNAME}
-- hwy
-+ hwy::hwy
- jpegli-static
- gmock
- GTest::GTest
diff --git a/debian/patches/series b/debian/patches/series
index f439561..cb38fb5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,3 @@
do_not_force_cxx11.patch
-continuefinalnonessentialboxtest.patch
manpages.patch
-0008-Fix-conformance-test.patch
-0009-fast_dct-inl.h-Include-std-headers-to-solve-missing-.patch
-hwy.patch
-383df4487f59da140fd1ce112548a2cd11e4eaeb.patch
-f0973c3bb1203b2382cd7c7251de584fa693273c.patch
-22d12d74e7bc56b09cfb1973aa89ec8d714fa3fc.patch
-bigendian.patch
+add_headers.patch
diff --git a/debian/rules b/debian/rules
index d04aa54..e6bb0c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,9 +24,6 @@ ifneq (,$(filter $(DEB_HOST_ARCH), armhf))
DEB_CXXFLAGS_MAINT_APPEND += -fno-tree-vectorize
endif
-# Temp fix for 0.7.0-10.x i386/s390x build; see https://bugs.debian.org/1053641
-DEB_CXXFLAGS_MAINT_APPEND += -fexcess-precision=fast
-
ifneq (,$(filter $(DEB_HOST_ARCH), arm64 armel armhf ppc64el))
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77728
DEB_CXXFLAGS_MAINT_APPEND += -Wno-psabi
@@ -62,8 +59,13 @@ CMAKE_EXTRA_FLAGS += \
-DJPEGXL_ENABLE_DOXYGEN:BOOL=$(ENABLE_DOXYGEN) \
-DJPEGXL_ENABLE_EXAMPLES:BOOL=ON \
-DJPEGXL_ENABLE_JNI:BOOL=$(ENABLE_JNI) \
+ -DJPEGXL_ENABLE_JPEGLI:BOOL=ON \
+ -DJPEGXL_ENABLE_JPEGLI_LIBJPEG:BOOL=ON \
-DJPEGXL_ENABLE_OPENEXR:BOOL=ON \
- -DJPEGXL_ENABLE_PLUGINS:BOOL=OFF \
+ -DJPEGXL_ENABLE_PLUGINS:BOOL=ON \
+ -DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF:BOOL=ON \
+ -DJPEGXL_ENABLE_PLUGIN_GIMP210:BOOL=OFF \
+ -DJPEGXL_ENABLE_PLUGIN_MIME:BOOL=OFF \
-DJPEGXL_ENABLE_SJPEG:BOOL=OFF \
-DJPEGXL_ENABLE_SKCMS:BOOL=OFF \
-DJPEGXL_ENABLE_TCMALLOC:BOOL=$(ENABLE_TCMALLOC) \
@@ -73,6 +75,7 @@ CMAKE_EXTRA_FLAGS += \
-DJPEGXL_FORCE_SYSTEM_LCMS2:BOOL=ON \
-DJPEGXL_INSTALL_JARDIR:PATH=share/java \
-DJPEGXL_INSTALL_JNIDIR:PATH=lib/$(DEB_HOST_MULTIARCH)/jni \
+ -DJPEGXL_INSTALL_JPEGLI_LIBJPEG:BOOL=ON \
-DJPEGXL_TEST_DATA_PATH:PATH=/usr/share/libjxl-testdata \
override_dh_auto_configure:
@@ -83,6 +86,13 @@ override_dh_auto_build-indep:
override_dh_auto_install-indep:
+override_dh_install-arch:
+ mkdir -p ./debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/
+ cp -v /usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/libjpeg.pc ./debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/libjpeg.pc
+ mkdir -p ./debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/
+ mv -v ./debian/tmp/usr/include/jconfig.h ./debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/jconfig.h
+ dh_install --
+
override_dh_install-indep:
dh_install -X.md5 -pjpeg-xl-doc obj-*/html usr/share/doc/jpeg-xl-doc
@@ -112,10 +122,10 @@ debian/%.1: debian/%.1.in
.PHONY: tools_manpages devtools_manpages get-orig-source
-tools_manpages: debian/cjpeg_hdr.1 debian/jxlinfo.1
+tools_manpages: debian/jxlinfo.1 debian/cjpegli.1 debian/djpegli.1
echo "all tools manpages generated"
-devtools_manpages: debian/butteraugli_main.1 debian/decode_and_encode.1 debian/display_to_hlg.1 debian/fuzzer_corpus.1 debian/generate_lut_template.1 debian/jxl_from_tree.1 debian/pq_to_hlg.1 debian/render_hlg.1 debian/ssimulacra_main.1 debian/texture_to_cube.1 debian/tone_map.1 debian/xyb_range.1 debian/benchmark_xl.1
+devtools_manpages: debian/butteraugli_main.1 debian/decode_and_encode.1 debian/display_to_hlg.1 debian/generate_lut_template.1 debian/jxl_from_tree.1 debian/pq_to_hlg.1 debian/render_hlg.1 debian/ssimulacra_main.1 debian/texture_to_cube.1 debian/tone_map.1 debian/xyb_range.1 debian/benchmark_xl.1
echo $(DEVTOOLS)
echo "all devtools manpages generated"
