• Bug#1065354: Updated patch for 1065354 (4/4)

    From Julian Wollrath@21:1/5 to All on Sun Mar 3 12:30:02 2024
    [continued from previous message]

    ++struct jpeg_c_prep_controller { long dummy; };
    ++struct jpeg_c_coef_controller { long dummy; };
    ++struct jpeg_marker_writer { long dummy; };
    ++struct jpeg_color_converter { long dummy; };
    ++struct jpeg_downsampler { long dummy; };
    ++struct jpeg_forward_dct { long dummy; };
    ++struct jpeg_entropy_encoder { long dummy; };
    ++struct jpeg_decomp_master { long dummy; };
    ++struct jpeg_d_main_controller { long dummy; };
    ++struct jpeg_d_coef_controller { long dummy; };
    ++struct jpeg_d_post_controller { long dummy; };
    ++struct jpeg_input_controller { long dummy; };
    ++struct jpeg_marker_reader { long dummy; };
    ++struct jpeg_entropy_decoder { long dummy; };
    ++struct jpeg_inverse_dct { long dummy; };
    ++struct jpeg_upsampler { long dummy; };
    ++struct jpeg_color_deconverter { long dummy; };
    ++struct jpeg_color_quantizer { long dummy; };
    ++#endif /* JPEG_INTERNALS */
    ++#endif /* INCOMPLETE_TYPES_BROKEN */
    ++
    ++
    ++/*
    ++ * The JPEG library modules define JPEG_INTERNALS before including this file. ++ * The internal structure declarations are read only when that is true.
    ++ * Applications using the library should not include jpegint.h, but may wish ++ * to include jerror.h.
    ++ */
    ++
    ++#ifdef JPEG_INTERNALS
    ++#include "jpegint.h" /* fetch private declarations */
    ++#include "jerror.h" /* fetch error codes too */
    ++#endif
    ++
    ++#ifdef __cplusplus
    ++#ifndef DONT_USE_EXTERN_C
    ++}
    ++#endif
    ++#endif
    ++
    ++#endif /* JPEGLIB_H */
    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 <malat@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(DecodeAPITestPara