From 8baab61fd6102a1817231ee9ef2e20f1be5016da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 2 Jul 2016 03:28:57 +0200
Subject: [PATCH] lightzone: update to 4.1.6

---
 srcpkgs/lightzone/patches/fix-openmp.patch | 79 ----------------------
 srcpkgs/lightzone/template                 |  8 ++-
 2 files changed, 5 insertions(+), 82 deletions(-)
 delete mode 100644 srcpkgs/lightzone/patches/fix-openmp.patch

diff --git a/srcpkgs/lightzone/patches/fix-openmp.patch b/srcpkgs/lightzone/patches/fix-openmp.patch
deleted file mode 100644
index a3710063eaa..00000000000
--- a/srcpkgs/lightzone/patches/fix-openmp.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- lightcrafts/coprocesses/dcraw/GNUmakefile	2015-11-22 15:22:44.000000000 +0100
-+++ lightcrafts/coprocesses/dcraw/GNUmakefile	2015-12-02 17:39:48.316543552 +0100
-@@ -6,7 +6,7 @@
- # Uncomment to compile in debug mode.
- #DEBUG:=		true
- 
--EXEC_EXTRA_CFLAGS:=	-fopenmp -Wno-unused-result
-+EXEC_EXTRA_CFLAGS:=
- EXEC_WINDOWS_CFLAGS:=	-static
- EXEC_EXTRA_DEFINES:=	-DNODEPS -DLIGHTZONE
- EXEC_LINUX_DEFINES:=	-Dfgetc=getc_unlocked
---- lightcrafts/coprocesses/dcraw/dcraw_lz.c	2015-11-22 15:22:44.000000000 +0100
-+++ lightcrafts/coprocesses/dcraw/dcraw_lz.c	2015-12-02 17:48:03.900579281 +0100
-@@ -101,7 +101,6 @@
- #endif
- 
- #ifdef _OPENMP
--#include <omp.h>
- #define uf_omp_get_thread_num() omp_get_thread_num()
- #define uf_omp_get_num_threads() omp_get_num_threads()
- #else
-@@ -4795,7 +4794,7 @@
- #if defined(_STATIC_BUFFER)
-    static char buffer [TS*TS*(8*11+6)] __attribute__((aligned(64)));
- #else
--   char *buffer;
-+   char *buffer = NULL;
- #endif
- 
-   if (verbose)
-@@ -4828,9 +4827,13 @@
-   {
-   cielab3 (0,0);
-   border_interpolate(6);
-+#if ! defined(_FIXED_NDIR)
-   ndir = 4 << (passes > 1);
-+#endif
-+#if ! defined(_STATIC_BUFFER)
-   buffer = (char *) malloc (TS*TS*(ndir*11+6));
-   merror (buffer, "xtrans_interpolate()");
-+#endif
-   rgb  = (ushort(*)[TS][TS][3]) buffer;
-   lab  = (short (*)    [TS][3])(buffer + TS*TS*(ndir*6));
-   drv  = (float (*)[TS][TS])   (buffer + TS*TS*(ndir*6+6));
-@@ -4885,8 +4888,10 @@
- #endif
- 
- #if ! defined(_STATIC_BUFFER)
--  buffer = (char *) malloc (TS*TS*(ndir*11+6));
--  merror (buffer, "xtrans_interpolate()");
-+  if (buffer == NULL) {
-+    buffer = (char *) malloc (TS*TS*(ndir*11+6));
-+    merror (buffer, "xtrans_interpolate()");
-+  }
- #endif
- 
-   rgb  = (ushort(*)[TS][TS][3]) buffer;
---- lightcrafts/jnisrc/dcraw/dcrawUtils.cpp	2015-11-22 15:22:44.000000000 +0100
-+++ lightcrafts/jnisrc/dcraw/dcrawUtils.cpp	2015-12-02 17:54:53.663608822 +0100
-@@ -13,7 +13,6 @@
-         name4(Java_,com_lightcrafts_utils_DCRaw,_,method)
- 
--#include<limits.h>
-+#include <limits.h>
--#include<omp.h>
- 
- JNIEXPORT void JNICALL DCRaw_METHOD(interpolateGreen)
- ( JNIEnv *env, jclass cls,
---- lightcrafts/jnisrc/dcraw/GNUmakefile	2015-11-22 15:22:44.000000000 +0100
-+++ lightcrafts/jnisrc/dcrawGNUmakefile	2015-12-02 17:58:22.962623911 +0100
-@@ -13,7 +13,7 @@
-   JNI_EXTRA_LINK:=      -lstdc++
- endif
- 
--JNI_EXTRA_CFLAGS+=	-fopenmp
-+#JNI_EXTRA_CFLAGS+=	-fopenmp
- 
- JNI_EXTRA_DEFINES:=	-DNO_JPEG -DNO_LCMS
- JNI_LINUX_DEFINES:=	-Dfgetc=getc_unlocked
diff --git a/srcpkgs/lightzone/template b/srcpkgs/lightzone/template
index 2fcf35c5e01..e9e36839286 100644
--- a/srcpkgs/lightzone/template
+++ b/srcpkgs/lightzone/template
@@ -1,19 +1,21 @@
 # Template file for 'lightzone'
 pkgname=lightzone
-version=4.1.5
+version=4.1.6
 revision=1
 wrksrc=LightZone-${version}
 hostmakedepends="automake git openjdk apache-ant javahelp2 rsync pkg-config"
-makedepends="lcms2-devel libX11-devel"
+makedepends="libgomp-devel lcms2-devel libX11-devel"
 depends="virtual?java-runtime javahelp2 liblzma tiff"
 short_desc="Professional-level digital darkroom and photo editor"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="3-clause-BSD"
 homepage="http://www.lightzoneproject.org/"
 distfiles="https://github.com/Aries85/LightZone/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=6f8203790070329c67eee89171349d48e332aaa3dfd8f87a55ccc4323bddc2d6
+checksum=7f22edc9b9dbb3e048f3eeb57b2a6df5407fda338a9906d735caacd67cce9e20
 # Cross building dcraw_lz is not supported
 nocross=yes
+# JNI binaries are not PIE
+nopie=yes
 replaces="lightzone-bin>=0"
 
 do_build() {