Date: Tue, 29 Aug 2023 00:36:21 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: b578933889fa - main - graphics/libavif: update to 1.0.0 Message-ID: <202308290036.37T0aLHr076315@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=b578933889faafcf54b311a4894068629a0ec8df commit b578933889faafcf54b311a4894068629a0ec8df Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2023-08-28 22:03:40 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2023-08-29 00:34:53 +0000 graphics/libavif: update to 1.0.0 Changes: https://github.com/AOMediaCodec/libavif/releases/tag/v1.0.0 Reported by: GitHub (watch releases) --- devel/efl/Makefile | 2 +- graphics/darktable/Makefile | 2 +- graphics/darktable/files/patch-src_CMakeLists.txt | 9 ++++++++ graphics/gd/Makefile | 2 +- graphics/kf5-kimageformats/Makefile | 1 + .../kf5-kimageformats/files/patch-CMakeLists.txt | 23 ++++++++++++++++++ .../files/patch-src_imageformats_avif.cpp | 15 ++++++++++++ graphics/libavif/Makefile | 6 ++--- graphics/libavif/distinfo | 12 ++++++---- graphics/libavif/pkg-plist | 4 ++-- graphics/sdl2_image/Makefile | 2 +- graphics/sdl2_image/files/patch-CMakeLists.txt | 27 ++++++++++++++++++++++ www/links/Makefile | 2 +- 13 files changed, 92 insertions(+), 15 deletions(-) diff --git a/devel/efl/Makefile b/devel/efl/Makefile index 1b926b27681f..4cfed379580e 100644 --- a/devel/efl/Makefile +++ b/devel/efl/Makefile @@ -1,6 +1,6 @@ PORTNAME= efl DISTVERSION= 1.26.3 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= devel enlightenment MASTER_SITES= http://download.enlightenment.org/rel/libs/${PORTNAME}/ DIST_SUBDIR= enlightenment diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile index 28dc9292ce1b..36129d5bc97d 100644 --- a/graphics/darktable/Makefile +++ b/graphics/darktable/Makefile @@ -1,6 +1,6 @@ PORTNAME= darktable PORTVERSION= 4.4.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= https://github.com/darktable-org/${PORTNAME}/releases/download/release-${PORTVERSION:C/\.rc/rc/}/ diff --git a/graphics/darktable/files/patch-src_CMakeLists.txt b/graphics/darktable/files/patch-src_CMakeLists.txt index e67d581b6a58..a56917fac5fb 100644 --- a/graphics/darktable/files/patch-src_CMakeLists.txt +++ b/graphics/darktable/files/patch-src_CMakeLists.txt @@ -1,5 +1,14 @@ --- src/CMakeLists.txt.orig 2023-06-30 06:13:18 UTC +++ src/CMakeLists.txt +@@ -353,7 +353,7 @@ if (USE_AVIF) + endif(USE_WEBP) + + if (USE_AVIF) +- find_package(libavif 0.8.2 CONFIG) ++ find_package(libavif CONFIG) + if (TARGET avif) + list(APPEND LIBS avif) + add_definitions(-DHAVE_LIBAVIF=1) @@ -465,7 +465,7 @@ if(USE_OPENJPEG) add_definitions("-DHAVE_OPENJPEG") list(APPEND SOURCES "imageio/imageio_j2k.c") diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile index 8908e093617e..0abc54d58d5d 100644 --- a/graphics/gd/Makefile +++ b/graphics/gd/Makefile @@ -1,6 +1,6 @@ PORTNAME= libgd PORTVERSION= 2.3.3 -PORTREVISION= 6 +PORTREVISION= 7 PORTEPOCH= 1 CATEGORIES+= graphics MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/gd-${PORTVERSION}/ diff --git a/graphics/kf5-kimageformats/Makefile b/graphics/kf5-kimageformats/Makefile index 48031bdacf9a..0053b443cc13 100644 --- a/graphics/kf5-kimageformats/Makefile +++ b/graphics/kf5-kimageformats/Makefile @@ -1,5 +1,6 @@ PORTNAME= kimageformats DISTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde kde-frameworks MAINTAINER= kde@FreeBSD.org diff --git a/graphics/kf5-kimageformats/files/patch-CMakeLists.txt b/graphics/kf5-kimageformats/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..82a333a833bb --- /dev/null +++ b/graphics/kf5-kimageformats/files/patch-CMakeLists.txt @@ -0,0 +1,23 @@ +CMake Warning at CMakeLists.txt:54 (find_package): + Could not find a configuration file for package "libavif" that is + compatible with requested version "0.8.2". + + The following configuration files were considered but not accepted: + + /usr/local/lib/cmake/libavif/libavif-config.cmake, version: 1.0.0 +[...] +===> Checking for items in pkg-plist which are not in STAGEDIR +Error: Missing: %%QT_PLUGINDIR%%/imageformats/kimg_avif.so +Error: Missing: share/kservices5/qimageioplugins/avif.desktop + +--- CMakeLists.txt.orig 2023-08-05 12:37:26 UTC ++++ CMakeLists.txt +@@ -51,7 +51,7 @@ set_package_properties(OpenEXR PROPERTIES + PURPOSE "Required for the QImage plugin for OpenEXR images" + ) + +-find_package(libavif 0.8.2 CONFIG) ++find_package(libavif CONFIG) + set_package_properties(libavif PROPERTIES + TYPE OPTIONAL + PURPOSE "Required for the QImage plugin for AVIF images" diff --git a/graphics/kf5-kimageformats/files/patch-src_imageformats_avif.cpp b/graphics/kf5-kimageformats/files/patch-src_imageformats_avif.cpp new file mode 100644 index 000000000000..7c2ab4517ecc --- /dev/null +++ b/graphics/kf5-kimageformats/files/patch-src_imageformats_avif.cpp @@ -0,0 +1,15 @@ +src/imageformats/avif.cpp:428:40: error: no member named 'mode' in 'avifImageMirror' + switch (m_decoder->image->imir.mode) { + ~~~~~~~~~~~~~~~~~~~~~~ ^ + +--- src/imageformats/avif.cpp.orig 2023-08-05 12:37:26 UTC ++++ 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) { diff --git a/graphics/libavif/Makefile b/graphics/libavif/Makefile index 8c8ad35cf69d..39fd12f708d8 100644 --- a/graphics/libavif/Makefile +++ b/graphics/libavif/Makefile @@ -1,11 +1,11 @@ PORTNAME= libavif DISTVERSIONPREFIX= v -DISTVERSION= 0.11.1 -PORTREVISION= 1 +DISTVERSION= 1.0.0 CATEGORIES= graphics PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= 2340cdb5f0c2.patch:-p1 # https://github.com/AOMediaCodec/libavif/pull/296 +PATCHFILES+= 648f8d0dd03f.patch:-p1 # https://github.com/AOMediaCodec/libavif/pull/1525 +PATCHFILES+= d854bb762db6.patch:-p1 # https://github.com/AOMediaCodec/libavif/pull/1525 MAINTAINER= jbeich@FreeBSD.org COMMENT= Library for encoding and decoding .avif files diff --git a/graphics/libavif/distinfo b/graphics/libavif/distinfo index 2c64bf9f2340..8ae3572182d8 100644 --- a/graphics/libavif/distinfo +++ b/graphics/libavif/distinfo @@ -1,5 +1,7 @@ -TIMESTAMP = 1666215155 -SHA256 (AOMediaCodec-libavif-v0.11.1_GH0.tar.gz) = 0eb49965562a0e5e5de58389650d434cff32af84c34185b6c9b7b2fccae06d4e -SIZE (AOMediaCodec-libavif-v0.11.1_GH0.tar.gz) = 5826813 -SHA256 (2340cdb5f0c2.patch) = 20ee35cb5581d7be24d7a455eebdd21e89d71bbed093e7fd76cd5caac4d3ed52 -SIZE (2340cdb5f0c2.patch) = 1716 +TIMESTAMP = 1693260220 +SHA256 (AOMediaCodec-libavif-v1.0.0_GH0.tar.gz) = 410f85cf0d13f403b41197c0774da469f5d73b89aa06d40fc726165377f215a0 +SIZE (AOMediaCodec-libavif-v1.0.0_GH0.tar.gz) = 10569801 +SHA256 (648f8d0dd03f.patch) = 2f6962ca019598dee5ec1d5c7db63e26ed462ae74f9701674dc8f79332bde3a8 +SIZE (648f8d0dd03f.patch) = 1680 +SHA256 (d854bb762db6.patch) = 00bdf5822e16c391b5b4854db92e848a057b346288a14b85c64e55fd11602c55 +SIZE (d854bb762db6.patch) = 1056 diff --git a/graphics/libavif/pkg-plist b/graphics/libavif/pkg-plist index 83035c4d4095..1bf5ea95a33a 100644 --- a/graphics/libavif/pkg-plist +++ b/graphics/libavif/pkg-plist @@ -6,7 +6,7 @@ lib/cmake/libavif/libavif-config-version.cmake lib/cmake/libavif/libavif-config.cmake %%PIXBUF%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-avif.so lib/libavif.so -lib/libavif.so.15 -lib/libavif.so.15.0.1 +lib/libavif.so.16 +lib/libavif.so.16.0.0 libdata/pkgconfig/libavif.pc %%PIXBUF%%share/thumbnailers/avif.thumbnailer diff --git a/graphics/sdl2_image/Makefile b/graphics/sdl2_image/Makefile index 086ff491587a..df6be96200a8 100644 --- a/graphics/sdl2_image/Makefile +++ b/graphics/sdl2_image/Makefile @@ -1,7 +1,7 @@ PORTNAME= sdl2_image DISTVERSIONPREFIX= release- DISTVERSION= 2.6.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MAINTAINER= amdmi3@FreeBSD.org diff --git a/graphics/sdl2_image/files/patch-CMakeLists.txt b/graphics/sdl2_image/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..1b0c9bbcf77b --- /dev/null +++ b/graphics/sdl2_image/files/patch-CMakeLists.txt @@ -0,0 +1,27 @@ +CMake Error at CMakeLists.txt:348 (find_package): + Could not find a configuration file for package "libavif" that is + compatible with requested version "0.9.1". + + The following configuration files were considered but not accepted: + + /usr/local/lib/cmake/libavif/libavif-config.cmake, version: 1.0.0 + +--- CMakeLists.txt.orig 2023-02-07 00:38:32 UTC ++++ CMakeLists.txt +@@ -81,7 +81,6 @@ cmake_dependent_option(SDL2IMAGE_PNG_SAVE "Add PNG sav + cmake_dependent_option(SDL2IMAGE_JPG_SAVE "Add JPEG save support" ON SDL2IMAGE_JPG OFF) + cmake_dependent_option(SDL2IMAGE_PNG_SAVE "Add PNG save support" ON SDL2IMAGE_PNG OFF) + +-set(LIBAVIF_MINIMUM_VERSION "0.9.1") + if(SDL2IMAGE_VENDORED AND SDL2IMAGE_AVIF) + set(SDL2IMAGE_AVIF_VENDORED ON) + else() +@@ -345,7 +344,7 @@ if(SDL2IMAGE_AVIF) + endif() + else() + message(STATUS "${PROJECT_NAME}: Using system libavif") +- find_package(libavif ${LIBAVIF_MINIMUM_VERSION} REQUIRED) ++ find_package(libavif REQUIRED) + list(APPEND PC_REQUIRES libavif) + endif() + if(SDL2IMAGE_AVIF_SHARED) diff --git a/www/links/Makefile b/www/links/Makefile index a12759f4e64a..1c1b9bcd1a1e 100644 --- a/www/links/Makefile +++ b/www/links/Makefile @@ -1,6 +1,6 @@ PORTNAME= links PORTVERSION= 2.29 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= http://links.twibright.com/download/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308290036.37T0aLHr076315>