On Fri, Nov 25, 2022 at 11:14:24AM +0000, Stuart Henderson wrote:
> Needs gtest at build time.
> 
> Is it worth disabling libyuv detection in case it's ever added to ports?

Sure. Updated diff.


Index: Makefile
===================================================================
RCS file: /home/cvs/ports/graphics/libavif/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- Makefile    11 May 2022 17:26:52 -0000      1.19
+++ Makefile    25 Nov 2022 19:17:30 -0000
@@ -2,10 +2,10 @@ COMMENT=      library for encoding and decodi
 
 GH_ACCOUNT=    AOMediaCodec
 GH_PROJECT=    libavif
-GH_TAGNAME=    v0.10.1
+GH_TAGNAME=    v0.11.1
 CATEGORIES=    graphics
 
-SHARED_LIBS=   avif    5.0
+SHARED_LIBS=   avif    6.0
 
 HOMEPAGE=      https://github.com/AOMediaCodec/libavif
 
@@ -29,7 +29,10 @@ CONFIGURE_ARGS+=-DAVIF_BUILD_APPS=ON \
                -DAVIF_BUILD_TESTS=ON \
                -DAVIF_CODEC_AOM=ON \
                -DAVIF_CODEC_AOM_DECODE=OFF \
-               -DAVIF_CODEC_DAV1D=ON
+               -DAVIF_CODEC_DAV1D=ON \
+               -DAVIF_ENABLE_GTEST=OFF \
+               -DCMAKE_DISABLE_FIND_PACKAGE_libsharpyuv=OFF \
+               -DCMAKE_DISABLE_FIND_PACKAGE_libyuv=OFF
 
 do-test:
        ${WRKBUILD}/tests/aviftest ${WRKSRC}/tests/data
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/graphics/libavif/distinfo,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 distinfo
--- distinfo    11 May 2022 17:26:52 -0000      1.14
+++ distinfo    26 Oct 2022 01:29:28 -0000
@@ -1,2 +1,2 @@
-SHA256 (libavif-0.10.1.tar.gz) = ZugoVM64Sj5UK8FAo0O8kOVsaPPstP/2PmNsE27ZoF4=
-SIZE (libavif-0.10.1.tar.gz) = 2085698
+SHA256 (libavif-0.11.1.tar.gz) = DrSZZVYqDl5d5YOJZQ1DTP8yr4TDQYW2ybey/MrgbU4=
+SIZE (libavif-0.11.1.tar.gz) = 5826813
Index: patches/patch-tests_CMakeLists_txt
===================================================================
RCS file: patches/patch-tests_CMakeLists_txt
diff -N patches/patch-tests_CMakeLists_txt
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-tests_CMakeLists_txt  25 Nov 2022 19:23:22 -0000
@@ -0,0 +1,28 @@
+Build aviftest_helpers for are_images_equal.cc
+e279707a001c8f95f8a2bc51c0d19bf35bfc79ab
+
+Index: tests/CMakeLists.txt
+--- tests/CMakeLists.txt.orig
++++ tests/CMakeLists.txt
+@@ -39,15 +39,17 @@ foreach(AVIFYUV_MODE limited rgb) # Modes drift and pr
+     add_test(NAME avifyuv_${AVIFYUV_MODE} COMMAND avifyuv -m ${AVIFYUV_MODE})
+ endforeach()
+ 
+-################################################################################
+-# GoogleTest
+-
+-if(AVIF_ENABLE_GTEST)
++if(AVIF_ENABLE_GTEST OR AVIF_BUILD_APPS)
+     enable_language(CXX)
+     set(CMAKE_CXX_STANDARD 11)
+     add_library(aviftest_helpers OBJECT gtest/aviftest_helpers.cc)
+     target_link_libraries(aviftest_helpers avif_apps)
++endif()
+ 
++################################################################################
++# GoogleTest
++
++if(AVIF_ENABLE_GTEST)
+     if(AVIF_LOCAL_GTEST)
+         set(GTEST_INCLUDE_DIRS 
${CMAKE_SOURCE_DIR}/ext/googletest/googletest/include)
+         set(GTEST_LIBRARIES

Reply via email to