CVS commit: pkgsrc/graphics/libheif

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Wed Apr  2 22:19:11 UTC 2025

Modified Files:
        pkgsrc/graphics/libheif: Makefile buildlink3.mk distinfo
Added Files:
        pkgsrc/graphics/libheif/patches: patch-CMakeLists.txt

Log Message:
graphics/libheif: C++20 is not needed, only C++17.

libheif uses std::optional, which is new in C++17, so C++11 is not
enough.

Tested on netbsd-9 with pkgsrc gcc10.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/graphics/libheif/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/graphics/libheif/buildlink3.mk
cvs rdiff -u -r1.35 -r1.36 pkgsrc/graphics/libheif/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/libheif/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/libheif/Makefile
diff -u pkgsrc/graphics/libheif/Makefile:1.42 pkgsrc/graphics/libheif/Makefile:1.43
--- pkgsrc/graphics/libheif/Makefile:1.42       Mon Mar 10 15:45:24 2025
+++ pkgsrc/graphics/libheif/Makefile    Wed Apr  2 22:19:11 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2025/03/10 15:45:24 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2025/04/02 22:19:11 riastradh Exp $
 
 DISTNAME=      libheif-1.19.7
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=strukturag/}
 GITHUB_RELEASE=        v${PKGVERSION_NOREV}
@@ -10,12 +11,10 @@ HOMEPAGE=   https://github.com/strukturag/
 COMMENT=       HEIF and AVIF file format decoder and encoder library
 LICENSE=       gnu-lgpl-v3
 
-#TEST_DEPENDS+=        catch2-[0-9]*:../../devel/catch2
-
 USE_TOOLS+=    pkg-config
 USE_LANGUAGES= c c++
 
-USE_CXX_FEATURES+=     c++20
+USE_CXX_FEATURES+=     c++17
 
 CMAKE_CONFIGURE_ARGS+= -DWITH_RAV1E=OFF
 CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_TIFF=ON
@@ -24,6 +23,9 @@ PKGCONFIG_OVERRIDE+=  libheif.pc.in
 
 BUILDLINK_TRANSFORM+=  rm:-Werror
 
+TEST_TARGET=   test
+TEST_ENV+=     LD_LIBRARY_PATH=${WRKSRC}/${CONFIGURE_DIR}/${CMAKE_BUILD_DIR}/libheif
+
 .include "../../devel/cmake/build.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../multimedia/dav1d/buildlink3.mk"

Index: pkgsrc/graphics/libheif/buildlink3.mk
diff -u pkgsrc/graphics/libheif/buildlink3.mk:1.13 pkgsrc/graphics/libheif/buildlink3.mk:1.14
--- pkgsrc/graphics/libheif/buildlink3.mk:1.13  Wed Apr  2 13:06:29 2025
+++ pkgsrc/graphics/libheif/buildlink3.mk       Wed Apr  2 22:19:11 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2025/04/02 13:06:29 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2025/04/02 22:19:11 riastradh Exp $
 
 BUILDLINK_TREE+=       libheif
 
@@ -13,7 +13,7 @@ BUILDLINK_TREE+=      libheif
 .if !defined(LIBHEIF_BUILDLINK3_MK)
 LIBHEIF_BUILDLINK3_MK:=
 
-USE_CXX_FEATURES+=             c++20
+USE_CXX_FEATURES+=             c++17
 
 BUILDLINK_API_DEPENDS.libheif+=        libheif>=1.8.0
 BUILDLINK_ABI_DEPENDS.libheif+=        libheif>=1.19.5nb1

Index: pkgsrc/graphics/libheif/distinfo
diff -u pkgsrc/graphics/libheif/distinfo:1.35 pkgsrc/graphics/libheif/distinfo:1.36
--- pkgsrc/graphics/libheif/distinfo:1.35       Mon Mar 10 15:45:24 2025
+++ pkgsrc/graphics/libheif/distinfo    Wed Apr  2 22:19:11 2025
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.35 2025/03/10 15:45:24 wiz Exp $
+$NetBSD: distinfo,v 1.36 2025/04/02 22:19:11 riastradh Exp $
 
 BLAKE2s (libheif-1.19.7.tar.gz) = 06aee431a1d9184e21c91fabc5dacbedd49592df8c14fa9611190996f71960e2
 SHA512 (libheif-1.19.7.tar.gz) = b0c3226c528daf78d8e8f73b5a07b9104e3ff036c553a66fdd0ca494380d8fb03c799241f0ea66b5f7e42d4fec87d186571f2aae9ac4820ffd7ff76d704f487b
 Size (libheif-1.19.7.tar.gz) = 1717186 bytes
+SHA1 (patch-CMakeLists.txt) = 8c75d2ee90e96a41a7c3135bd02fc4cffc9e501e

Added files:

Index: pkgsrc/graphics/libheif/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/graphics/libheif/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Wed Apr  2 22:19:11 2025
+++ pkgsrc/graphics/libheif/patches/patch-CMakeLists.txt        Wed Apr  2 22:19:11 2025
@@ -0,0 +1,13 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2025/04/02 22:19:11 riastradh Exp $
+
+--- CMakeLists.txt.orig        2025-03-03 11:00:24.000000000 +0000
++++ CMakeLists.txt
+@@ -48,7 +48,7 @@ if(NOT MSVC)
+   endif ()
+ endif()
+ 
+-set(CMAKE_CXX_STANDARD 20)
++set(CMAKE_CXX_STANDARD 17)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ set(CMAKE_CXX_EXTENSIONS OFF)
+