Control: tags -1 +patch +pending X-Debbugs-CC: ma...@debian.org Dear maintainer,
I've prepared an NMU for jpeg-xl (versioned as 0.7.0-11) and uploaded it to DELAYED/14. Please feel free to tell me if I should delay it longer. Regards. diff -Nru jpeg-xl-0.7.0/debian/changelog jpeg-xl-0.7.0/debian/changelog --- jpeg-xl-0.7.0/debian/changelog 2023-01-29 07:01:36.000000000 -0500 +++ jpeg-xl-0.7.0/debian/changelog 2023-09-23 12:52:43.000000000 -0400 @@ -1,3 +1,17 @@ +jpeg-xl (0.7.0-10.1) unstable; urgency=medium + + * Non-maintainer upload. + + [ Boyuan Yang ] + * debian/patches/: + + 0007-tools-CMakeLists.txt-Fix-compatibility-with-static-l.patch: + Fix compatibility with libwebp 1.3.x. (Closes: #1052486) + * 0008-Fix-conformance-test.patch: Fix unit test that was previously + skipped but now failing. (Closes: #1051560) + * debian/control: Require libwebp-dev (>= 1.3) due to patch 0007. + + -- Boyuan Yang <by...@debian.org> Sat, 23 Sep 2023 12:52:43 -0400 + jpeg-xl (0.7.0-10) unstable; urgency=medium * d/patches: Improve cjxl/djxl manpages. Closes: #1023641 diff -Nru jpeg-xl-0.7.0/debian/control jpeg-xl-0.7.0/debian/control --- jpeg-xl-0.7.0/debian/control 2023-01-29 06:59:42.000000000 -0500 +++ jpeg-xl-0.7.0/debian/control 2023-09-23 12:34:14.000000000 -0400 @@ -23,7 +23,7 @@ liblcms-dev | liblcms2-dev (>= 2.13), libopenexr-dev, libpng-dev, - libwebp-dev, + libwebp-dev (>= 1.3), ninja-build, pkg-config Build-Depends-Indep: doxygen, graphviz diff -Nru jpeg-xl-0.7.0/debian/patches/0007-tools-CMakeLists.txt-Fix-compatibility-with-static-l.patch jpeg-xl-0.7.0/debian/patches/0007-tools-CMakeLists.txt-Fix- compatibility-with-static-l.patch --- jpeg-xl-0.7.0/debian/patches/0007-tools-CMakeLists.txt-Fix-compatibility-with-static-l.patch 1969-12-31 19:00:00.000000000 -0500 +++ jpeg-xl-0.7.0/debian/patches/0007-tools-CMakeLists.txt-Fix-compatibility-with-static-l.patch 2023-09-23 12:31:13.000000000 -0400 @@ -0,0 +1,27 @@ +From: Boyuan Yang <by...@debian.org> +Date: Fri, 22 Sep 2023 17:12:33 -0400 +Subject: tools/CMakeLists.txt: Fix compatibility with static libwebp 1.3.x + +Bug-Debian: https://bugs.debian.org/1052486 + +--- + tools/CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt +index 934ed89..6556845 100644 +--- a/tools/CMakeLists.txt ++++ b/tools/CMakeLists.txt +@@ -249,7 +249,12 @@ if(JPEGXL_ENABLE_BENCHMARK AND JPEGXL_ENABLE_TOOLS) + message(WARNING "Using dynamic libwebp") + target_link_libraries(benchmark_xl PkgConfig::WebP) + else() ++ # Debian-specific patch ++ # libwebp 1.3.x: libsharpyuv static library must be linked as well ++ find_library(SHARPYUV_STATIC_LINK_LIBRARY NAMES libsharpyuv.a ++ PATHS "${WebP_LIBDIR}" REQUIRED) + target_link_libraries(benchmark_xl "${WebP_STATIC_LINK_LIBRARY}") ++ target_link_libraries(benchmark_xl "${SHARPYUV_STATIC_LINK_LIBRARY}") + target_include_directories(benchmark_xl + PRIVATE ${WebP_STATIC_INCLUDE_DIRS}) + target_compile_options(benchmark_xl PRIVATE ${WebP_STATIC_CFLAGS_OTHER}) diff -Nru jpeg-xl-0.7.0/debian/patches/0008-Fix-conformance-test.patch jpeg-xl-0.7.0/debian/patches/0008-Fix-conformance-test.patch --- jpeg-xl-0.7.0/debian/patches/0008-Fix-conformance-test.patch 1969-12-31 19:00:00.000000000 -0500 +++ jpeg-xl-0.7.0/debian/patches/0008-Fix-conformance-test.patch 2023-09-23 12:31:32.000000000 -0400 @@ -0,0 +1,36 @@ +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 -Nru jpeg-xl-0.7.0/debian/patches/series jpeg-xl-0.7.0/debian/patches/series --- jpeg-xl-0.7.0/debian/patches/series 2023-01-29 06:59:42.000000000 -0500 +++ jpeg-xl-0.7.0/debian/patches/series 2023-09-23 12:30:58.000000000 -0400 @@ -4,3 +4,5 @@ de08116d14db785431f3efb651dcf2af15bbb682.patch 1a36db0bf452a2232f0a15d7d8edb542e8196401.patch manpages.patch +0007-tools-CMakeLists.txt-Fix-compatibility-with-static-l.patch +0008-Fix-conformance-test.patch
signature.asc
Description: This is a digitally signed message part