From 7c684a94ead861e4c70335e11ec2183ac4769536 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Fri, 15 May 2020 15:44:44 +0000 Subject: [PATCH] Use pkg-config --libs OpenEXR output. --- graphics/ctl/Makefile | 4 ++-- graphics/ctl/patches/patch-config_OpenEXR_CTL_pc_in | 7 +++++-- graphics/ctl/pkg/PLIST | 3 +-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/graphics/ctl/Makefile b/graphics/ctl/Makefile index 57b8b662a6e..72e57318e0b 100644 --- a/graphics/ctl/Makefile +++ b/graphics/ctl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2020/05/14 12:35:31 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.19 2020/05/15 15:44:44 ajacoutot Exp $ COMMENT = Color Transformation Language interpreter @@ -6,7 +6,7 @@ GH_ACCOUNT = ampas GH_PROJECT = CTL GH_TAGNAME = ctl-1.5.2 DISTNAME = ${GH_TAGNAME} -REVISION = 5 +REVISION = 6 SHARED_LIBS += IlmCtl 1.0 # .2.0 SHARED_LIBS += IlmCtlMath 1.0 # .2.0 diff --git a/graphics/ctl/patches/patch-config_OpenEXR_CTL_pc_in b/graphics/ctl/patches/patch-config_OpenEXR_CTL_pc_in index 9025dd52e7e..bf3d37f92f6 100644 --- a/graphics/ctl/patches/patch-config_OpenEXR_CTL_pc_in +++ b/graphics/ctl/patches/patch-config_OpenEXR_CTL_pc_in @@ -1,4 +1,7 @@ -$OpenBSD: patch-config_OpenEXR_CTL_pc_in,v 1.2 2020/05/14 12:35:31 ajacoutot Exp $ +$OpenBSD: patch-config_OpenEXR_CTL_pc_in,v 1.3 2020/05/15 15:44:44 ajacoutot Exp $ + +pkg-config --libs OpenEXR + --- config/OpenEXR_CTL.pc.in.orig Tue Jun 3 03:11:24 2014 +++ config/OpenEXR_CTL.pc.in Fri Sep 11 14:47:59 2015 @@ -1,11 +1,12 @@ @@ -20,5 +23,5 @@ $OpenBSD: patch-config_OpenEXR_CTL_pc_in,v 1.2 2020/05/14 12:35:31 ajacoutot Exp -Libs: -L${libdir} -lIlmImfCtl @OPENEXR_LDFLAGS@ @CTL_LDFLAGS@ -Cflags: @CTL_CXXFLAGS_PC@ @OPENEXR_CXXFLAGS@ -I${OpenEXR_includedir} +Version: @CTL_VERSION@ -+Libs: -L${libdir} -lIlmImfCtl -lIlmImf-2_5 -lImath -lHalf-2_5 -lIex-2_5 -lIexMath-2_5 -lIlmThread-2_5 -lIlmCtlSimd -lIlmCtlMath -lIlmCtl -pthread ++Libs: -L${libdir} -pthread -lIlmImf-2_5 -lImath-2_5 -lHalf-2_5 -lIex-2_5 -lIexMath-2_5 -lIlmThread-2_5 +Cflags: @CTL_CXXFLAGS_PC@ @OPENEXR_CXXFLAGS@ -I${OpenEXR_includedir} -I${CTL_includedir} diff --git a/graphics/ctl/pkg/PLIST b/graphics/ctl/pkg/PLIST index 6dbd7064c64..fd015323411 100644 --- a/graphics/ctl/pkg/PLIST +++ b/graphics/ctl/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.4 2017/12/03 13:32:52 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.5 2020/05/15 15:44:44 ajacoutot Exp $ @conflict openexr-ctl-* @pkgpath graphics/openexr-ctl @bin bin/ctlrender @@ -34,7 +34,6 @@ lib/CTL/change_saturation.ctl lib/CTL/transform_DPX_EXR.ctl lib/CTL/transform_EXR_DPX.ctl lib/CTL/utilities.ctl -lib/cmake/ lib/cmake/CTL/ lib/cmake/CTL/CTLConfig.cmake lib/cmake/CTL/CTLConfigVersion.cmake