From 9d7a444128c7cccdc56f06a2f82782f6e0db901e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 25 Nov 2019 23:05:00 +0100
Subject: [PATCH] lightzone: fix openjdk dependency, path and ppc build

---
 srcpkgs/lightzone/patches/ppc.patch | 22 ++++++++++++++++++++++
 srcpkgs/lightzone/template          |  4 ++--
 2 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/lightzone/patches/ppc.patch

diff --git a/srcpkgs/lightzone/patches/ppc.patch b/srcpkgs/lightzone/patches/ppc.patch
new file mode 100644
index 00000000000..b5ab841d692
--- /dev/null
+++ b/srcpkgs/lightzone/patches/ppc.patch
@@ -0,0 +1,22 @@
+Fixes bad macro checks, breaking altivec build.
+
+--- lightcrafts/jnisrc/jai/bilateralFilter_sse.c
++++ lightcrafts/jnisrc/jai/bilateralFilter_sse.c
+@@ -188,7 +188,7 @@ static inline void reset_denormals(csr_context oldMXCSR) {
+ 
+ #endif // defined(__i386__) || defined(__x86_64__)
+ 
+-#if defined(__ppc__) || defined(__ppc64__)
++#if defined(__powerpc__) || defined(__powerpc64__)
+ #include <altivec.h>
+ 
+ static inline vFloat loadUnalignedFloat( float *target )
+@@ -253,7 +253,7 @@ static void reset_denormals( csr_context oldJavaMode ) {
+     vec_mtvscr ( oldJavaMode );
+ }
+ 
+-#endif // defined(__ppc__) || defined(__ppc64__)
++#endif // defined(__powerpc__) || defined(__powerpc64__)
+ #endif // defined(__SSE2__) || defined (__VEC__)
+ 
+ #if USE_VECTOR
diff --git a/srcpkgs/lightzone/template b/srcpkgs/lightzone/template
index b1ae0abe33a..f319311126b 100644
--- a/srcpkgs/lightzone/template
+++ b/srcpkgs/lightzone/template
@@ -3,7 +3,7 @@ pkgname=lightzone
 version=4.1.9
 revision=1
 wrksrc=LightZone-${version}
-hostmakedepends="automake git openjdk apache-ant javahelp2 rsync pkg-config"
+hostmakedepends="automake git openjdk8 apache-ant javahelp2 rsync pkg-config"
 makedepends="libgomp-devel lcms2-devel libX11-devel"
 depends="virtual?java-runtime javahelp2 liblzma tiff"
 short_desc="Professional-level digital darkroom and photo editor"
@@ -18,7 +18,7 @@ nopie=yes
 replaces="lightzone-bin>=0"
 
 do_build() {
-	export JAVA_HOME=/usr/lib/jvm/openjdk
+	export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
 	cd linux
 	ant jar
 }