git: dc409f0d8307 - main - graphics/libavif: Update to 1.1.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 04 Aug 2024 17:22:10 UTC
The branch main has been updated by sunpoet:
URL: https://cgit.FreeBSD.org/ports/commit/?id=dc409f0d8307f3c23775a4116fb6c16521a93403
commit dc409f0d8307f3c23775a4116fb6c16521a93403
Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2024-08-04 17:07:35 +0000
Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2024-08-04 17:13:58 +0000
graphics/libavif: Update to 1.1.1
- Remove unnecessary substitution
- Sort TEST_DEPENDS
- Use OPTIONS_GROUP
- Add MANPAGES option
Changes: https://github.com/AOMediaCodec/libavif/releases
---
graphics/libavif/Makefile | 87 +++++++++++++++--------------
graphics/libavif/distinfo | 8 +--
graphics/libavif/files/patch-CMakeLists.txt | 17 ------
graphics/libavif/pkg-plist | 4 +-
4 files changed, 50 insertions(+), 66 deletions(-)
diff --git a/graphics/libavif/Makefile b/graphics/libavif/Makefile
index 33d38cd657c3..6ddde2bc4465 100644
--- a/graphics/libavif/Makefile
+++ b/graphics/libavif/Makefile
@@ -1,11 +1,8 @@
PORTNAME= libavif
+PORTVERSION= 1.1.1
DISTVERSIONPREFIX= v
-DISTVERSION= 1.1.0
CATEGORIES= graphics
-PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+= 78b64375550e.patch:-p1 # https://github.com/AOMediaCodec/libavif/pull/2263
-
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Library for encoding and decoding .avif files
WWW= https://github.com/AOMediaCodec/libavif
@@ -14,60 +11,64 @@ LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libpng.so:graphics/png
-TEST_DEPENDS= googletest>0:devel/googletest \
- bash:shells/bash
+TEST_DEPENDS= bash:shells/bash \
+ googletest>=0:devel/googletest
USES= cmake:testing compiler:c11 cpe jpeg pkgconfig
-CPE_VENDOR= aomedia
-USE_GITHUB= yes
-USE_LDCONFIG= yes
-GH_ACCOUNT= AOMediaCodec
+
+CMAKE_ARGS= -DAVIF_GTEST:STRING=OFF \
+ -DAVIF_ZLIBPNG:STRING=SYSTEM
+CMAKE_OFF= AVIF_BUILD_EXAMPLES
CMAKE_ON= AVIF_BUILD_APPS
CMAKE_TESTING_ON= AVIF_BUILD_TESTS
CMAKE_TESTING_ARGS= -DAVIF_GTEST:STRING=SYSTEM
+USE_LDCONFIG= yes
-OPTIONS_DEFINE= AOM DAV1D GAV1 LIBSHARPYUV LIBYUV PIXBUF RAV1E SVTAV1
+USE_GITHUB= yes
+GH_ACCOUNT= AOMediaCodec
+
+CPE_VENDOR= aomedia
+
+OPTIONS_DEFINE= MANPAGES PIXBUF
+OPTIONS_GROUP= AV1 COLOR
+OPTIONS_GROUP_AV1= AOM DAV1D GAV1 RAV1E SVTAV1
+OPTIONS_GROUP_COLOR= LIBSHARPYUV LIBYUV
OPTIONS_DEFAULT=AOM DAV1D LIBYUV PIXBUF
OPTIONS_SUB= yes
-
AOM_DESC= AV1 encoding/decoding via libaom
-AOM_LIB_DEPENDS= libaom.so:multimedia/aom
-AOM_CMAKE_ON= -DAVIF_CODEC_AOM:STRING=SYSTEM
-AOM_CMAKE_OFF= -DAVIF_CODEC_AOM:STRING=OFF
-
DAV1D_DESC= AV1 decoding via libdav1d
-DAV1D_LIB_DEPENDS= libdav1d.so:multimedia/dav1d
-DAV1D_CMAKE_ON= -DAVIF_CODEC_DAV1D:STRING=SYSTEM
-DAV1D_CMAKE_OFF= -DAVIF_CODEC_DAV1D:STRING=OFF
-
GAV1_DESC= AV1 decoding via libgav1
-GAV1_LIB_DEPENDS= libgav1.so:multimedia/libgav1
-GAV1_CMAKE_ON= -DAVIF_CODEC_LIBGAV1:STRING=SYSTEM
-GAV1_CMAKE_OFF= -DAVIF_CODEC_LIBGAV1:STRING=OFF
-
-LIBSHARPYUV_DESC= Colorspace conversion via libsharpyuv
-LIBSHARPYUV_LIB_DEPENDS= libsharpyuv.so:graphics/webp
-LIBSHARPYUV_CMAKE_ON= -DAVIF_LIBSHARPYUV:STRING=SYSTEM
-LIBSHARPYUV_CMAKE_OFF= -DAVIF_LIBSHARPYUV:STRING=OFF
-
+LIBSHARPYUV_DESC= Colorspace conversion via libsharpyuv
LIBYUV_DESC= Colorspace conversion via libyuv
-LIBYUV_BUILD_DEPENDS= libyuv>=0.0.1774:graphics/libyuv
-LIBYUV_LIB_DEPENDS= libyuv.so:graphics/libyuv
-LIBYUV_CMAKE_ON= -DAVIF_LIBYUV:STRING=SYSTEM
-LIBYUV_CMAKE_OFF= -DAVIF_LIBYUV:STRING=OFF
+MANPAGES_DESC= Install manpages (requires pandoc)
+RAV1E_DESC= AV1 encoding via librav1e
+SVTAV1_DESC= AV1 encoding via SVT-AV1
-PIXBUF_USES= gnome
-PIXBUF_USE= GNOME=gdkpixbuf2
+AOM_CMAKE_OFF= -DAVIF_CODEC_AOM:STRING=OFF
+AOM_CMAKE_ON= -DAVIF_CODEC_AOM:STRING=SYSTEM
+AOM_LIB_DEPENDS= libaom.so:multimedia/aom
+DAV1D_CMAKE_OFF= -DAVIF_CODEC_DAV1D:STRING=OFF
+DAV1D_CMAKE_ON= -DAVIF_CODEC_DAV1D:STRING=SYSTEM
+DAV1D_LIB_DEPENDS= libdav1d.so:multimedia/dav1d
+GAV1_CMAKE_OFF= -DAVIF_CODEC_LIBGAV1:STRING=OFF
+GAV1_CMAKE_ON= -DAVIF_CODEC_LIBGAV1:STRING=SYSTEM
+GAV1_LIB_DEPENDS= libgav1.so:multimedia/libgav1
+LIBSHARPYUV_CMAKE_OFF= -DAVIF_LIBSHARPYUV:STRING=OFF
+LIBSHARPYUV_CMAKE_ON= -DAVIF_LIBSHARPYUV:STRING=SYSTEM
+LIBSHARPYUV_LIB_DEPENDS=libsharpyuv.so:graphics/webp
+LIBYUV_CMAKE_OFF= -DAVIF_LIBYUV:STRING=OFF
+LIBYUV_CMAKE_ON= -DAVIF_LIBYUV:STRING=SYSTEM
+LIBYUV_LIB_DEPENDS= libyuv.so:graphics/libyuv
+MANPAGES_BUILD_DEPENDS= pandoc:textproc/hs-pandoc
+MANPAGES_CMAKE_BOOL= AVIF_BUILD_MAN_PAGES
PIXBUF_CMAKE_BOOL= AVIF_BUILD_GDK_PIXBUF
-
-RAV1E_DESC= AV1 encoding via librav1e
-RAV1E_LIB_DEPENDS= librav1e.so:multimedia/librav1e
-RAV1E_CMAKE_ON= -DAVIF_CODEC_RAV1E:STRING=SYSTEM
+PIXBUF_USE= GNOME=gdkpixbuf2
+PIXBUF_USES= gnome
RAV1E_CMAKE_OFF= -DAVIF_CODEC_RAV1E:STRING=OFF
-
-SVTAV1_DESC= AV1 encoding via SVT-AV1
-SVTAV1_LIB_DEPENDS= libSvtAv1Enc.so:multimedia/svt-av1
-SVTAV1_CMAKE_ON= -DAVIF_CODEC_SVT:STRING=SYSTEM
+RAV1E_CMAKE_ON= -DAVIF_CODEC_RAV1E:STRING=SYSTEM
+RAV1E_LIB_DEPENDS= librav1e.so:multimedia/librav1e
SVTAV1_CMAKE_OFF= -DAVIF_CODEC_SVT:STRING=OFF
+SVTAV1_CMAKE_ON= -DAVIF_CODEC_SVT:STRING=SYSTEM
+SVTAV1_LIB_DEPENDS= libSvtAv1Enc.so:multimedia/svt-av1
.include <bsd.port.mk>
diff --git a/graphics/libavif/distinfo b/graphics/libavif/distinfo
index 85eb09d13a8e..f276b4620dac 100644
--- a/graphics/libavif/distinfo
+++ b/graphics/libavif/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1720708790
-SHA256 (AOMediaCodec-libavif-v1.1.0_GH0.tar.gz) = edb31951005d7a143be1724f24825809599a4832073add50eaf987733defb5c8
-SIZE (AOMediaCodec-libavif-v1.1.0_GH0.tar.gz) = 13642536
-SHA256 (78b64375550e.patch) = 15fbdcaab58a697e5c2b2ad3006bfb17da5f09525a900650fe8ba1a7439c459b
-SIZE (78b64375550e.patch) = 8930
+TIMESTAMP = 1722711161
+SHA256 (AOMediaCodec-libavif-v1.1.1_GH0.tar.gz) = 914662e16245e062ed73f90112fbb4548241300843a7772d8d441bb6859de45b
+SIZE (AOMediaCodec-libavif-v1.1.1_GH0.tar.gz) = 13644189
diff --git a/graphics/libavif/files/patch-CMakeLists.txt b/graphics/libavif/files/patch-CMakeLists.txt
deleted file mode 100644
index 9499cf8b0e9c..000000000000
--- a/graphics/libavif/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-https://github.com/AOMediaCodec/libavif/issues/2264
-
---- CMakeLists.txt.orig 2024-07-11 14:39:50 UTC
-+++ CMakeLists.txt
-@@ -168,10 +168,8 @@ function(avif_target_link_library target)
- if(NOT install_target)
- set(install_target ${target})
- endif()
-- # The transitive dependency is an export link library if it is a shared
-- # library, or if it is a static library in a static build
-- get_target_property(target_type ${target} TYPE)
-- if(target_type STREQUAL "SHARED_LIBRARY" OR NOT BUILD_SHARED_LIBS)
-+ # The transitive dependency is needed in a static build.
-+ if(NOT BUILD_SHARED_LIBS)
- target_link_libraries(avif PUBLIC $<INSTALL_INTERFACE:${install_target}>)
- endif()
- endfunction()
diff --git a/graphics/libavif/pkg-plist b/graphics/libavif/pkg-plist
index 300c3d45e705..5bd95504e9f5 100644
--- a/graphics/libavif/pkg-plist
+++ b/graphics/libavif/pkg-plist
@@ -8,6 +8,8 @@ lib/cmake/libavif/libavif-config.cmake
%%PIXBUF%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-avif.so
lib/libavif.so
lib/libavif.so.16
-lib/libavif.so.16.1.0
+lib/libavif.so.16.1.1
libdata/pkgconfig/libavif.pc
+%%MANPAGES%%share/man/man1/avifdec.1.gz
+%%MANPAGES%%share/man/man1/avifenc.1.gz
%%PIXBUF%%share/thumbnailers/avif.thumbnailer