1
0
forked from pool/kimageformats
Christophe Marin 2023-09-10 08:28:41 +00:00 committed by Git OBS Bridge
parent 917a2e6897
commit 7199164e76
7 changed files with 39 additions and 63 deletions

View File

@ -1,45 +0,0 @@
From bcec942cc92e0968c724a2c1f92b4cd048bf8fa7 Mon Sep 17 00:00:00 2001
From: Antonio Rojas <arojas@archlinux.org>
Date: Tue, 29 Aug 2023 09:21:37 +0200
Subject: [PATCH] Support libavif 1.0
Make cmake find libavif 1.0 and adapt to API changes (which is reverting to pre 0.9.2 API)
(cherry picked from commit 4badb3088e90d86208ed6bd435df7fe6a022be64)
---
CMakeLists.txt | 5 ++++-
src/imageformats/avif.cpp | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2597a00..6d0af2e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,7 +51,10 @@ set_package_properties(OpenEXR PROPERTIES
PURPOSE "Required for the QImage plugin for OpenEXR images"
)
-find_package(libavif 0.8.2 CONFIG)
+find_package(libavif 0.8.2 CONFIG QUIET)
+if(NOT libavif_FOUND)
+ find_package(libavif 1 CONFIG)
+endif()
set_package_properties(libavif PROPERTIES
TYPE OPTIONAL
PURPOSE "Required for the QImage plugin for AVIF images"
diff --git a/src/imageformats/avif.cpp b/src/imageformats/avif.cpp
index bcebd36..9775dcb 100644
--- a/src/imageformats/avif.cpp
+++ b/src/imageformats/avif.cpp
@@ -424,7 +424,7 @@ bool QAVIFHandler::decode_one_frame()
}
if (m_decoder->image->transformFlags & AVIF_TRANSFORM_IMIR) {
-#if AVIF_VERSION > 90100
+#if AVIF_VERSION > 90100 && AVIF_VERSION < 1000000
switch (m_decoder->image->imir.mode) {
#else
switch (m_decoder->image->imir.axis) {
--
2.41.0

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:15533e1ba0fa187f0da0094b8ea135f38a9cebffd9118a12fcd23003eb591687
size 13161052

View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAmTOXucACgkQWNDuZIpI
s7vlAwf/T8B1e4Ri+S9H1m1Cl6UeyYrZTvTMeqz1/+K95iXpS8W6KK7NFHBEeJ4N
Do6q4hP6MJ9lrGa0xzueVauwcEl8aLWrjRvF7laEf/bI4nsu6czUiX5m9aI7FEpe
GhZgMcpLijOcXSW9096xlBUPOFx7sECofp1vH5Pkd2NVMZRWWZciIuu07GX6LsP7
uthEaPGqFyGQnooXxTbgOGrxZlXAhJp83OUzwIR1D2vm22QzPlauOy+sFNjG6/eR
xrz/CABpVOVqiowNKbKc7VE+JLPKcc4N2QSD8XEqXFReuSwmtOiFg2R+4aXKAJME
zln+P1NznsFu+QJJnfhicl6QtGz7bQ==
=tuzA
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8d69fbd8a8fb6212bc35ee5cba45c1b5b6b3e0e864010bf235a2bd2998d07347
size 15652452

View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAmT0P/sACgkQWNDuZIpI
s7vr4Qf9EBqVjGVi7Rmg1GKeAdSRkCg46vYptmBLg+gK6rh1hxZN44X9d1wy5y+p
tfQdVnA9aPqqUxQQv74CoYCi+EfZoy/dMqr++EJF+WgRlE58q2rIMYbzgjs+rFKz
8OXkAcD5plbIiGeEAVs18X1OKxJWTrVDLYXg1Axw1HX/5EqDNOiMi+WHFTfbb2N6
Xm6pIX/YGLrvDqp/d71/LlxyKpt/Onhy8G1uYuYtQNwiIXvQSYeQ7veoQ4v2IpsO
VPZUQcfuGFeQoBvFFQ1uSRCMExkkllNiisL8NzmEQ8k/Kys4McZaD86FO4cFMVB1
GEPD3wvQ52Tk6iZeX3l37ZCSJP3N0w==
=luN8
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Wed Sep 6 12:24:05 UTC 2023 - Christophe Marin <christophe@krop.fr>
- Update to 5.110.0
* New feature release
* For more details please see:
* https://kde.org/announcements/frameworks/5/5.110.0
- Changes since 5.109.0:
* QOI: Advertise write support in the desktop file
* qoi: write support backported from master
* xcf: format v12 support (kf5)
* Support libavif 1.0
* exr: multiple fixes (kf5)
* Fix missing qoi.desktop
* qoi: fix buffer overflow kf5
* Renamed qoi.h to qoi_p.h
* Minor improvements
* Add support for the QOI image format
* Set linear color space and round fix
- Drop patch, merged upstream
* 0001-Support-libavif-1.0.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Aug 29 11:00:22 UTC 2023 - Christophe Marin <christophe@krop.fr> Tue Aug 29 11:00:22 UTC 2023 - Christophe Marin <christophe@krop.fr>

View File

@ -33,7 +33,7 @@
# Only needed for the package signature condition # Only needed for the package signature condition
%bcond_without released %bcond_without released
Name: kimageformats Name: kimageformats
Version: 5.109.0 Version: 5.110.0
Release: 0 Release: 0
Summary: Image format plugins for Qt Summary: Image format plugins for Qt
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
@ -43,8 +43,6 @@ Source: %{name}-%{version}.tar.xz
Source1: %{name}-%{version}.tar.xz.sig Source1: %{name}-%{version}.tar.xz.sig
Source2: frameworks.keyring Source2: frameworks.keyring
%endif %endif
# PATCH-FIX-UPSTREAM
Patch0: 0001-Support-libavif-1.0.patch
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: kf5-filesystem BuildRequires: kf5-filesystem
@ -117,6 +115,7 @@ environments.
%{_kf5_plugindir}/imageformats/kimg_pcx.so %{_kf5_plugindir}/imageformats/kimg_pcx.so
%{_kf5_plugindir}/imageformats/kimg_pic.so %{_kf5_plugindir}/imageformats/kimg_pic.so
%{_kf5_plugindir}/imageformats/kimg_psd.so %{_kf5_plugindir}/imageformats/kimg_psd.so
%{_kf5_plugindir}/imageformats/kimg_qoi.so
%{_kf5_plugindir}/imageformats/kimg_ras.so %{_kf5_plugindir}/imageformats/kimg_ras.so
%{_kf5_plugindir}/imageformats/kimg_raw.so %{_kf5_plugindir}/imageformats/kimg_raw.so
%{_kf5_plugindir}/imageformats/kimg_rgb.so %{_kf5_plugindir}/imageformats/kimg_rgb.so
@ -142,6 +141,7 @@ environments.
%{_kf5_servicesdir}/qimageioplugins/pcx.desktop %{_kf5_servicesdir}/qimageioplugins/pcx.desktop
%{_kf5_servicesdir}/qimageioplugins/pic.desktop %{_kf5_servicesdir}/qimageioplugins/pic.desktop
%{_kf5_servicesdir}/qimageioplugins/psd.desktop %{_kf5_servicesdir}/qimageioplugins/psd.desktop
%{_kf5_servicesdir}/qimageioplugins/qoi.desktop
%{_kf5_servicesdir}/qimageioplugins/ras.desktop %{_kf5_servicesdir}/qimageioplugins/ras.desktop
%{_kf5_servicesdir}/qimageioplugins/raw.desktop %{_kf5_servicesdir}/qimageioplugins/raw.desktop
%{_kf5_servicesdir}/qimageioplugins/rgb.desktop %{_kf5_servicesdir}/qimageioplugins/rgb.desktop
@ -154,6 +154,5 @@ environments.
%dir %{_kf5_servicesdir}/qimageioplugins %dir %{_kf5_servicesdir}/qimageioplugins
%{_kf5_plugindir}/imageformats/kimg_eps.so %{_kf5_plugindir}/imageformats/kimg_eps.so
%{_kf5_servicesdir}/qimageioplugins/eps.desktop %{_kf5_servicesdir}/qimageioplugins/eps.desktop
%{_kf5_plugindir}/imageformats/kimg_eps.so
%changelog %changelog