CVS commit: pkgsrc/graphics/openimageio

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Dec 26 17:59:30 UTC 2022

Modified Files:
        pkgsrc/graphics/openimageio: Makefile distinfo

Log Message:
openimageio: Bundle a static version of fmtlib so that this package
is unaffected by incompatible API changes in the latest version of
the library, in order to fix the build. Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 pkgsrc/graphics/openimageio/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/graphics/openimageio/distinfo

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

Modified files:

Index: pkgsrc/graphics/openimageio/Makefile
diff -u pkgsrc/graphics/openimageio/Makefile:1.84 pkgsrc/graphics/openimageio/Makefile:1.85
--- pkgsrc/graphics/openimageio/Makefile:1.84   Fri Jul  1 16:18:44 2022
+++ pkgsrc/graphics/openimageio/Makefile        Mon Dec 26 17:59:30 2022
@@ -1,12 +1,15 @@
-# $NetBSD: Makefile,v 1.84 2022/07/01 16:18:44 adam Exp $
+# $NetBSD: Makefile,v 1.85 2022/12/26 17:59:30 nia Exp $
 
 DISTNAME=      oiio-2.2.20.0
 PKGNAME=       ${DISTNAME:S/oiio/openimageio/}
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=OpenImageIO/}
 GITHUB_PROJECT=        oiio
 GITHUB_TAG=    v${PKGVERSION_NOREV}
 
+GITHUB_SUBMODULES+=    fmtlib fmt 7.1.3 ext/fmt
+
 MAINTAINER=    ryoon%NetBSD.org@localhost
 HOMEPAGE=      https://sites.google.com/site/openimageio/
 COMMENT=       C++ library for reading and writing images
@@ -20,7 +23,8 @@ USE_LANGUAGES=                c c++
 TEST_TARGET=           test
 
 CMAKE_ARGS+=           -DSTOP_ON_WARNING=OFF # Disable -Werror
-CMAKE_ARGS+=           -DBUILD_MISSING_FMT=OFF
+# XXX: cannot use fmtlib from pkgsrc, too new
+CMAKE_ARGS+=           -DBUILD_FMT_FORCE=ON
 CMAKE_ARGS+=           -DBUILD_MISSING_ROBINMAP=OFF
 CMAKE_ARGS+=           -DUSE_EXTERNAL_PUGIXML=ON
 CMAKE_ARGS+=           -DUSE_PYTHON:BOOL=OFF
@@ -68,7 +72,8 @@ pre-configure:
 .include "../../graphics/openjpeg/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../parallel/threadingbuildingblocks/buildlink3.mk"
-.include "../../textproc/fmtlib/buildlink3.mk"
+# XXX: requiring specific version currently
+#.include "../../textproc/fmtlib/buildlink3.mk"
 .include "../../textproc/pugixml/buildlink3.mk"
 .include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/openimageio/distinfo
diff -u pkgsrc/graphics/openimageio/distinfo:1.28 pkgsrc/graphics/openimageio/distinfo:1.29
--- pkgsrc/graphics/openimageio/distinfo:1.28   Fri Jul  1 16:18:44 2022
+++ pkgsrc/graphics/openimageio/distinfo        Mon Dec 26 17:59:30 2022
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.28 2022/07/01 16:18:44 adam Exp $
+$NetBSD: distinfo,v 1.29 2022/12/26 17:59:30 nia Exp $
 
+BLAKE2s (fmtlib-fmt-7.1.3.tar.gz) = 7b522ae0e5390aad8233c40f33aac066fc23da6514e893c48ed402c237d2e321
+SHA512 (fmtlib-fmt-7.1.3.tar.gz) = cfb2431de822202f17a6f34a302b1922b9cd696d8d4c27ad50ea08add781d2af9944db987603c2eb294ee7d73054a60cc11d3a0693f7f6db61949f3041cb9517
+Size (fmtlib-fmt-7.1.3.tar.gz) = 770029 bytes
 BLAKE2s (oiio-2.2.20.0.tar.gz) = df9abfff664dfa32500bce970085f5fbab86f7f6f77890a0e9fa19d1c202861f
 SHA512 (oiio-2.2.20.0.tar.gz) = 0c02f79973ac66633cadfe7159112fe5007b8af96d25e5aa7586fd5543472e8a63b384574bdd6af4236e18092e53e6bf318b47fa36b4c25afe5ce41c5c71b3ff
 Size (oiio-2.2.20.0.tar.gz) = 29253646 bytes
 SHA1 (patch-src_cmake_compiler.cmake) = 8c06e8e22eb927bbdec288c166a5dc44fbef5acb
-SHA1 (patch-src_libutil_sysutil.cpp) = f828232fed737ede5013e926630e29efa63c8f04