CVS commit: pkgsrc/graphics/gmic

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Tue Jul 13 21:06:03 UTC 2021

Modified Files:
        pkgsrc/graphics/gmic: Makefile distinfo
        pkgsrc/graphics/gmic/patches: patch-src_Makefile

Log Message:
gmic: openexr3 fix


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/graphics/gmic/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/graphics/gmic/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/graphics/gmic/patches/patch-src_Makefile

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

Modified files:

Index: pkgsrc/graphics/gmic/Makefile
diff -u pkgsrc/graphics/gmic/Makefile:1.25 pkgsrc/graphics/gmic/Makefile:1.26
--- pkgsrc/graphics/gmic/Makefile:1.25  Wed Apr 21 13:24:47 2021
+++ pkgsrc/graphics/gmic/Makefile       Tue Jul 13 21:06:03 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2021/04/21 13:24:47 adam Exp $
+# $NetBSD: Makefile,v 1.26 2021/07/13 21:06:03 markd Exp $
 
 DISTNAME=      gmic_2.9.0
 PKGNAME=       ${DISTNAME:S/_/-/}
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    graphics
 MASTER_SITES=  https://gmic.eu/files/source/
 

Index: pkgsrc/graphics/gmic/distinfo
diff -u pkgsrc/graphics/gmic/distinfo:1.8 pkgsrc/graphics/gmic/distinfo:1.9
--- pkgsrc/graphics/gmic/distinfo:1.8   Tue May 26 11:28:04 2020
+++ pkgsrc/graphics/gmic/distinfo       Tue Jul 13 21:06:03 2021
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2020/05/26 11:28:04 joerg Exp $
+$NetBSD: distinfo,v 1.9 2021/07/13 21:06:03 markd Exp $
 
 SHA1 (gmic_2.9.0.tar.gz) = f1c4dd0c58548828fe57ca6685b384ae086f45bf
 RMD160 (gmic_2.9.0.tar.gz) = f5e250c3043f811c76a74d60513a979ed09679b0
 SHA512 (gmic_2.9.0.tar.gz) = 3b3703520998e5ad547316683158d7b60541a8cea2a7c1e7118f8de88492e0961bf1fe1da360dfb26d0ba7eaf997e7005a864364297db2bb405d532dedc4241d
 Size (gmic_2.9.0.tar.gz) = 6195597 bytes
 SHA1 (patch-gmic-qt_gmic__qt.pro) = 9fb32f44c13f743a0d6624bd24a0dac331f677b5
-SHA1 (patch-src_Makefile) = 13e8c73c84d504311cff1eb8248c1359a642ee83
+SHA1 (patch-src_Makefile) = 30327a1860885d93d8f0a59ff5d024b41ca1f836
 SHA1 (patch-src_gmic.cpp) = f74d2f444b9b8121fce5aa14e3266a88bf749da1

Index: pkgsrc/graphics/gmic/patches/patch-src_Makefile
diff -u pkgsrc/graphics/gmic/patches/patch-src_Makefile:1.6 pkgsrc/graphics/gmic/patches/patch-src_Makefile:1.7
--- pkgsrc/graphics/gmic/patches/patch-src_Makefile:1.6 Tue May 26 11:28:04 2020
+++ pkgsrc/graphics/gmic/patches/patch-src_Makefile     Tue Jul 13 21:06:03 2021
@@ -1,6 +1,7 @@
-$NetBSD: patch-src_Makefile,v 1.6 2020/05/26 11:28:04 joerg Exp $
+$NetBSD: patch-src_Makefile,v 1.7 2021/07/13 21:06:03 markd Exp $
 
 * Install man pages for pkgsrc.
+* openexr3
 
 --- src/Makefile.orig  2020-03-28 13:25:12.000000000 +0000
 +++ src/Makefile
@@ -13,6 +14,17 @@ $NetBSD: patch-src_Makefile,v 1.6 2020/0
  
  # Enable software debugging.
  # (Use address sanitizer and thus slows down the code)
+@@ -302,8 +302,8 @@ MAGICK_LIBS = $(shell pkg-config --libs 
+ 
+ # Enable native support of EXR image files, using the OpenEXR library.
+ # (http://www.openexr.com/)
+-OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
+-OPENEXR_LIBS = -lIlmImf -lHalf
++OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/Imath -I$(USR)/$(INCLUDE)/OpenEXR
++OPENEXR_LIBS = -lOpenEXR -lImath
+ 
+ # Enable Fast Fourier Transforms, using the FFTW3 library.
+ # (http://www.fftw.org/)
 @@ -727,12 +727,12 @@ ifneq ($(OS),Darwin)
            ln -fs libcgmic.so.$(VERSION1) $(DESTDIR)$(USR)/$(LIB)/libcgmic.so; \
          fi