Works for me. Include build-dev on the review.
And splashscreen is considered an AWT feature so it should be awt-dev
not 2d-dev
although you may want to reference back to this earlier exchange.
-phil.
On 8/7/18, 8:04 AM, Baesken, Matthias wrote:
Hello, should I prepare a change setting the -DPNG_POWERPC_VSX=0
flag in the makefile (see below) ?
Might make future libpng updates more simple .
Best regards, Matthias
*From:*Baesken, Matthias
*Sent:* Donnerstag, 2. August 2018 17:28
*To:* 'Phil Race' <[email protected]>; Doerr, Martin
<[email protected]>
*Cc:* Simonis, Volker <[email protected]>; Lindenmaier, Goetz
<[email protected]>
*Subject:* RE: RFR 8195615 : libsplashscreen linux ppc64le build error
after libpng update - was : RE: jdk-hs ppc64le build error, probably
related to libpng update
Hi Phil, I added -DPNG_POWERPC_VSX=0 to Awt2dLibraries.gmk for
the sphlashscreen library build, and removed (uncommented) the
workaround in pngpriv.h .
Build on the head of jdk11 was fine on my linux ppc64le test
machine .
Best regards, Matthias
Diff:
/open_jdk/jdk11> hg diff
diff -r 26cca23c165a make/lib/Awt2dLibraries.gmk
--- a/make/lib/Awt2dLibraries.gmk Thu Aug 02 09:49:04 2018 +0200
+++ b/make/lib/Awt2dLibraries.gmk Thu Aug 02 16:50:09 2018 +0200
@@ -794,7 +794,8 @@
LIBSPLASHSCREEN_EXCLUDE_SRC_PATTERNS := unix
endif
- LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE
-DPNG_ARM_NEON_OPT=0
+ # disable ppc64 opts
+ LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE
-DPNG_ARM_NEON_OPT=0 -DPNG_POWERPC_VSX=0
ifeq ($(OPENJDK_TARGET_OS), macosx)
LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX
diff -r 26cca23c165a
src/java.desktop/share/native/libsplashscreen/libpng/pngpriv.h
---
a/src/java.desktop/share/native/libsplashscreen/libpng/pngpriv.h
Thu Aug 02 09:49:04 2018 +0200
+++
b/src/java.desktop/share/native/libsplashscreen/libpng/pngpriv.h
Thu Aug 02 16:50:09 2018 +0200
@@ -290,12 +290,12 @@
# endif
#endif /* PNG_MIPS_MSA_OPT > 0 */
-#ifdef PNG_POWERPC_VSX_API_SUPPORTED
+/* #ifdef PNG_POWERPC_VSX_API_SUPPORTED */
#if PNG_POWERPC_VSX_OPT > 0
# define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_vsx
# define PNG_POWERPC_VSX_IMPLEMENTATION 1
#endif
-#endif
+/* #endif */
