From 9072eb333c440b558edb3ffdddc5261c8429e1df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 14 Feb 2024 00:57:16 +0000 Subject: [PATCH 01/22] bootstrap 0.9.2 to build aom --- .gitignore | 2 ++ jpegxl.spec | 25 ++++++++++++++++--------- sources | 4 ++-- update_third_party.sh | 2 +- 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index cac3f58..3228965 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ /third_party-0.8.1.tar.gz /jpegxl-0.8.2.tar.gz /third_party-0.8.2.tar.gz +/jpegxl-0.9.2.tar.gz +/third_party-0.9.2.tar.gz diff --git a/jpegxl.spec b/jpegxl.spec index 2617bf7..67d9f98 100644 --- a/jpegxl.spec +++ b/jpegxl.spec @@ -3,9 +3,9 @@ # Uncomment for special build to rebuild aom on bumped soname. -#global new_soname 1 -%global sover_old 0.7 -%global sover 0.8 +%global new_soname 1 +%global sover_old 0.8 +%global sover 0.9 %global gdk_pixbuf_moduledir $(pkgconf gdk-pixbuf-2.0 --variable=gdk_pixbuf_moduledir) @@ -20,7 +20,7 @@ decoder).} Name: jpegxl Epoch: 1 -Version: 0.8.2 +Version: 0.9.2 Release: %autorelease %{?new_soname:-p -e 0~sonamebump} Summary: JPEG XL image format reference implementation @@ -30,8 +30,7 @@ Summary: JPEG XL image format reference implementation # skcms: BSD License: BSD-3-Clause AND Apache-2.0 AND Zlib URL: https://jpeg.org/jpegxl/ -VCS: https://github.com/libjxl/libjxl -Source0: %vcs/archive/v%{version}/%{name}-%{version}.tar.gz +Source0: https://github.com/libjxl/libjxl/archive/v%{version}/%{name}-%{version}.tar.gz # set VERSION and run ./update_third_party.sh to get Source1 Source1: third_party-%{version}.tar.gz @@ -169,7 +168,7 @@ rm -rf third_party/ %install %cmake_install -rm -v %{buildroot}%{_libdir}/*.a +#rm -v %{buildroot}%{_libdir}/*.a %if 0%{?new_soname} cp -p %{_libdir}/libjxl.so.%{sover_old}* \ @@ -181,13 +180,15 @@ cp -p %{_libdir}/libjxl.so.%{sover_old}* \ %doc CONTRIBUTING.md CONTRIBUTORS README.md %{_bindir}/cjxl %{_bindir}/djxl -%{_bindir}/cjpeg_hdr +%{_bindir}/cjpegli +%{_bindir}/djpegli %{_bindir}/jxlinfo %{_mandir}/man1/cjxl.1* %{_mandir}/man1/djxl.1* %files -n libjxl-devtools -%{_bindir}/fuzzer_corpus +%{_bindir}/djxl_fuzzer_corpus +%{_bindir}/jpegli_dec_fuzzer_corpus %{_bindir}/butteraugli_main %{_bindir}/decode_and_encode %{_bindir}/display_to_hlg @@ -201,6 +202,7 @@ cp -p %{_libdir}/libjxl.so.%{sover_old}* \ %{_bindir}/ssimulacra2 %{_bindir}/xyb_range %{_bindir}/jxl_from_tree +%{_bindir}/local_tone_map %files doc %doc doc/*.md @@ -211,6 +213,8 @@ cp -p %{_libdir}/libjxl.so.%{sover_old}* \ %license LICENSE %{_libdir}/libjxl.so.%{sover}* %{_libdir}/libjxl_threads.so.%{sover}* +%{_libdir}/libjxl_cms.so.%{sover}* +%{_libdir}/libjxl_extras_codec.so.%{sover}* %if 0%{?new_soname} %{_libdir}/libjxl.so.%{sover_old}* %{_libdir}/libjxl_threads.so.%{sover_old}* @@ -224,8 +228,11 @@ cp -p %{_libdir}/libjxl.so.%{sover_old}* \ %{_includedir}/jxl/ %{_libdir}/libjxl.so %{_libdir}/libjxl_threads.so +%{_libdir}/libjxl_cms.so +%{_libdir}/libjxl_extras_codec.so %{_libdir}/pkgconfig/libjxl.pc %{_libdir}/pkgconfig/libjxl_threads.pc +%{_libdir}/pkgconfig/libjxl_cms.pc %files -n jxl-pixbuf-loader %license LICENSE diff --git a/sources b/sources index 91cd511..c223f54 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (jpegxl-0.8.2.tar.gz) = 769f102c46755d11a705ce47ae9e2ef49627ae708f416693bf1293aeeb713934baf4466e45b9c70b04ec1fc8b4a00d5ca7688c8ca03f0a91c9a15252c522a887 -SHA512 (third_party-0.8.2.tar.gz) = 74f536c19d38b413bbca0988d8b36aae73110af3b19b78932309fa1892f99f0cc4984cbc4d96dde0716ee993c62f14464a639f8f0a4907c0e6f5ad37b1228816 +SHA512 (jpegxl-0.9.2.tar.gz) = 97bc0ccd249fe0fa6d0f52c470a0d0bd181e3f00cd9820dda5ca437dff260e6c9e2c95dceec4bd9354c3adc4fc6724228cb027c537af6df7d3f90ab8ee61653f +SHA512 (third_party-0.9.2.tar.gz) = 756047cd8146e26f52ec002cdf49f335a62fd7df95ffc32bd0c1be03c24aebcef1c42b83a26144cadd3b51494ed620656cd9af356904275e3c234385972b32b9 diff --git a/update_third_party.sh b/update_third_party.sh index 23411ab..bf81fac 100755 --- a/update_third_party.sh +++ b/update_third_party.sh @@ -1,4 +1,4 @@ -VERSION=0.8.2 +VERSION=0.9.2 if [ ! -d libjxl ]; then git clone https://github.com/libjxl/libjxl From 4eb04f897e40e0b6048d7224071de0f5e6f4fe2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 14 Feb 2024 02:09:43 +0000 Subject: [PATCH 02/22] un-bootstrap jpegxl --- jpegxl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jpegxl.spec b/jpegxl.spec index 67d9f98..bf1abae 100644 --- a/jpegxl.spec +++ b/jpegxl.spec @@ -3,7 +3,7 @@ # Uncomment for special build to rebuild aom on bumped soname. -%global new_soname 1 +#global new_soname 1 %global sover_old 0.8 %global sover 0.9 From 0c6ab9af7dd6533660958eed0340f39db620518d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 13 Mar 2024 00:33:00 +0000 Subject: [PATCH 03/22] bootstrap 0.10.2 to start soname bump of jpegxl --- .gitignore | 2 ++ jpegxl.spec | 8 ++++---- sources | 4 ++-- update_third_party.sh | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 3228965..6d66d1a 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,5 @@ /third_party-0.8.2.tar.gz /jpegxl-0.9.2.tar.gz /third_party-0.9.2.tar.gz +/jpegxl-0.10.2.tar.gz +/third_party-0.10.2.tar.gz diff --git a/jpegxl.spec b/jpegxl.spec index bf1abae..9f996dc 100644 --- a/jpegxl.spec +++ b/jpegxl.spec @@ -3,9 +3,9 @@ # Uncomment for special build to rebuild aom on bumped soname. -#global new_soname 1 +%global new_soname 1 %global sover_old 0.8 -%global sover 0.9 +%global sover 0.10 %global gdk_pixbuf_moduledir $(pkgconf gdk-pixbuf-2.0 --variable=gdk_pixbuf_moduledir) @@ -20,7 +20,7 @@ decoder).} Name: jpegxl Epoch: 1 -Version: 0.9.2 +Version: 0.10.2 Release: %autorelease %{?new_soname:-p -e 0~sonamebump} Summary: JPEG XL image format reference implementation @@ -221,7 +221,7 @@ cp -p %{_libdir}/libjxl.so.%{sover_old}* \ %endif %dir %{_datadir}/thumbnailers %{_datadir}/thumbnailers/jxl.thumbnailer -%{_datadir}/mime/packages/image-jxl.xml +#%%{_datadir}/mime/packages/image-jxl.xml %files -n libjxl-devel %doc CONTRIBUTING.md diff --git a/sources b/sources index c223f54..eb943d5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (jpegxl-0.9.2.tar.gz) = 97bc0ccd249fe0fa6d0f52c470a0d0bd181e3f00cd9820dda5ca437dff260e6c9e2c95dceec4bd9354c3adc4fc6724228cb027c537af6df7d3f90ab8ee61653f -SHA512 (third_party-0.9.2.tar.gz) = 756047cd8146e26f52ec002cdf49f335a62fd7df95ffc32bd0c1be03c24aebcef1c42b83a26144cadd3b51494ed620656cd9af356904275e3c234385972b32b9 +SHA512 (jpegxl-0.10.2.tar.gz) = 1d19f30c0ae94e212326a15dc128612bce207e619c55c2a020401a27d01a933de71bb35e907521dc8fd853dd5578d74d74f7a5a282f0083fd22cf9cb07ccb96e +SHA512 (third_party-0.10.2.tar.gz) = 88abdacdd39ed0442c86d59e44b6a3aa154ee7e559a3c5cb390f2851c876621c6fc4d1ff3ad300c4d04f89e972c2adb598bf45f90bd9851c6760fdc7497d71d7 diff --git a/update_third_party.sh b/update_third_party.sh index bf81fac..197ed19 100755 --- a/update_third_party.sh +++ b/update_third_party.sh @@ -1,4 +1,4 @@ -VERSION=0.9.2 +VERSION=0.10.2 if [ ! -d libjxl ]; then git clone https://github.com/libjxl/libjxl From 31a7d99680d6b9298039a1f9ffb7becd86cd91d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 13 Mar 2024 01:12:53 +0000 Subject: [PATCH 04/22] fix the build --- jpegxl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jpegxl.spec b/jpegxl.spec index 9f996dc..3c70f24 100644 --- a/jpegxl.spec +++ b/jpegxl.spec @@ -221,7 +221,7 @@ cp -p %{_libdir}/libjxl.so.%{sover_old}* \ %endif %dir %{_datadir}/thumbnailers %{_datadir}/thumbnailers/jxl.thumbnailer -#%%{_datadir}/mime/packages/image-jxl.xml +%{_datadir}/mime/packages/image-jxl.xml %files -n libjxl-devel %doc CONTRIBUTING.md From a0530bedafc13a7c24cf15ccaf882fbb06698b3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 25 Mar 2024 16:34:14 +0000 Subject: [PATCH 05/22] un-bootstrap --- jpegxl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jpegxl.spec b/jpegxl.spec index 3c70f24..d710aae 100644 --- a/jpegxl.spec +++ b/jpegxl.spec @@ -3,7 +3,7 @@ # Uncomment for special build to rebuild aom on bumped soname. -%global new_soname 1 +#%%global new_soname 1 %global sover_old 0.8 %global sover 0.10 From 2a68871b2c4c60f85f3886c62e05bb62b2e6835f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Thu, 18 Apr 2024 00:16:05 +0100 Subject: [PATCH 06/22] BR pkgconfig(lcms2) directly to fix build on eln --- jpegxl.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/jpegxl.spec b/jpegxl.spec index d710aae..5436d3f 100644 --- a/jpegxl.spec +++ b/jpegxl.spec @@ -53,6 +53,7 @@ BuildRequires: gtest-devel BuildRequires: gflags-devel BuildRequires: pkgconfig(libhwy) BuildRequires: pkgconfig(libbrotlicommon) +BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(libpng) ## benchmark tools are not built From a0c453281b74672b36405b6107f25137d5b8af89 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 23 Apr 2024 08:00:07 -0600 Subject: [PATCH 07/22] Rebuild for openexr 3.2.4 From 1def8f6932bb3775dbdbf18781a50a91a81ca407 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 6 Jul 2024 16:18:34 +0100 Subject: [PATCH 08/22] Configure Packit for release automation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Using same logic of https://src.fedoraproject.org/rpms/opencv/pull-request/28 by Laura Barcziová --- .packit.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .packit.yaml diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..cd9ebce --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,17 @@ +# See the documentation for more information: +# https://packit.dev/docs/configuration/ + +upstream_project_url: https://github.com/libjxl/libjxl +upstream_tag_template: v{version} + +# run opencv-clean.sh +# the sed currently hacks the script so that the version is correctly set and the sources upload is handled by Packit +actions: + pre-sync: + - bash -c "cd ${PACKIT_DOWNSTREAM_REPO}; sed '1d' ./update_third_party.sh | VERSION=${PACKIT_PROJECT_VERSION} bash" + +jobs: + - job: pull_from_upstream + trigger: release + dist_git_branches: + - fedora-rawhide From 58fa8f975837dd29044517ed0ce5c6c8c74202c9 Mon Sep 17 00:00:00 2001 From: Packit Date: Sun, 7 Jul 2024 01:01:33 +0000 Subject: [PATCH 09/22] Update to 0.10.3 upstream release - Resolves: rhbz#2295526 Upstream tag: v0.10.3 Upstream commit: 4a3b22d2 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 2 ++ README.packit | 3 +++ jpegxl.spec | 2 +- sources | 4 ++-- 4 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 README.packit diff --git a/.gitignore b/.gitignore index 6d66d1a..8fa24e7 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,5 @@ /third_party-0.9.2.tar.gz /jpegxl-0.10.2.tar.gz /third_party-0.10.2.tar.gz +/jpegxl-0.10.3.tar.gz +/third_party-0.10.3.tar.gz diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..f2be23e --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 0.97.3.post1.dev7+g1954e49a. diff --git a/jpegxl.spec b/jpegxl.spec index 5436d3f..9741c07 100644 --- a/jpegxl.spec +++ b/jpegxl.spec @@ -20,7 +20,7 @@ decoder).} Name: jpegxl Epoch: 1 -Version: 0.10.2 +Version: 0.10.3 Release: %autorelease %{?new_soname:-p -e 0~sonamebump} Summary: JPEG XL image format reference implementation diff --git a/sources b/sources index eb943d5..c47dbc9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (jpegxl-0.10.2.tar.gz) = 1d19f30c0ae94e212326a15dc128612bce207e619c55c2a020401a27d01a933de71bb35e907521dc8fd853dd5578d74d74f7a5a282f0083fd22cf9cb07ccb96e -SHA512 (third_party-0.10.2.tar.gz) = 88abdacdd39ed0442c86d59e44b6a3aa154ee7e559a3c5cb390f2851c876621c6fc4d1ff3ad300c4d04f89e972c2adb598bf45f90bd9851c6760fdc7497d71d7 +SHA512 (jpegxl-0.10.3.tar.gz) = 5ece482f4c5f0312e87e020f921525622a6d3f1a3834f3cd8666638fc8d0fba8cd072ef58f7b153dc17ca19071ebae2fbad7b08e6d440c2669f4f1b35888a7d4 +SHA512 (third_party-0.10.3.tar.gz) = 94786cd2a535bd9da816b7155414c512228b7a8f70b5d52dc74b7e0d41de6b3d88cd1c99b2859ebb55fd237156edbb7f8a9bf3969b368f982f1037a24b613db5 From 194e176568e982ee7b10e3121b467893e8b0aae5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 7 Jul 2024 04:11:05 +0100 Subject: [PATCH 10/22] Fix generation of third_party sources --- sources | 2 +- update_third_party.sh | 23 +++++++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/sources b/sources index c47dbc9..ca7d7e1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (jpegxl-0.10.3.tar.gz) = 5ece482f4c5f0312e87e020f921525622a6d3f1a3834f3cd8666638fc8d0fba8cd072ef58f7b153dc17ca19071ebae2fbad7b08e6d440c2669f4f1b35888a7d4 -SHA512 (third_party-0.10.3.tar.gz) = 94786cd2a535bd9da816b7155414c512228b7a8f70b5d52dc74b7e0d41de6b3d88cd1c99b2859ebb55fd237156edbb7f8a9bf3969b368f982f1037a24b613db5 +SHA512 (third_party-0.10.3.tar.gz) = 4f7e22ab2240c49bece7056fc2216662d70c3cbc7eca5b60684eafee68a3fd0f9bdf1dddaaff0eb1c095c545f55fbfd294e49adde2b5846c47661c5b9f86db6d diff --git a/update_third_party.sh b/update_third_party.sh index 197ed19..40af41b 100755 --- a/update_third_party.sh +++ b/update_third_party.sh @@ -1,15 +1,18 @@ -VERSION=0.10.2 +VERSION=0.10.3 -if [ ! -d libjxl ]; then git clone https://github.com/libjxl/libjxl -fi cd libjxl/ git checkout . git checkout v${VERSION} -git submodule init ; git submodule update -git pull -rm -r third_party/brotli/ third_party/googletest/ -rm -r third_party/HEVCSoftware/ third_party/highway/ -rm -r third_party/lcms/ third_party/libpng/ -rm -r third_party/skcms/profiles/ third_party/zlib -tar -zcvf ../third_party-${VERSION}.tar.gz third_party/ +./deps.sh +rm -r third_party/brotli/ +rm -r third_party/googletest/ +rm -r third_party/HEVCSoftware/ +rm -r third_party/highway/ +rm -r third_party/lcms/ +rm -r third_party/libpng/ +rm -r third_party/skcms/profiles/ +rm -r third_party/zlib +tar -zcf ../third_party-${VERSION}.tar.gz third_party/ +cd .. +rm -rf libjxl/ From 19f643135c6ca39617c1f5fbd89b2f4b7bc100b2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 11:07:33 +0000 Subject: [PATCH 11/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From e87d18bbd6054e7190ce9a6db25aa8dbd3c99563 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Thu, 19 Sep 2024 01:15:02 +0100 Subject: [PATCH 12/22] Disable gimp_plugin, jpegxl don't support Gimp 3 yet --- jpegxl.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jpegxl.spec b/jpegxl.spec index 9741c07..6786895 100644 --- a/jpegxl.spec +++ b/jpegxl.spec @@ -9,8 +9,8 @@ %global gdk_pixbuf_moduledir $(pkgconf gdk-pixbuf-2.0 --variable=gdk_pixbuf_moduledir) +%bcond_with gimp_plugin %if 0%{?fedora} -%bcond_without gimp_plugin %bcond_without tcmalloc %endif @@ -45,7 +45,7 @@ BuildRequires: gperftools-devel %endif BuildRequires: ninja-build %if %{with gimp_plugin} -BuildRequires: pkgconfig(gimp-2.0) +BuildRequires: pkgconfig(gimp-3.0) %endif ## sjpeg examples are not built #BuildRequires: (pkgconfig(glut) or pkgconfig(freeglut)) From 33965822fb52c8e6565a4c6a20b141c326f80312 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 29 Oct 2024 22:57:23 +0000 Subject: [PATCH 13/22] Fix upgrade path Resolves: rhbz#2322528 --- jpegxl.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jpegxl.spec b/jpegxl.spec index 6786895..4f32399 100644 --- a/jpegxl.spec +++ b/jpegxl.spec @@ -112,6 +112,9 @@ Requires: shared-mime-info Recommends: jxl-pixbuf-loader = %{epoch}:%{version}-%{release} Provides: jpegxl-libs = %{epoch}:%{version}-%{release} Obsoletes: jpegxl-libs < 0.3.7-5 +%if %{without gimp_plugin} +Obsoletes: gimp-jxl-plugin < 1:0.10.3-4 +%endif %description -n libjxl %{common_description} From 88ff0faff837d347d985db210833727230c2688b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 08:00:14 +0000 Subject: [PATCH 14/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 94959b88d34f054bc335e7ad70ab1d71f9a21546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Thu, 30 Jan 2025 23:12:19 +0000 Subject: [PATCH 15/22] Update jpegxl to 0.10.4 --- .gitignore | 2 ++ jpegxl.spec | 2 +- sources | 4 ++-- update_third_party.sh | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 8fa24e7..ef88f15 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,5 @@ /third_party-0.10.2.tar.gz /jpegxl-0.10.3.tar.gz /third_party-0.10.3.tar.gz +/jpegxl-0.10.4.tar.gz +/third_party-0.10.4.tar.gz diff --git a/jpegxl.spec b/jpegxl.spec index 4f32399..459c5a8 100644 --- a/jpegxl.spec +++ b/jpegxl.spec @@ -20,7 +20,7 @@ decoder).} Name: jpegxl Epoch: 1 -Version: 0.10.3 +Version: 0.10.4 Release: %autorelease %{?new_soname:-p -e 0~sonamebump} Summary: JPEG XL image format reference implementation diff --git a/sources b/sources index ca7d7e1..0c559aa 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (jpegxl-0.10.3.tar.gz) = 5ece482f4c5f0312e87e020f921525622a6d3f1a3834f3cd8666638fc8d0fba8cd072ef58f7b153dc17ca19071ebae2fbad7b08e6d440c2669f4f1b35888a7d4 -SHA512 (third_party-0.10.3.tar.gz) = 4f7e22ab2240c49bece7056fc2216662d70c3cbc7eca5b60684eafee68a3fd0f9bdf1dddaaff0eb1c095c545f55fbfd294e49adde2b5846c47661c5b9f86db6d +SHA512 (jpegxl-0.10.4.tar.gz) = db713ec5627ce66750209b7a62345ba0fa74568bbf43627fe86053aa70295a9b7ba738dac34c5449bb258c99909a19416465a971447ebb28c69514c65f0b9295 +SHA512 (third_party-0.10.4.tar.gz) = f8e4d1f26182244943e3735f650670caf00bf6c58709658f642004cc27632d585c6988816ac1eb455bbb86a6c80235fbc3273a61018f85b4bc65382972ef07ad diff --git a/update_third_party.sh b/update_third_party.sh index 40af41b..a9bfd32 100755 --- a/update_third_party.sh +++ b/update_third_party.sh @@ -1,4 +1,4 @@ -VERSION=0.10.3 +VERSION=0.10.4 git clone https://github.com/libjxl/libjxl cd libjxl/ From 2e24065015889667c48d8df0412adf23aaa5fb9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 2 Feb 2025 16:39:23 +0000 Subject: [PATCH 16/22] Update to 0.11.1 upstream release - Resolves: rhbz#2312322 Upstream tag: v0.11.1 Upstream commit: 794a5dcf Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 4 ++-- README.packit | 2 +- jpegxl.spec | 21 ++++++++++----------- sources | 4 ++-- update_third_party.sh | 19 ++++++++++--------- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index ef88f15..f95e8ed 100644 --- a/.gitignore +++ b/.gitignore @@ -20,5 +20,5 @@ /third_party-0.10.2.tar.gz /jpegxl-0.10.3.tar.gz /third_party-0.10.3.tar.gz -/jpegxl-0.10.4.tar.gz -/third_party-0.10.4.tar.gz +/jpegxl-0.11.1.tar.gz +/third_party-0.11.1.tar.gz diff --git a/README.packit b/README.packit index f2be23e..fafa6eb 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.97.3.post1.dev7+g1954e49a. +The file was generated using packit 0.104.1. diff --git a/jpegxl.spec b/jpegxl.spec index 459c5a8..0ae018d 100644 --- a/jpegxl.spec +++ b/jpegxl.spec @@ -3,9 +3,9 @@ # Uncomment for special build to rebuild aom on bumped soname. -#%%global new_soname 1 -%global sover_old 0.8 -%global sover 0.10 +%global new_soname 1 +%global sover_old 0.10 +%global sover 0.11 %global gdk_pixbuf_moduledir $(pkgconf gdk-pixbuf-2.0 --variable=gdk_pixbuf_moduledir) @@ -20,7 +20,7 @@ decoder).} Name: jpegxl Epoch: 1 -Version: 0.10.4 +Version: 0.11.1 Release: %autorelease %{?new_soname:-p -e 0~sonamebump} Summary: JPEG XL image format reference implementation @@ -71,9 +71,9 @@ BuildRequires: libjxl < %{epoch}:%{version} %endif # No official release -Provides: bundled(sjpeg) = 0-0.1.20210522git868ab55 +Provides: bundled(sjpeg) = 0-0.1.20230608gite5ab130 # Build system is Bazel, which is not packaged by Fedora -Provides: bundled(skcms) = 0-0.1.20210522git6437475 +Provides: bundled(skcms) = 0-0.1.20240122git51b7f2a %description %common_description @@ -177,6 +177,7 @@ rm -rf third_party/ %if 0%{?new_soname} cp -p %{_libdir}/libjxl.so.%{sover_old}* \ %{_libdir}/libjxl_threads.so.%{sover_old}* \ + %{_libdir}/libjxl_cms.so.%{sover_old}* \ %{buildroot}%{_libdir} %endif @@ -184,19 +185,17 @@ cp -p %{_libdir}/libjxl.so.%{sover_old}* \ %doc CONTRIBUTING.md CONTRIBUTORS README.md %{_bindir}/cjxl %{_bindir}/djxl -%{_bindir}/cjpegli -%{_bindir}/djpegli %{_bindir}/jxlinfo %{_mandir}/man1/cjxl.1* %{_mandir}/man1/djxl.1* %files -n libjxl-devtools %{_bindir}/djxl_fuzzer_corpus -%{_bindir}/jpegli_dec_fuzzer_corpus %{_bindir}/butteraugli_main %{_bindir}/decode_and_encode %{_bindir}/display_to_hlg %{_bindir}/exr_to_pq +%{_bindir}/icc_simplify %{_bindir}/pq_to_hlg %{_bindir}/render_hlg %{_bindir}/tone_map @@ -218,10 +217,10 @@ cp -p %{_libdir}/libjxl.so.%{sover_old}* \ %{_libdir}/libjxl.so.%{sover}* %{_libdir}/libjxl_threads.so.%{sover}* %{_libdir}/libjxl_cms.so.%{sover}* -%{_libdir}/libjxl_extras_codec.so.%{sover}* %if 0%{?new_soname} %{_libdir}/libjxl.so.%{sover_old}* %{_libdir}/libjxl_threads.so.%{sover_old}* +%{_libdir}/libjxl_cms.so.%{sover_old}* %endif %dir %{_datadir}/thumbnailers %{_datadir}/thumbnailers/jxl.thumbnailer @@ -233,7 +232,7 @@ cp -p %{_libdir}/libjxl.so.%{sover_old}* \ %{_libdir}/libjxl.so %{_libdir}/libjxl_threads.so %{_libdir}/libjxl_cms.so -%{_libdir}/libjxl_extras_codec.so +%{_libdir}/libjxl_extras_codec.a %{_libdir}/pkgconfig/libjxl.pc %{_libdir}/pkgconfig/libjxl_threads.pc %{_libdir}/pkgconfig/libjxl_cms.pc diff --git a/sources b/sources index 0c559aa..7d1c479 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (jpegxl-0.10.4.tar.gz) = db713ec5627ce66750209b7a62345ba0fa74568bbf43627fe86053aa70295a9b7ba738dac34c5449bb258c99909a19416465a971447ebb28c69514c65f0b9295 -SHA512 (third_party-0.10.4.tar.gz) = f8e4d1f26182244943e3735f650670caf00bf6c58709658f642004cc27632d585c6988816ac1eb455bbb86a6c80235fbc3273a61018f85b4bc65382972ef07ad +SHA512 (jpegxl-0.11.1.tar.gz) = 0cfd81d9d3b783f96bd04f244d73ffbc12186c89993d46064a2751bef0a446a5e86be05add5c10f60d4482d39333d9bf3f9a866d6eb84f8fa0d4e8b5828fd74c +SHA512 (third_party-0.11.1.tar.gz) = f76e20360594e010f1a04e5522e879f65d0360bc31cda21a724f8f4d65668eed276890f6187acef43fafe939c67a080251f1d4bdcb05f21c3ac9957afdef0a7b diff --git a/update_third_party.sh b/update_third_party.sh index a9bfd32..ab8f567 100755 --- a/update_third_party.sh +++ b/update_third_party.sh @@ -1,18 +1,19 @@ -VERSION=0.10.4 +VERSION=0.11.1 git clone https://github.com/libjxl/libjxl cd libjxl/ git checkout . git checkout v${VERSION} ./deps.sh -rm -r third_party/brotli/ -rm -r third_party/googletest/ -rm -r third_party/HEVCSoftware/ -rm -r third_party/highway/ -rm -r third_party/lcms/ -rm -r third_party/libpng/ -rm -r third_party/skcms/profiles/ -rm -r third_party/zlib +rm -rvf third_party/brotli/ +rm -rvf third_party/googletest/ +rm -rvf third_party/HEVCSoftware/ +rm -rvf third_party/highway/ +rm -rvf third_party/lcms/ +rm -rvf third_party/libjpeg-turbo +rm -rvf third_party/libpng/ +rm -rvf third_party/skcms/profiles/ +rm -rvf third_party/zlib tar -zcf ../third_party-${VERSION}.tar.gz third_party/ cd .. rm -rf libjxl/ From 37e9aa2a6115639f84784599ebe7afdf154108e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 4 Feb 2025 03:56:47 +0000 Subject: [PATCH 17/22] un-bootstrap --- jpegxl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jpegxl.spec b/jpegxl.spec index 0ae018d..416c2fd 100644 --- a/jpegxl.spec +++ b/jpegxl.spec @@ -3,7 +3,7 @@ # Uncomment for special build to rebuild aom on bumped soname. -%global new_soname 1 +#global new_soname 1 %global sover_old 0.10 %global sover 0.11 From 832e061db2d07b077fb0f2403241d4e2242a1368 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 18:04:40 +0000 Subject: [PATCH 18/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 5e4a034b684f39844aa566d9576d585c32c2083d Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Tue, 12 Aug 2025 19:43:58 +0200 Subject: [PATCH 19/22] enable tests skip tests failing on s390x --- .gitignore | 1 + jpegxl.spec | 18 ++++++++++++++---- sources | 1 + update_third_party.sh | 1 + 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f95e8ed..7a5cfa7 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /third_party-0.10.3.tar.gz /jpegxl-0.11.1.tar.gz /third_party-0.11.1.tar.gz +/testdata-0.11.1.tar.gz diff --git a/jpegxl.spec b/jpegxl.spec index 416c2fd..25877c3 100644 --- a/jpegxl.spec +++ b/jpegxl.spec @@ -32,8 +32,9 @@ License: BSD-3-Clause AND Apache-2.0 AND Zlib URL: https://jpeg.org/jpegxl/ Source0: https://github.com/libjxl/libjxl/archive/v%{version}/%{name}-%{version}.tar.gz -# set VERSION and run ./update_third_party.sh to get Source1 +# set VERSION and run ./update_third_party.sh to get Source1 and Source2 Source1: third_party-%{version}.tar.gz +Source2: testdata-%{version}.tar.gz BuildRequires: asciidoc BuildRequires: cmake @@ -51,6 +52,7 @@ BuildRequires: pkgconfig(gimp-3.0) #BuildRequires: (pkgconfig(glut) or pkgconfig(freeglut)) BuildRequires: gtest-devel BuildRequires: gflags-devel +BuildRequires: gmock-devel BuildRequires: pkgconfig(libhwy) BuildRequires: pkgconfig(libbrotlicommon) BuildRequires: pkgconfig(lcms2) @@ -151,12 +153,12 @@ This is a GIMP plugin for loading and saving JPEG-XL images. %prep %autosetup -p1 -n libjxl-%{version} -rm -rf third_party/ -%setup -q -T -D -a 1 -n libjxl-%{version} +rm -rf testdata/ third_party/ +%setup -q -T -D -a 1 -a 2 -n libjxl-%{version} %build %cmake -DENABLE_CCACHE=1 \ - -DBUILD_TESTING=OFF \ + -DBUILD_TESTING=ON \ -DINSTALL_GTEST:BOOL=OFF \ -DJPEGXL_ENABLE_BENCHMARK:BOOL=OFF \ -DJPEGXL_ENABLE_PLUGINS:BOOL=ON \ @@ -181,6 +183,14 @@ cp -p %{_libdir}/libjxl.so.%{sover_old}* \ %{buildroot}%{_libdir} %endif +%check +%ifarch s390x +# https://github.com/libjxl/libjxl/issues/3629 +%ctest -E 'DecodeTest\.(ProgressionTestLosslessAlpha|FlushTestLosslessProgressiveAlpha)|EncodeTest\.FrameSettingsTest|JxlTest\.RoundtripAlpha(Resampling(OnlyAlpha)?|16)|JxlTest\.RoundtripProgressive(Level2Slow)?|ModularTest\.RoundtripLossy(DeltaPalette|16)?|RoundtripLossless/ModularTestParam\.RoundtripLossless/1bitSqueeze|RoundtripLossless/ModularTestParam\.RoundtripLossless/(1|2[01467]|30)bitSqueeze|PassesTest\.ProgressiveDownsample2DegradesCorrectly(Grayscale)?' +%else +%ctest +%endif + %files -n libjxl-utils %doc CONTRIBUTING.md CONTRIBUTORS README.md %{_bindir}/cjxl diff --git a/sources b/sources index 7d1c479..30cd74c 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (jpegxl-0.11.1.tar.gz) = 0cfd81d9d3b783f96bd04f244d73ffbc12186c89993d46064a2751bef0a446a5e86be05add5c10f60d4482d39333d9bf3f9a866d6eb84f8fa0d4e8b5828fd74c SHA512 (third_party-0.11.1.tar.gz) = f76e20360594e010f1a04e5522e879f65d0360bc31cda21a724f8f4d65668eed276890f6187acef43fafe939c67a080251f1d4bdcb05f21c3ac9957afdef0a7b +SHA512 (testdata-0.11.1.tar.gz) = e775be0e8a56a828a4b70a174c841b3d474dbd170d899c50343896b21e46c6ae20f017f905ad7b83e097031e8add2788a00b1c452aa22e159b1f3a4e72a47155 diff --git a/update_third_party.sh b/update_third_party.sh index ab8f567..70ba696 100755 --- a/update_third_party.sh +++ b/update_third_party.sh @@ -15,5 +15,6 @@ rm -rvf third_party/libpng/ rm -rvf third_party/skcms/profiles/ rm -rvf third_party/zlib tar -zcf ../third_party-${VERSION}.tar.gz third_party/ +tar -zcf ../testdata-${VERSION}.tar.gz testdata/ cd .. rm -rf libjxl/ From 4aa1c6f773479fe611266b6d61fb7b6ea88f5306 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Thu, 4 Sep 2025 16:58:52 -0500 Subject: [PATCH 20/22] Disable the pixbuf loader and thumbnailer Due to changes in gdk-pixbuf, the jpegxl pixbuf loader now has lower precedence than glycin and will no longer ever be used. Also, the gdk-pixbuf-thumbnailer no longer exists, so this thumbnailer is guaranteed to fail. For more information, see: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/7FTIVJJM5CJSJ6GIX4FV6JDUCT2NW5FY/ https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/229 --- jpegxl.spec | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/jpegxl.spec b/jpegxl.spec index 25877c3..f15e902 100644 --- a/jpegxl.spec +++ b/jpegxl.spec @@ -7,8 +7,6 @@ %global sover_old 0.10 %global sover 0.11 -%global gdk_pixbuf_moduledir $(pkgconf gdk-pixbuf-2.0 --variable=gdk_pixbuf_moduledir) - %bcond_with gimp_plugin %if 0%{?fedora} %bcond_without tcmalloc @@ -77,12 +75,13 @@ Provides: bundled(sjpeg) = 0-0.1.20230608gite5ab130 # Build system is Bazel, which is not packaged by Fedora Provides: bundled(skcms) = 0-0.1.20240122git51b7f2a +Obsoletes: jxl-pixbuf-loader < %{epoch}:%{version}-%{release} + %description %common_description %package -n libjxl-utils Summary: Utilities for manipulating JPEG XL images -Recommends: jxl-pixbuf-loader = %{epoch}:%{version}-%{release} Recommends: gimp-jxl-plugin = %{epoch}:%{version}-%{release} Provides: jpegxl-utils = %{epoch}:%{version}-%{release} Obsoletes: jpegxl-utils < 0.3.7-5 @@ -111,7 +110,6 @@ Documentation for JPEG-XL. %package -n libjxl Summary: Library files for JPEG-XL Requires: shared-mime-info -Recommends: jxl-pixbuf-loader = %{epoch}:%{version}-%{release} Provides: jpegxl-libs = %{epoch}:%{version}-%{release} Obsoletes: jpegxl-libs < 0.3.7-5 %if %{without gimp_plugin} @@ -134,14 +132,6 @@ Obsoletes: jpegxl-devel < 0.3.7-5 Development files for JPEG-XL. -%package -n jxl-pixbuf-loader -Summary: JPEG-XL image loader for GTK+ applications -BuildRequires: pkgconfig(gdk-pixbuf-2.0) -Requires: gdk-pixbuf2 - -%description -n jxl-pixbuf-loader -Jxl-pixbuf-loader contains a plugin to load JPEG-XL images in GTK+ applications. - %if %{with gimp_plugin} %package -n gimp-jxl-plugin Summary: A plugin for loading and saving JPEG-XL images @@ -162,6 +152,7 @@ rm -rf testdata/ third_party/ -DINSTALL_GTEST:BOOL=OFF \ -DJPEGXL_ENABLE_BENCHMARK:BOOL=OFF \ -DJPEGXL_ENABLE_PLUGINS:BOOL=ON \ + -DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF:BOOL=OFF \ -DJPEGXL_FORCE_SYSTEM_BROTLI:BOOL=ON \ -DJPEGXL_FORCE_SYSTEM_GTEST:BOOL=ON \ -DJPEGXL_FORCE_SYSTEM_HWY:BOOL=ON \ @@ -232,8 +223,6 @@ cp -p %{_libdir}/libjxl.so.%{sover_old}* \ %{_libdir}/libjxl_threads.so.%{sover_old}* %{_libdir}/libjxl_cms.so.%{sover_old}* %endif -%dir %{_datadir}/thumbnailers -%{_datadir}/thumbnailers/jxl.thumbnailer %{_datadir}/mime/packages/image-jxl.xml %files -n libjxl-devel @@ -247,10 +236,6 @@ cp -p %{_libdir}/libjxl.so.%{sover_old}* \ %{_libdir}/pkgconfig/libjxl_threads.pc %{_libdir}/pkgconfig/libjxl_cms.pc -%files -n jxl-pixbuf-loader -%license LICENSE -%{_libdir}/gdk-pixbuf-2.0/*/loaders/libpixbufloader-jxl.so - %if %{with gimp_plugin} %files -n gimp-jxl-plugin %license LICENSE From fbe00f38463fe57c21d2f379bad4f9a0bc62b55f Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 13 Oct 2025 11:06:02 +0200 Subject: [PATCH 21/22] Move jxl-pixbuf-loader Obsoletes to the correct subpackage --- jpegxl.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jpegxl.spec b/jpegxl.spec index f15e902..6c58c88 100644 --- a/jpegxl.spec +++ b/jpegxl.spec @@ -75,8 +75,6 @@ Provides: bundled(sjpeg) = 0-0.1.20230608gite5ab130 # Build system is Bazel, which is not packaged by Fedora Provides: bundled(skcms) = 0-0.1.20240122git51b7f2a -Obsoletes: jxl-pixbuf-loader < %{epoch}:%{version}-%{release} - %description %common_description @@ -112,6 +110,7 @@ Summary: Library files for JPEG-XL Requires: shared-mime-info Provides: jpegxl-libs = %{epoch}:%{version}-%{release} Obsoletes: jpegxl-libs < 0.3.7-5 +Obsoletes: jxl-pixbuf-loader < %{epoch}:%{version}-%{release} %if %{without gimp_plugin} Obsoletes: gimp-jxl-plugin < 1:0.10.3-4 %endif From ec1bcb6edd4635bd18be2b7969b2092b6cf39fec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sun, 7 Dec 2025 16:42:13 +0100 Subject: [PATCH 22/22] Fix FTBFS with Clang 22 --- jpegxl.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/jpegxl.spec b/jpegxl.spec index 6c58c88..f17a415 100644 --- a/jpegxl.spec +++ b/jpegxl.spec @@ -1,6 +1,8 @@ # epel 8 need this other already have it %undefine __cmake_in_source_build +# developper recommendation +%global toolchain clang # Uncomment for special build to rebuild aom on bumped soname. #global new_soname 1 @@ -37,7 +39,7 @@ Source2: testdata-%{version}.tar.gz BuildRequires: asciidoc BuildRequires: cmake BuildRequires: doxygen -BuildRequires: gcc-c++ +BuildRequires: clang BuildRequires: giflib-devel %if %{with tcmalloc} BuildRequires: gperftools-devel @@ -146,6 +148,7 @@ rm -rf testdata/ third_party/ %setup -q -T -D -a 1 -a 2 -n libjxl-%{version} %build +export CC=clang CXX=clang++ %cmake -DENABLE_CCACHE=1 \ -DBUILD_TESTING=ON \ -DINSTALL_GTEST:BOOL=OFF \ diff --git a/sources b/sources index 30cd74c..f7d352f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (jpegxl-0.11.1.tar.gz) = 0cfd81d9d3b783f96bd04f244d73ffbc12186c89993d46064a2751bef0a446a5e86be05add5c10f60d4482d39333d9bf3f9a866d6eb84f8fa0d4e8b5828fd74c -SHA512 (third_party-0.11.1.tar.gz) = f76e20360594e010f1a04e5522e879f65d0360bc31cda21a724f8f4d65668eed276890f6187acef43fafe939c67a080251f1d4bdcb05f21c3ac9957afdef0a7b SHA512 (testdata-0.11.1.tar.gz) = e775be0e8a56a828a4b70a174c841b3d474dbd170d899c50343896b21e46c6ae20f017f905ad7b83e097031e8add2788a00b1c452aa22e159b1f3a4e72a47155 +SHA512 (third_party-0.11.1.tar.gz) = 720544bd722cbc6ef81db660786e4b022f156d05672b7d7ee6110d367272dcf22a35458f51e0d850df2f6fb368978c43fa4fff99763010360a8b5673d2e556ca