[neon/backports-noble/jpeg-xl-noble/Neon/release] debian/patches: refresh patches

Carlos De Maine null at kde.org
Wed Dec 18 11:51:14 GMT 2024 

Git commit 0fe1e739faa4ed393918603b24176757b7375186 by Carlos De Maine.
Committed on 18/12/2024 at 11:51.
Pushed by carlosdem into branch 'Neon/release'.

refresh patches

M  +2    -6    debian/patches/0008-Fix-conformance-test.patch
D  +0    -28   debian/patches/0009-fast_dct-inl.h-Include-std-headers-to-solve-missing-.patch
M  +10   -14   debian/patches/bigendian.patch
D  +0    -23   debian/patches/do_not_force_cxx11.patch
M  +3    -5    debian/patches/help_return_no_error.patch
M  +7    -11   debian/patches/hwy.patch
M  +8    -12   debian/patches/manpages.patch
M  +0    -2    debian/patches/series

https://invent.kde.org/neon/backports-noble/jpeg-xl-noble/-/commit/0fe1e739faa4ed393918603b24176757b7375186

diff --git a/debian/patches/0008-Fix-conformance-test.patch b/debian/patches/0008-Fix-conformance-test.patch
index ed2c439..b31ede4 100644
--- a/debian/patches/0008-Fix-conformance-test.patch
+++ b/debian/patches/0008-Fix-conformance-test.patch
@@ -9,11 +9,9 @@ Bug-Debian: https://bugs.debian.org/1051560
  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):
+@@ -67,7 +67,7 @@
          cmd.extend(['--icc_out', pixel_prefix + '.icc'])
  
          # Decode and generate the reference files.
@@ -22,11 +20,9 @@ index e2a9b2e..d59c3f4 100755
  
          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() {
+@@ -42,6 +42,7 @@
      build_dir=$(realpath "${MYDIR}/../../build")
    fi
  
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 be686dd..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 <byang at 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
-@@ -16,6 +16,9 @@
- 
- #include "lib/jxl/base/status.h"
- 
-+#include <cmath>
-+#include <array>
-+
- HWY_BEFORE_NAMESPACE();
- namespace jxl {
- namespace HWY_NAMESPACE {
diff --git a/debian/patches/bigendian.patch b/debian/patches/bigendian.patch
index b29f31c..b37c658 100644
--- a/debian/patches/bigendian.patch
+++ b/debian/patches/bigendian.patch
@@ -3,11 +3,9 @@ Author: Mathieu Malaterre <malat at debian.org>
 Forwarded: https://github.com/libjxl/libjxl/issues/3629
 Last-Update: 2024-06-07
 
-Index: libjxl/lib/jxl/jxl_test.cc
-===================================================================
---- libjxl.orig/lib/jxl/jxl_test.cc
-+++ libjxl/lib/jxl/jxl_test.cc
-@@ -1575,6 +1575,7 @@ TEST(JxlTest, RoundtripUnsignedCustomBit
+--- a/lib/jxl/jxl_test.cc
++++ b/lib/jxl/jxl_test.cc
+@@ -1723,6 +1723,7 @@
    }
  }
  
@@ -15,7 +13,7 @@ Index: libjxl/lib/jxl/jxl_test.cc
  TEST(JxlTest, LosslessPNMRoundtrip) {
    static const char* kChannels[] = {"", "g", "ga", "rgb", "rgba"};
    static const char* kExtension[] = {"", ".pgm", ".pam", ".ppm", ".pam"};
-@@ -1612,9 +1613,11 @@ TEST(JxlTest, LosslessPNMRoundtrip) {
+@@ -1761,9 +1762,11 @@
      }
    }
  }
@@ -27,8 +25,8 @@ Index: libjxl/lib/jxl/jxl_test.cc
  TEST_P(JxlTest, LosslessSmallFewColors) {
    ThreadPoolForTests pool(8);
    const std::vector<uint8_t> orig = ReadTestData(GetParam());
-@@ -1631,6 +1634,9 @@ TEST_P(JxlTest, LosslessSmallFewColors)
-   Roundtrip(t.ppf(), cparams, dparams, &pool, &ppf_out);
+@@ -1781,6 +1784,9 @@
+   Roundtrip(t.ppf(), cparams, dparams, pool.get(), &ppf_out);
    EXPECT_EQ(ComputeDistance2(t.ppf(), ppf_out), 0.0);
  }
 +#else
@@ -37,11 +35,9 @@ Index: libjxl/lib/jxl/jxl_test.cc
  
  JXL_GTEST_INSTANTIATE_TEST_SUITE_P(
      ImageTests, JxlTest,
-Index: libjxl/lib/jxl/encode_test.cc
-===================================================================
---- libjxl.orig/lib/jxl/encode_test.cc
-+++ libjxl/lib/jxl/encode_test.cc
-@@ -1923,6 +1923,7 @@ TEST_P(EncoderStreamingTest, OutputCallb
+--- a/lib/jxl/encode_test.cc
++++ b/lib/jxl/encode_test.cc
+@@ -1923,6 +1923,7 @@
    EXPECT_LE(streaming_compressed.size(), compressed.size() + 1024);
  }
  
@@ -49,7 +45,7 @@ Index: libjxl/lib/jxl/encode_test.cc
  TEST_P(EncoderStreamingTest, ChunkedFrame) {
    const StreamingTestParam p = GetParam();
    size_t xsize = p.onegroup() ? 17 : 257;
-@@ -2024,6 +2025,7 @@ TEST_P(EncoderStreamingTest, ChunkedAndO
+@@ -2024,6 +2025,7 @@
    EXPECT_TRUE(SameDecodedPixels(compressed, streaming_compressed));
    EXPECT_LE(streaming_compressed.size(), compressed.size() + 1024);
  }
diff --git a/debian/patches/do_not_force_cxx11.patch b/debian/patches/do_not_force_cxx11.patch
deleted file mode 100644
index ea017b1..0000000
--- a/debian/patches/do_not_force_cxx11.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Not clear why upstream force -std=c++11
- Current gcc default is c++17 so use that instead.
-Author: Mathieu Malaterre <malat at debian.org>
-Origin: upstream
-Forwarded: https://github.com/libjxl/libjxl/pull/1100
-Last-Update: 2021-12-15
-
-Index: libjxl/CMakeLists.txt
-===================================================================
---- libjxl.orig/CMakeLists.txt
-+++ libjxl/CMakeLists.txt
-@@ -224,9 +224,9 @@ find_package(Threads REQUIRED)
- 
- # These settings are important to drive check_cxx_source_compiles
- # See CMP0067 (min cmake version is 3.10 anyway)
--set(CMAKE_CXX_STANDARD 11)
-+set(CMAKE_CXX_STANDARD 17)
- set(CMAKE_CXX_EXTENSIONS OFF)
--set(CMAKE_CXX_STANDARD_REQUIRED YES)
-+set(CMAKE_CXX_STANDARD_REQUIRED NO)
- 
- # Atomics
- find_package(Atomics REQUIRED)
diff --git a/debian/patches/help_return_no_error.patch b/debian/patches/help_return_no_error.patch
index cced01b..4405071 100644
--- a/debian/patches/help_return_no_error.patch
+++ b/debian/patches/help_return_no_error.patch
@@ -3,11 +3,9 @@ Author: Mathieu Malaterre <malat at debian.org>
 Forwarded: not-needed
 Last-Update: 2024-07-05
 
-Index: libjxl/tools/ssimulacra2_main.cc
-===================================================================
---- libjxl.orig/tools/ssimulacra2_main.cc
-+++ libjxl/tools/ssimulacra2_main.cc
-@@ -38,7 +38,7 @@ int PrintUsage(char** argv) {
+--- a/tools/ssimulacra2_main.cc
++++ b/tools/ssimulacra2_main.cc
+@@ -48,7 +48,7 @@
    fprintf(stderr,
            "                             average output of cjxl -q 90 or "
            "mozjpeg -quality 90)\n");
diff --git a/debian/patches/hwy.patch b/debian/patches/hwy.patch
index 8eaec99..20147b3 100644
--- a/debian/patches/hwy.patch
+++ b/debian/patches/hwy.patch
@@ -3,11 +3,9 @@ Author: Mathieu Malaterre <malat at debian.org>
 Forwarded: no
 Last-Update: 2023-02-01
 
-Index: libjxl/CMakeLists.txt
-===================================================================
---- libjxl.orig/CMakeLists.txt
-+++ libjxl/CMakeLists.txt
-@@ -8,6 +8,8 @@ cmake_minimum_required(VERSION 3.16...3.
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,6 +8,8 @@
  list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
  
  project(LIBJXL LANGUAGES C CXX)
@@ -16,10 +14,8 @@ Index: libjxl/CMakeLists.txt
  
  # TODO(sboukortt): remove once oss-fuzz passes -DBUILD_SHARED_LIBS=OFF
  if(JPEGXL_ENABLE_FUZZERS)
-Index: libjxl/lib/jpegli.cmake
-===================================================================
---- libjxl.orig/lib/jpegli.cmake
-+++ libjxl/lib/jpegli.cmake
+--- a/lib/jpegli.cmake
++++ b/lib/jpegli.cmake
 @@ -3,6 +3,7 @@
  # Use of this source code is governed by a BSD-style
  # license that can be found in the LICENSE file.
@@ -28,12 +24,12 @@ Index: libjxl/lib/jpegli.cmake
  include(jxl_lists.cmake)
  
  set(JPEGLI_INTERNAL_LIBS
-@@ -86,7 +87,7 @@ foreach (TESTFILE IN LISTS JPEGXL_INTERN
+@@ -86,7 +87,7 @@
      "${CMAKE_CURRENT_BINARY_DIR}/include"
    )
    target_link_libraries(${TESTNAME}
 -    hwy
 +    hwy::hwy
      jpegli-static
-     gmock
      GTest::GTest
+     GTest::Main
diff --git a/debian/patches/manpages.patch b/debian/patches/manpages.patch
index 5937fb4..415bdbf 100644
--- a/debian/patches/manpages.patch
+++ b/debian/patches/manpages.patch
@@ -3,11 +3,9 @@ Author: Mathieu Malaterre <malat at debian.org>
 Forwarded: https://github.com/libjxl/libjxl/pull/1288
 Last-Update: 2022-03-29
 
-Index: libjxl/doc/man/cjxl.txt
-===================================================================
---- libjxl.orig/doc/man/cjxl.txt
-+++ libjxl/doc/man/cjxl.txt
-@@ -31,40 +31,31 @@ cjxl input.gif output.jxl
+--- a/doc/man/cjxl.txt
++++ b/doc/man/cjxl.txt
+@@ -31,40 +31,31 @@
  Options
  -------
  
@@ -63,7 +61,7 @@ Index: libjxl/doc/man/cjxl.txt
  +
  Recognized effort settings, from fastest to slowest, are:
  +
-@@ -78,6 +69,176 @@ Recognized effort settings, from fastest
+@@ -78,6 +69,176 @@
  - 8 or ``kitten''
  - 9 or ``tortoise''
  
@@ -240,11 +238,9 @@ Index: libjxl/doc/man/cjxl.txt
  Examples
  --------
  
-Index: libjxl/doc/man/djxl.txt
-===================================================================
---- libjxl.orig/doc/man/djxl.txt
-+++ libjxl/doc/man/djxl.txt
-@@ -24,23 +24,65 @@ produced, with names of the form "'outpu
+--- a/doc/man/djxl.txt
++++ b/doc/man/djxl.txt
+@@ -24,23 +24,65 @@
  Options
  -------
  
@@ -322,7 +318,7 @@ Index: libjxl/doc/man/djxl.txt
  
  
  Examples
-@@ -54,6 +96,25 @@ $ djxl input.jxl output.png
+@@ -54,6 +96,25 @@
  $ djxl lossless-jpeg.jxl reconstructed.jpeg
  ----
  
diff --git a/debian/patches/series b/debian/patches/series
index 208b283..e6dee75 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,5 @@
-do_not_force_cxx11.patch
 manpages.patch
 0008-Fix-conformance-test.patch
-0009-fast_dct-inl.h-Include-std-headers-to-solve-missing-.patch
 hwy.patch
 bigendian.patch
 help_return_no_error.patch

More information about the Neon-commits mailing list