From owner-svn-ports-head@freebsd.org Wed Jul 3 10:44:41 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8B84515CFB39; Wed, 3 Jul 2019 10:44:41 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2B33B6E458; Wed, 3 Jul 2019 10:44:41 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 189AFA9A5; Wed, 3 Jul 2019 10:44:41 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x63Aieqs087111; Wed, 3 Jul 2019 10:44:40 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x63Aieq7087110; Wed, 3 Jul 2019 10:44:40 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201907031044.x63Aieq7087110@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Wed, 3 Jul 2019 10:44:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r505744 - head/graphics/lightzone X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/graphics/lightzone X-SVN-Commit-Revision: 505744 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 2B33B6E458 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.968,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jul 2019 10:44:41 -0000 Author: tobik Date: Wed Jul 3 10:44:40 2019 New Revision: 505744 URL: https://svnweb.freebsd.org/changeset/ports/505744 Log: graphics/lightzone: Fix build with GCC 9 - Apply upstream commit 376ec67ddfb1 to update bundled dcraw to 9.28 [...] [exec] -----> Entering dcraw [exec] gcc9 -c -g -march=pentium4 -mtune=generic -march=pentium4 -msse2 -mfpmath=sse -fPIC -O3 -fno-trapping-math -fomit-frame-pointer -fopenmp -Wno-unused-result -DNODEPS -DLIGHTZONE -Dfgetc=getc_unlocked dcraw_lz.c [exec] dcraw_lz.c: In function 'vng_interpolate': [exec] dcraw_lz.c:4543:10: warning: assignment to 'short unsigned int (*)[4]' from incompatible pointer type 'short unsigned int *' [-Wincompatible-pointer-types] [exec] 4543 | rowtmp = (ushort*)malloc(4 * width * 4 * sizeof(ushort)); [exec] | ^ [exec] dcraw_lz.c: In function 'wavelet_denoise': [exec] dcraw_lz.c:4170:32: error: 'noise' not specified in enclosing 'parallel' [exec] 4170 | thold = threshold * noise[lev]; [exec] | ~~~~~^~~~~ [exec] dcraw_lz.c:4149:13: error: enclosing 'parallel' [exec] 4149 | #pragma omp parallel for \ [exec] | ^~~ [exec] dcraw_lz.c: In function 'xtrans_interpolate': [exec] dcraw_lz.c:4846:19: error: 'orth' not specified in enclosing 'parallel' [exec] 4846 | if (fcol(row+orth[d],col+orth[d+2]) == 1) ng=0; else ng++; [exec] | ~~~~^~~ [exec] dcraw_lz.c:4757:31: note: in definition of macro 'fcol' [exec] 4757 | #define fcol(row,col) xtrans[(row+6) % 6][(col+6) % 6] [exec] | ^~~ [exec] dcraw_lz.c:4827:9: error: enclosing 'parallel' [exec] 4827 | #pragma omp parallel default (none) \ [exec] | ^~~ [exec] dcraw_lz.c:4849:25: error: 'patt' not specified in enclosing 'parallel' [exec] 4849 | v = orth[d ]*patt[g][c*2] + orth[d+1]*patt[g][c*2+1]; [exec] | ~~~~~~~^~~~~ [exec] dcraw_lz.c:4827:9: error: enclosing 'parallel' [exec] 4827 | #pragma omp parallel default (none) \ [exec] | ^~~ [exec] dcraw_lz.c:5021:7: error: 'dir' not specified in enclosing 'parallel' [exec] 5021 | f=dir[d & 3]; [exec] | ~~~^~~~~~~ [exec] dcraw_lz.c:4827:9: error: enclosing 'parallel' [exec] 4827 | #pragma omp parallel default (none) \ [exec] | ^~~ http://package18.nyi.freebsd.org/data/120amd64-default-PR238330/2019-06-09_20h26m27s/logs/errors/lightzone-4.1.8.3_3.log PR: 238664 Reported by: antoine (via exp-run in PR 238330) Submitted by: jbeich Approved by: yuri (maintainer timeout, 2 weeks) Modified: head/graphics/lightzone/Makefile head/graphics/lightzone/distinfo Modified: head/graphics/lightzone/Makefile ============================================================================== --- head/graphics/lightzone/Makefile Wed Jul 3 10:29:30 2019 (r505743) +++ head/graphics/lightzone/Makefile Wed Jul 3 10:44:40 2019 (r505744) @@ -4,10 +4,13 @@ PORTNAME= lightzone DISTVERSION= 4.1.8-3 DISTVERSIONSUFFIX= -g36e87773 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics java DIST_SUBDIR= ${PORTNAME} +PATCH_SITES= https://github.com/ktgw0316/LightZone/commit/ +PATCHFILES= 376ec67ddfb1.patch:-p1 + MAINTAINER= yuri@FreeBSD.org COMMENT= Professional-level digital darkroom and photo editor @@ -43,9 +46,11 @@ JAVA_BUILD= yes JAVA_RUN= yes INSTALLS_ICONS= yes +PATCH_WRKSRC= ${WRKSRC:H} +WRKSRC_SUBDIR= linux + LIBDIR= ${PREFIX}/lib/${PORTNAME} PLIST_SUB= LIBDIR="${LIBDIR}" -WRKSRC_SUBDIR= linux post-patch: @${REINPLACE_CMD} -e 's|gcc|${CC}|' -e 's|g++|${CXX}|' ${WRKSRC}/../lightcrafts/mk/platform.mk Modified: head/graphics/lightzone/distinfo ============================================================================== --- head/graphics/lightzone/distinfo Wed Jul 3 10:29:30 2019 (r505743) +++ head/graphics/lightzone/distinfo Wed Jul 3 10:44:40 2019 (r505744) @@ -1,3 +1,5 @@ -TIMESTAMP = 1523730077 +TIMESTAMP = 1562142983 SHA256 (lightzone/ktgw0316-LightZone-4.1.8-3-g36e87773_GH0.tar.gz) = 44b2683d96672715b137c41690a54b29e8f63bd6e66b8b66989c17ea3baa976a SIZE (lightzone/ktgw0316-LightZone-4.1.8-3-g36e87773_GH0.tar.gz) = 20302044 +SHA256 (lightzone/376ec67ddfb1.patch) = 90316fbdf08c0bc22bdd1e626343a33e06b9f3a641e7b103572e2c0e9896011e +SIZE (lightzone/376ec67ddfb1.patch) = 86993