Merge pull request #3102 from pullmoll/lightzone

New package: lightzone-4.1.4

srcpkgs/javahelp2/patches/fix-build_xml.patch

@@ -0,0 +1,11 @@
+--- javahelp_nbproject/build.xml	2009-11-23 13:51:06.000000000 +0100
++++ javahelp_nbproject/build.xml	2015-12-02 18:22:39.236728900 +0100
+@@ -45,7 +45,7 @@
+     <available property="jdic-zip-present" file="${jdic-zip}"/>
+     
+     <target name="-pre-init" 
+-        depends="unpack-servlet-jar,unpack-jsp-jar,unpack-jdic-jar"/>
++        depends="unpack-servlet-jar,unpack-jsp-jar"/>
+         
+     <target name="release" description="Build the full JavaHelp JARs" 
+             depends="build-jsearch-jars,copy-jsearch-jars,create-javahelp-jars"/>

srcpkgs/javahelp2/template

@@ -0,0 +1,37 @@
+# Template file for 'javahelp2'
+pkgname=javahelp2
+version=2.0.05
+revision=1
+_svnver=svn63
+wrksrc=${pkgname}-${version}_${_svnver}
+noarch=yes
+short_desc="Java based help system"
+hostmakedepends="openjdk apache-ant unzip"
+maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+license="GPL-3"
+homepage="https://javahelp.java.net/"
+distfiles="http://ftp.mirrorservice.org/sites/distfiles.gentoo.org/distfiles/${pkgname}-src-${version}_${_svnver}.zip"
+checksum=a864ac71701ed8d12ba192460cd7b4d51e78813f39a140ede5d9b04afd9eae92
+
+do_install() {
+	local _javahelp=usr/share/java/javahelp
+
+	# Remove class uncompilable without JDIC
+	rm -v jhMaster/JavaHelp/src/new/javax/help/plaf/basic/BasicNativeContentViewerUI.java
+
+	# Build jars
+	cd javahelp_nbproject
+	ant release
+
+	vmkdir usr/bin
+
+	for f in jhindexer jhsearch; do
+		vinstall dist/bin/${f}.jar 644 ${_javahelp}
+		sed dist/bin/${f} -e "s;opt/javahelp;${_javahelp};g" > ${f}
+		vbin ${f}
+	done
+
+	for f in dist/lib/*.jar; do
+		vinstall $f 644 ${_javahelp}
+	done
+}

srcpkgs/lightzone/patches/fix-openmp.patch

@@ -0,0 +1,79 @@
+--- 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
++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

srcpkgs/lightzone/template

@@ -0,0 +1,48 @@
+# Template file for 'lightzone'
+pkgname=lightzone
+version=4.1.4
+revision=1
+wrksrc=LightZone-${version}
+hostmakedepends="automake git openjdk apache-ant javahelp2 rsync pkg-config"
+makedepends="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=ea4421ab471664276ea2d0dcfa9c323ffd52053139cf09188f59bcfccaad6fad
+# Cross building dcraw_lz is not supported
+nocross=yes
+replaces="lightzone-bin>=0"
+
+do_build() {
+	export JAVA_HOME=/usr/lib/jvm/openjdk
+	cd linux
+	ant jar
+}
+
+do_install() {
+	vbin linux/products/lightzone
+
+	vmkdir usr/share
+	cp -pHR linux/icons ${DESTDIR}/usr/share
+	vinstall linux/products/lightzone.desktop 644 usr/share/applications
+
+	# Install shared libraries
+	for f in linux/products/*.so; do
+		vinstall $f 755 usr/lib/lightzone
+	done
+
+	# Install helpers
+	for f in LightZone-forkd dcraw_lz; do
+		vinstall linux/products/$f 755 usr/lib/lightzone
+	done
+
+	# Install jars
+	for f in linux/products/*.jar; do
+		vinstall $f 644 usr/share/java/lightzone
+	done
+
+	vlicense COPYING
+}