svn commit: r505744 - head/graphics/lightzone

[Tobias Kortkamp]

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 at 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