Received: by mail.netbsd.org (Postfix, from userid 605) id 9CEF384E76; Tue, 26 May 2020 11:28:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 239B484E75 for ; Tue, 26 May 2020 11:28:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id gtWA4VIfUPSF for ; Tue, 26 May 2020 11:28:05 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 328AA84D67 for ; Tue, 26 May 2020 11:28:05 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 306A2FB27; Tue, 26 May 2020 11:28:05 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1590492485229220" MIME-Version: 1.0 Date: Tue, 26 May 2020 11:28:05 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/graphics/gmic To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20200526112805.306A2FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1590492485229220 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Tue May 26 11:28:05 UTC 2020 Modified Files: pkgsrc/graphics/gmic: Makefile distinfo pkgsrc/graphics/gmic/patches: patch-src_Makefile Added Files: pkgsrc/graphics/gmic/patches: patch-gmic-qt_gmic__qt.pro Log Message: Needs bash. Don't force LTO. Ask compiler for OpenMP implementation. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 pkgsrc/graphics/gmic/Makefile cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/gmic/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/graphics/gmic/patches/patch-gmic-qt_gmic__qt.pro cvs rdiff -u -r1.5 -r1.6 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. --_----------=_1590492485229220 Content-Disposition: inline Content-Length: 3586 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/gmic/Makefile diff -u pkgsrc/graphics/gmic/Makefile:1.19 pkgsrc/graphics/gmic/Makefile:1.20 --- pkgsrc/graphics/gmic/Makefile:1.19 Sat May 23 10:44:02 2020 +++ pkgsrc/graphics/gmic/Makefile Tue May 26 11:28:04 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2020/05/23 10:44:02 ryoon Exp $ +# $NetBSD: Makefile,v 1.20 2020/05/26 11:28:04 joerg Exp $ DISTNAME= gmic_2.9.0 PKGNAME= ${DISTNAME:S/_/-/} @@ -13,7 +13,7 @@ LICENSE= gnu-gpl-v2 WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} BUILD_DIRS= src USE_LANGUAGES= c c++11 -USE_TOOLS+= gmake pkg-config +USE_TOOLS+= gmake pkg-config bash MAKE_FLAGS+= USR=${PREFIX} MAKE_FLAGS+= QMAKE=${QTDIR}/bin/qmake BUILD_TARGET= cli gimp lib zart Index: pkgsrc/graphics/gmic/distinfo diff -u pkgsrc/graphics/gmic/distinfo:1.7 pkgsrc/graphics/gmic/distinfo:1.8 --- pkgsrc/graphics/gmic/distinfo:1.7 Sat May 23 10:44:02 2020 +++ pkgsrc/graphics/gmic/distinfo Tue May 26 11:28:04 2020 @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.7 2020/05/23 10:44:02 ryoon Exp $ +$NetBSD: distinfo,v 1.8 2020/05/26 11:28:04 joerg 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-src_Makefile) = fc114d8b68691dadfa787bc06107460d1326dbb8 +SHA1 (patch-gmic-qt_gmic__qt.pro) = 9fb32f44c13f743a0d6624bd24a0dac331f677b5 +SHA1 (patch-src_Makefile) = 13e8c73c84d504311cff1eb8248c1359a642ee83 SHA1 (patch-src_gmic.cpp) = f74d2f444b9b8121fce5aa14e3266a88bf749da1 Index: pkgsrc/graphics/gmic/patches/patch-src_Makefile diff -u pkgsrc/graphics/gmic/patches/patch-src_Makefile:1.5 pkgsrc/graphics/gmic/patches/patch-src_Makefile:1.6 --- pkgsrc/graphics/gmic/patches/patch-src_Makefile:1.5 Sat May 23 10:44:02 2020 +++ pkgsrc/graphics/gmic/patches/patch-src_Makefile Tue May 26 11:28:04 2020 @@ -1,9 +1,18 @@ -$NetBSD: patch-src_Makefile,v 1.5 2020/05/23 10:44:02 ryoon Exp $ +$NetBSD: patch-src_Makefile,v 1.6 2020/05/26 11:28:04 joerg Exp $ * Install man pages for pkgsrc. --- src/Makefile.orig 2020-03-28 13:25:12.000000000 +0000 +++ src/Makefile +@@ -212,7 +212,7 @@ endif + # Enable parallelization in CImg, using OpenMP. + # (http://www.openmp.org/) + OPENMP_CFLAGS = -fopenmp -Dcimg_use_openmp +-OPENMP_LIBS = -lgomp ++OPENMP_LIBS = -fopenmp + + # Enable software debugging. + # (Use address sanitizer and thus slows down the code) @@ -727,12 +727,12 @@ ifneq ($(OS),Darwin) ln -fs libcgmic.so.$(VERSION1) $(DESTDIR)$(USR)/$(LIB)/libcgmic.so; \ fi Added files: Index: pkgsrc/graphics/gmic/patches/patch-gmic-qt_gmic__qt.pro diff -u /dev/null pkgsrc/graphics/gmic/patches/patch-gmic-qt_gmic__qt.pro:1.1 --- /dev/null Tue May 26 11:28:05 2020 +++ pkgsrc/graphics/gmic/patches/patch-gmic-qt_gmic__qt.pro Tue May 26 11:28:04 2020 @@ -0,0 +1,17 @@ +$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 --_----------=_1590492485229220--