lightzone: fix openjdk dependency, path and ppc build

This commit is contained in:
q66 2019-11-25 23:05:00 +01:00 committed by John Zimmermann
parent 64f4e580ac
commit 9d7a444128
2 changed files with 24 additions and 2 deletions

View file

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

View file

@ -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
}