Tue May 26 11:28:05 2020 UTC ()
Needs bash. Don't force LTO. Ask compiler for OpenMP implementation.


(joerg)
diff -r1.19 -r1.20 pkgsrc/graphics/gmic/Makefile
diff -r1.7 -r1.8 pkgsrc/graphics/gmic/distinfo
diff -r0 -r1.1 pkgsrc/graphics/gmic/patches/patch-gmic-qt_gmic__qt.pro
diff -r1.5 -r1.6 pkgsrc/graphics/gmic/patches/patch-src_Makefile
cvs diff -r1.19 -r1.20 pkgsrc/graphics/gmic/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/gmic/Makefile 2020/05/23 10:44:02 1.19
+++ pkgsrc/graphics/gmic/Makefile 2020/05/26 11:28:04 1.20
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1# $NetBSD: Makefile,v 1.19 2020/05/23 10:44:02 ryoon Exp $ 1# $NetBSD: Makefile,v 1.20 2020/05/26 11:28:04 joerg Exp $
2 2
3DISTNAME= gmic_2.9.0 3DISTNAME= gmic_2.9.0
4PKGNAME= ${DISTNAME:S/_/-/} 4PKGNAME= ${DISTNAME:S/_/-/}
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= https://gmic.eu/files/source/ 6MASTER_SITES= https://gmic.eu/files/source/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://gmic.eu/ 9HOMEPAGE= https://gmic.eu/
10COMMENT= Full-featured image processing framework 10COMMENT= Full-featured image processing framework
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 13WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
14BUILD_DIRS= src 14BUILD_DIRS= src
15USE_LANGUAGES= c c++11 15USE_LANGUAGES= c c++11
16USE_TOOLS+= gmake pkg-config 16USE_TOOLS+= gmake pkg-config bash
17MAKE_FLAGS+= USR=${PREFIX} 17MAKE_FLAGS+= USR=${PREFIX}
18MAKE_FLAGS+= QMAKE=${QTDIR}/bin/qmake 18MAKE_FLAGS+= QMAKE=${QTDIR}/bin/qmake
19BUILD_TARGET= cli gimp lib zart 19BUILD_TARGET= cli gimp lib zart
20 20
21MANCOMPRESSED= yes 21MANCOMPRESSED= yes
22 22
23.include "../../devel/glib2/buildlink3.mk" 23.include "../../devel/glib2/buildlink3.mk"
24.include "../../devel/zlib/buildlink3.mk" 24.include "../../devel/zlib/buildlink3.mk"
25.include "../../graphics/opencv/buildlink3.mk" 25.include "../../graphics/opencv/buildlink3.mk"
26.include "../../mk/jpeg.buildlink3.mk" 26.include "../../mk/jpeg.buildlink3.mk"
27.include "../../graphics/png/buildlink3.mk" 27.include "../../graphics/png/buildlink3.mk"
28.include "../../graphics/tiff/buildlink3.mk" 28.include "../../graphics/tiff/buildlink3.mk"
29.include "../../graphics/openexr/buildlink3.mk" 29.include "../../graphics/openexr/buildlink3.mk"
cvs diff -r1.7 -r1.8 pkgsrc/graphics/gmic/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/gmic/distinfo 2020/05/23 10:44:02 1.7
+++ pkgsrc/graphics/gmic/distinfo 2020/05/26 11:28:04 1.8
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.7 2020/05/23 10:44:02 ryoon Exp $ 1$NetBSD: distinfo,v 1.8 2020/05/26 11:28:04 joerg Exp $
2 2
3SHA1 (gmic_2.9.0.tar.gz) = f1c4dd0c58548828fe57ca6685b384ae086f45bf 3SHA1 (gmic_2.9.0.tar.gz) = f1c4dd0c58548828fe57ca6685b384ae086f45bf
4RMD160 (gmic_2.9.0.tar.gz) = f5e250c3043f811c76a74d60513a979ed09679b0 4RMD160 (gmic_2.9.0.tar.gz) = f5e250c3043f811c76a74d60513a979ed09679b0
5SHA512 (gmic_2.9.0.tar.gz) = 3b3703520998e5ad547316683158d7b60541a8cea2a7c1e7118f8de88492e0961bf1fe1da360dfb26d0ba7eaf997e7005a864364297db2bb405d532dedc4241d 5SHA512 (gmic_2.9.0.tar.gz) = 3b3703520998e5ad547316683158d7b60541a8cea2a7c1e7118f8de88492e0961bf1fe1da360dfb26d0ba7eaf997e7005a864364297db2bb405d532dedc4241d
6Size (gmic_2.9.0.tar.gz) = 6195597 bytes 6Size (gmic_2.9.0.tar.gz) = 6195597 bytes
7SHA1 (patch-src_Makefile) = fc114d8b68691dadfa787bc06107460d1326dbb8 7SHA1 (patch-gmic-qt_gmic__qt.pro) = 9fb32f44c13f743a0d6624bd24a0dac331f677b5
 8SHA1 (patch-src_Makefile) = 13e8c73c84d504311cff1eb8248c1359a642ee83
8SHA1 (patch-src_gmic.cpp) = f74d2f444b9b8121fce5aa14e3266a88bf749da1 9SHA1 (patch-src_gmic.cpp) = f74d2f444b9b8121fce5aa14e3266a88bf749da1
File Added: pkgsrc/graphics/gmic/patches/patch-gmic-qt_gmic__qt.pro
$NetBSD: patch-gmic-qt_gmic__qt.pro,v 1.1 2020/05/26 11:28:04 joerg Exp $

--- gmic-qt/gmic_qt.pro.orig	2020-05-26 01:42:41.240133823 +0000
+++ gmic-qt/gmic_qt.pro
@@ -227,12 +227,6 @@ win32:equals(LTO,"on") {
     LTO = off
 }
 
-!win32:CONFIG(release, debug|release):gcc|clang:equals(LTO,"on") {
-    message("Link Time Optimizer enabled")
-    QMAKE_CXXFLAGS_RELEASE += -flto
-    QMAKE_LFLAGS_RELEASE += -flto
-}
-
 DEFINES += gmic_gui gmic_build gmic_is_parallel cimg_use_abort
 
 INCLUDEPATH	+= $$PWD $$PWD/src $$GMIC_PATH
cvs diff -r1.5 -r1.6 pkgsrc/graphics/gmic/patches/Attic/patch-src_Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/gmic/patches/Attic/patch-src_Makefile 2020/05/23 10:44:02 1.5
+++ pkgsrc/graphics/gmic/patches/Attic/patch-src_Makefile 2020/05/26 11:28:04 1.6
@@ -1,19 +1,28 @@ @@ -1,19 +1,28 @@
1$NetBSD: patch-src_Makefile,v 1.5 2020/05/23 10:44:02 ryoon Exp $ 1$NetBSD: patch-src_Makefile,v 1.6 2020/05/26 11:28:04 joerg Exp $
2 2
3* Install man pages for pkgsrc. 3* Install man pages for pkgsrc.
4 4
5--- src/Makefile.orig 2020-03-28 13:25:12.000000000 +0000 5--- src/Makefile.orig 2020-03-28 13:25:12.000000000 +0000
6+++ src/Makefile 6+++ src/Makefile
 7@@ -212,7 +212,7 @@ endif
 8 # Enable parallelization in CImg, using OpenMP.
 9 # (http://www.openmp.org/)
 10 OPENMP_CFLAGS = -fopenmp -Dcimg_use_openmp
 11-OPENMP_LIBS = -lgomp
 12+OPENMP_LIBS = -fopenmp
 13
 14 # Enable software debugging.
 15 # (Use address sanitizer and thus slows down the code)
7@@ -727,12 +727,12 @@ ifneq ($(OS),Darwin) 16@@ -727,12 +727,12 @@ ifneq ($(OS),Darwin)
8 ln -fs libcgmic.so.$(VERSION1) $(DESTDIR)$(USR)/$(LIB)/libcgmic.so; \ 17 ln -fs libcgmic.so.$(VERSION1) $(DESTDIR)$(USR)/$(LIB)/libcgmic.so; \
9 fi 18 fi
10 endif 19 endif
11- mkdir -p $(DESTDIR)$(USR)/share/man/ 20- mkdir -p $(DESTDIR)$(USR)/share/man/
12- mkdir -p $(DESTDIR)$(USR)/share/man/man1/ 21- mkdir -p $(DESTDIR)$(USR)/share/man/man1/
13- mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/ 22- mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/
14+ mkdir -p $(DESTDIR)$(USR)/${PKGMANDIR} 23+ mkdir -p $(DESTDIR)$(USR)/${PKGMANDIR}
15+ mkdir -p $(DESTDIR)$(USR)/${PKGMANDIR}/man1/ 24+ mkdir -p $(DESTDIR)$(USR)/${PKGMANDIR}/man1/
16+ mkdir -p $(DESTDIR)$(USR)/${PKGMANDIR}/fr/man1/ 25+ mkdir -p $(DESTDIR)$(USR)/${PKGMANDIR}/fr/man1/
17 @if [ -f ../man/gmic.1.gz ]; then \ 26 @if [ -f ../man/gmic.1.gz ]; then \
18- cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz; \ 27- cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz; \
19- cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz; \ 28- cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz; \