On 8/22/19 9:14 AM, Andrew John Hughes wrote:
On 12/08/2019 16:12, Zhengyu Gu wrote:
Hi,

I would like to backport this CR to 8u, as it is on Oracle 8u backport
list.

The changeset from jdk13
(https://hg.openjdk.java.net/jdk/jdk13/rev/53154e45385a) did not apply
cleanly.

1) No libpng.md in 8u, so ignore all diffs for libpng.md
2) -DPNG_ARM_NEON_OP and DPNG_ARM_NEON_IMPLEMENTATION in
Awt2dLibraries.gmk, are arm only flags, but we decided to include them
in this backport, given upstreaming aarch64 in progress and they are
harmless to other platforms.

Bug: https://bugs.openjdk.java.net/browse/JDK-8217676
JDK13 webrev: http://cr.openjdk.java.net/~serb/8217676/webrev.01/
JDK13 code review thread:
http://mail.openjdk.java.net/pipermail/awt-dev/2019-July/015331.html

8u Webrev: http://cr.openjdk.java.net/~zgu/JDK-8217676-8u/webrev.00/

Test:
   jdk_imageio on Linux 86_64

Thanks,

-Zhengyu

The changes to libpng.md should not simply be discarded. The same
license information exists in 8u in the THIRD_PARTY_README file found in
all repos.

Updated webrev:

root: http://cr.openjdk.java.net/~zgu/JDK-8217676-8u/root/webrev.00/
corba: http://cr.openjdk.java.net/~zgu/JDK-8217676-8u/corba/webrev.00
hotspot: http://cr.openjdk.java.net/~zgu/JDK-8217676-8u/hotspot/webrev.00
jaxp: http://cr.openjdk.java.net/~zgu/JDK-8217676-8u/jaxp/webrev.00
jaxws: http://cr.openjdk.java.net/~zgu/JDK-8217676-8u/jaxws/webrev.00/
jdk: http://cr.openjdk.java.net/~zgu/JDK-8217676-8u/jdk/webrev.00/
langtools: http://cr.openjdk.java.net/~zgu/JDK-8217676-8u/langtools/webrev.00/
nashorn: http://cr.openjdk.java.net/~zgu/JDK-8217676-8u/nashorn/webrev.00/

Thanks,

-Zhengyu



I'd say use previous libpng updates as a template, but they all seem to
have made the same mistake of missing this, resulting in bugs like
JDK-8210431 [0].

Instead, look at the JDK-8220495 giflib update backport from the last
update [1]:

Checking .
changeset:   2386:7854afda0cd9
user:        serb
date:        Sun Mar 31 16:57:21 2019 -0700
summary:     8220495: Update GIFlib library to the 5.1.8

Checking corba
changeset:   1887:37bfb5bd2e68
user:        serb
date:        Sun Mar 31 16:57:21 2019 -0700
summary:     8220495: Update GIFlib library to the 5.1.8

Checking jaxp
changeset:   1974:18619019e028
user:        serb
date:        Sun Mar 31 16:57:21 2019 -0700
summary:     8220495: Update GIFlib library to the 5.1.8

Checking jaxws
changeset:   1778:937fcb3b28d7
user:        serb
date:        Sun Mar 31 16:57:21 2019 -0700
summary:     8220495: Update GIFlib library to the 5.1.8

Checking langtools
changeset:   3787:585c9a1ce7eb
user:        serb
date:        Sun Mar 31 16:57:21 2019 -0700
summary:     8220495: Update GIFlib library to the 5.1.8

Checking hotspot
changeset:   8992:54e5e3c816d4
user:        serb
date:        Sun Mar 31 16:57:21 2019 -0700
summary:     8220495: Update GIFlib library to the 5.1.8

Checking jdk
changeset:   13557:5e4b7ed6e904
user:        serb
date:        Sun Mar 31 16:57:21 2019 -0700
summary:     8220495: Update GIFlib library to the 5.1.8

Checking nashorn
changeset:   2454:a526f3dd4be8
user:        serb
date:        Sun Mar 31 16:57:21 2019 -0700
summary:     8220495: Update GIFlib library to the 5.1.8

[0] https://hg.openjdk.java.net/jdk8u/jdk8u/rev/7d04f40e401d
[1] https://bugs.openjdk.java.net/browse/JDK-8220495

Thanks,

Reply via email to