Here is an update to libavif 0.8.0.

Index: Makefile
===================================================================
RCS file: /home/cvs/ports/graphics/libavif/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- Makefile    17 May 2020 09:29:01 -0000      1.9
+++ Makefile    24 Jul 2020 09:51:05 -0000
@@ -4,11 +4,10 @@ COMMENT=      library for encoding and decodi
 
 GH_ACCOUNT=    AOMediaCodec
 GH_PROJECT=    libavif
-GH_TAGNAME=    v0.7.3
-REVISION=      0
+GH_TAGNAME=    v0.8.0
 CATEGORIES=    graphics
 
-SHARED_LIBS=   avif    1.1
+SHARED_LIBS=   avif    2.0
 
 HOMEPAGE=      https://github.com/AOMediaCodec/libavif
 
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/graphics/libavif/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo    15 May 2020 06:33:27 -0000      1.6
+++ distinfo    15 Jul 2020 08:10:58 -0000
@@ -1,2 +1,2 @@
-SHA256 (libavif-0.7.3.tar.gz) = pM4DZJxY7J89xqsrfPfVhHSxSazx5MVjvkCButYO0t0=
-SIZE (libavif-0.7.3.tar.gz) = 2893675
+SHA256 (libavif-0.8.0.tar.gz) = yRf0onrdYbitFfMoCQlC1RlGC3EhnzHmDl/mqozz3E4=
+SIZE (libavif-0.8.0.tar.gz) = 2914015
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-CMakeLists_txt        24 Jul 2020 09:53:13 -0000
@@ -0,0 +1,38 @@
+$OpenBSD$
+
+- cmake: Use correct include dir for apps/shared
+- cmake: Include avif INTERFACE_INCLUDE_DIRECTORIES first
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -317,7 +317,13 @@ if(AVIF_BUILD_APPS)
+         set_target_properties(avifenc PROPERTIES LINKER_LANGUAGE "CXX")
+     endif()
+     target_link_libraries(avifenc avif ${AVIF_PLATFORM_LIBRARIES} 
${ZLIB_LIBRARY} ${PNG_LIBRARY} ${JPEG_LIBRARY})
+-    target_include_directories(avifenc PRIVATE apps/shared 
${ZLIB_INCLUDE_DIR} ${PNG_PNG_INCLUDE_DIR} ${JPEG_INCLUDE_DIR})
++    target_include_directories(avifenc
++                               PRIVATE
++                                   
$<TARGET_PROPERTY:avif,INTERFACE_INCLUDE_DIRECTORIES>
++                                   ${CMAKE_CURRENT_SOURCE_DIR}/apps/shared
++                                   ${ZLIB_INCLUDE_DIR}
++                                   ${PNG_PNG_INCLUDE_DIR}
++                                   ${JPEG_INCLUDE_DIR})
+     add_executable(avifdec
+         apps/avifdec.c
+ 
+@@ -331,7 +337,13 @@ if(AVIF_BUILD_APPS)
+         set_target_properties(avifdec PROPERTIES LINKER_LANGUAGE "CXX")
+     endif()
+     target_link_libraries(avifdec avif ${AVIF_PLATFORM_LIBRARIES} 
${ZLIB_LIBRARY} ${PNG_LIBRARY} ${JPEG_LIBRARY})
+-    target_include_directories(avifdec PRIVATE apps/shared 
${ZLIB_INCLUDE_DIR} ${PNG_PNG_INCLUDE_DIR} ${JPEG_INCLUDE_DIR})
++    target_include_directories(avifdec
++                               PRIVATE
++                                   
$<TARGET_PROPERTY:avif,INTERFACE_INCLUDE_DIRECTORIES>
++                                   ${CMAKE_CURRENT_SOURCE_DIR}/apps/shared
++                                   ${ZLIB_INCLUDE_DIR}
++                                   ${PNG_PNG_INCLUDE_DIR}
++                                   ${JPEG_INCLUDE_DIR})
+ 
+     if(NOT SKIP_INSTALL_APPS AND NOT SKIP_INSTALL_ALL)
+         install(TARGETS avifenc avifdec
Index: patches/patch-src_codec_aom_c
===================================================================
RCS file: patches/patch-src_codec_aom_c
diff -N patches/patch-src_codec_aom_c
--- patches/patch-src_codec_aom_c       17 May 2020 09:29:09 -0000      1.3
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_codec_aom_c,v 1.3 2020/05/17 09:29:09 ajacoutot Exp $
-
-Re-enable cpu-used=7+ in codec_aom when libaom major version > 1.
-
-Index: src/codec_aom.c
---- src/codec_aom.c.orig
-+++ src/codec_aom.c
-@@ -254,7 +254,8 @@ static avifBool aomCodecEncodeImage(avifCodec * codec,
-         }
-     }
- 
--    if (image->depth > 8) {
-+    int aomMajorVersion = aom_codec_version_major();
-+    if ((aomMajorVersion < 2) && (image->depth > 8)) {
-         // Due to a known issue with libavif v1.0.0-errata1-avif, 10bpc and
-         // 12bpc image encodes will call the wrong variant of
-         // aom_subtract_block when cpu-used is 7 or 8, and crash. Until we get

Reply via email to