Compare commits

...
Sign in to create a new pull request.

2 commits

Author SHA1 Message Date
Sérgio M. Basto
08661747f3 update to 0.8.3 2024-07-07 14:40:41 +01:00
Richard W.M. Jones
49ae9e25ed Add patch required for RISC-V compilation
Note only needed in F40, because Rawhide (jpegxl >= 0.9.0) already
contains the fix.

Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
2024-03-04 10:40:12 +00:00
5 changed files with 53 additions and 13 deletions

2
.gitignore vendored
View file

@ -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.8.3.tar.gz
/third_party-0.8.3.tar.gz

View file

@ -0,0 +1,31 @@
From 22d12d74e7bc56b09cfb1973aa89ec8d714fa3fc Mon Sep 17 00:00:00 2001
From: Eastdong <31920925+IEAST@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
[RWMJ: Removed AUTHORS change since it causes a patch conflict]
Co-authored-by: Moritz Firsching <firsching@google.com>
---
lib/jxl/enc_xyb.cc | 1 +
2 files changed, 2 insertions(+)
diff --git a/lib/jxl/enc_xyb.cc b/lib/jxl/enc_xyb.cc
index 1ef78877a71..2ee0abf821a 100644
--- a/lib/jxl/enc_xyb.cc
+++ b/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

View file

@ -20,7 +20,7 @@ decoder).}
Name: jpegxl
Epoch: 1
Version: 0.8.2
Version: 0.8.3
Release: %autorelease %{?new_soname:-p -e 0~sonamebump}
Summary: JPEG XL image format reference implementation
@ -36,6 +36,10 @@ Source0: %vcs/archive/v%{version}/%{name}-%{version}.tar.gz
# set VERSION and run ./update_third_party.sh to get Source1
Source1: third_party-%{version}.tar.gz
# Add missing <atomic> header for RISC-V.
# Upstream in jpegxl >= 0.9.0
Patch1: https://github.com/libjxl/libjxl/commit/22d12d74e7bc56b09cfb1973aa89ec8d714fa3fc.patch
BuildRequires: asciidoc
BuildRequires: cmake
BuildRequires: doxygen

View file

@ -1,2 +1,2 @@
SHA512 (jpegxl-0.8.2.tar.gz) = 769f102c46755d11a705ce47ae9e2ef49627ae708f416693bf1293aeeb713934baf4466e45b9c70b04ec1fc8b4a00d5ca7688c8ca03f0a91c9a15252c522a887
SHA512 (third_party-0.8.2.tar.gz) = 74f536c19d38b413bbca0988d8b36aae73110af3b19b78932309fa1892f99f0cc4984cbc4d96dde0716ee993c62f14464a639f8f0a4907c0e6f5ad37b1228816
SHA512 (jpegxl-0.8.3.tar.gz) = f7fb4b2b0fd2459bec86918371369e80de59549c8dc24ff5c83546f564e54c81ea6a72720af151e3f9b64ef326f3ec8a5a6e0023b7fe2de14b056e501af579ef
SHA512 (third_party-0.8.3.tar.gz) = 6e71ff5c2872831888cf3bbec3073dca8ebea120cd4f2a429369722bfc2efe5e6c7479e2458d9c85792c6624c9dd476cbbdf951c89a46c9fe19da7d8b62de956

View file

@ -1,15 +1,18 @@
VERSION=0.8.2
VERSION=0.8.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/