CVS commit: pkgsrc/graphics/openimageio

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Tue Nov  7 12:13:57 UTC 2023

Modified Files:
        pkgsrc/graphics/openimageio: Makefile buildlink3.mk

Log Message:
openimageio: build data fixes for cmake and pkg-config
Add pkg-config override.
buildlink the binaries as they are targets in the cmake
config files, so that find_package(OpenImageIO) works
in cmake based packages that consume OpenImageIO.


To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 pkgsrc/graphics/openimageio/Makefile
cvs rdiff -u -r1.66 -r1.67 pkgsrc/graphics/openimageio/buildlink3.mk

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.98 pkgsrc/graphics/openimageio/Makefile:1.99
--- pkgsrc/graphics/openimageio/Makefile:1.98   Mon Nov  6 17:20:41 2023
+++ pkgsrc/graphics/openimageio/Makefile        Tue Nov  7 12:13:57 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.98 2023/11/06 17:20:41 nros Exp $
+# $NetBSD: Makefile,v 1.99 2023/11/07 12:13:57 nros Exp $
 
 DISTNAME=      OpenImageIO-2.5.4.0
 PKGNAME=       ${DISTNAME:tl}
@@ -46,6 +46,8 @@ CMAKE_ARGS+=          -DUSE_OpenCV=OFF
 # We're using cmake...
 CHECK_PORTABILITY_SKIP+=       Makefile
 
+PKGCONFIG_OVERRIDE=    src/build-scripts/OpenImageIO.pc.in
+
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/cmake/build.mk"

Index: pkgsrc/graphics/openimageio/buildlink3.mk
diff -u pkgsrc/graphics/openimageio/buildlink3.mk:1.66 pkgsrc/graphics/openimageio/buildlink3.mk:1.67
--- pkgsrc/graphics/openimageio/buildlink3.mk:1.66      Sun Oct 15 19:52:09 2023
+++ pkgsrc/graphics/openimageio/buildlink3.mk   Tue Nov  7 12:13:57 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.66 2023/10/15 19:52:09 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.67 2023/11/07 12:13:57 nros Exp $
 
 BUILDLINK_TREE+=       openimageio
 
@@ -8,6 +8,15 @@ OPENIMAGEIO_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.openimageio+=    openimageio>=2.4.12.0
 BUILDLINK_PKGSRCDIR.openimageio?=      ../../graphics/openimageio
 
+# these are targets in the cmake config files
+BUILDLINK_FILES.openimageio+=          bin/iconvert
+BUILDLINK_FILES.openimageio+=          bin/idiff
+BUILDLINK_FILES.openimageio+=          bin/igrep
+BUILDLINK_FILES.openimageio+=          bin/iinfo
+BUILDLINK_FILES.openimageio+=          bin/maketx
+BUILDLINK_FILES.openimageio+=          bin/oiiotool
+BUILDLINK_FILES.openimageio+=          bin/testtex
+
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glew/buildlink3.mk"