1 files changed, 0 insertions, 148 deletions

diff --git a/recipes-core/openjdk/patches-openjdk-8/0004-jdk-Allow-using-a-system-installed-libpng.patch b/recipes-core/openjdk/patches-openjdk-8/0004-jdk-Allow-using-a-system-installed-libpng.patch
deleted file mode 100644
index 658ba32..0000000
--- a/recipes-core/openjdk/patches-openjdk-8/0004-jdk-Allow-using-a-system-installed-libpng.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From 549100e3e687d2c844eeebe22a7dcbf7ed50406e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
-Date: Tue, 27 Feb 2018 13:43:04 +0000
-Subject: [PATCH 4/9] jdk: Allow using a system-installed libpng
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Patch stolen (and some typos corrected) from debian patch,
-which itself was a backport from:
-  http://hg.openjdk.java.net/jdk9/jdk9/rev/bfc1c131e540
-  http://hg.openjdk.java.net/jdk9/jdk9/jdk/rev/5e503831b142
-
-Issues fixed on top of debian patch:
-  * the default when --with-libpng= is not given works
-  * using the bundled libpng works
-
-Upstream-Status: Backport
-Signed-off-by: André Draszik <andre.draszik@jci.com>
----
- common/autoconf/libraries.m4                       | 41 ++++++++++++++++++++++
- common/autoconf/spec.gmk.in                        |  1 +
- jdk/make/lib/Awt2dLibraries.gmk                    | 12 +++++--
- .../native/sun/awt/splashscreen/splashscreen_png.c |  3 +-
- 4 files changed, 52 insertions(+), 5 deletions(-)
-
-diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4
-index 3f5f69b1..e419a050 100644
---- a/common/autoconf/libraries.m4
-+++ b/common/autoconf/libraries.m4
-@@ -664,6 +664,47 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS],
-   fi
-   AC_SUBST(USE_EXTERNAL_LIBGIF)
- 
-+  ###############################################################################
-+  #
-+  # Check for the png library
-+  #
-+
-+  AC_ARG_WITH(libpng, [AS_HELP_STRING([--with-libpng],
-+     [use libpng from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
-+
-+  AC_CHECK_LIB(png, png_sig_cmp,
-+               [ LIBPNG_FOUND=yes ],
-+               [ LIBPNG_FOUND=no ])
-+
-+  AC_MSG_CHECKING([for which libpng to use])
-+
-+  # default is bundled
-+  DEFAULT_LIBPNG=bundled
-+
-+  #
-+  # if user didn't specify, use DEFAULT_LIBPNG
-+  #
-+  if test "x${with_libpng}" = "x"; then
-+      with_libpng=${DEFAULT_LIBPNG}
-+  fi
-+
-+
-+  if test "x${with_libpng}" = "xbundled"; then
-+      USE_EXTERNAL_LIBPNG=false
-+      AC_MSG_RESULT([bundled])
-+  elif test "x${with_libpng}" = "xsystem"; then
-+      if test "x${LIBPNG_FOUND}" = "xyes"; then
-+          USE_EXTERNAL_LIBPNG=true
-+          AC_MSG_RESULT([system])
-+      else
-+          AC_MSG_RESULT([system not found])
-+          AC_MSG_ERROR([--with-libpng=system specified, but no libpng found!])
-+      fi
-+  else
-+      AC_MSG_ERROR([Invalid value of --with-libpng: ${with_libpng}, use 'system' or 'bundled'])
-+  fi
-+  AC_SUBST(USE_EXTERNAL_LIBPNG)
-+
-   ###############################################################################
-   #
-   # Check for the zlib library
-diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in
-index 1c418f29..2c802c0a 100644
---- a/common/autoconf/spec.gmk.in
-+++ b/common/autoconf/spec.gmk.in
-@@ -567,6 +567,7 @@ endif
- ENABLE_JFR=@ENABLE_JFR@
- ENABLE_INTREE_EC=@ENABLE_INTREE_EC@
- USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@
-+USE_EXTERNAL_LIBPNG:=@USE_EXTERNAL_LIBPNG@
- USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@
- USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@
- LIBZIP_CAN_USE_MMAP:=@LIBZIP_CAN_USE_MMAP@
-diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk
-index 8872a8e8..c577951a 100644
---- a/jdk/make/lib/Awt2dLibraries.gmk
-+++ b/jdk/make/lib/Awt2dLibraries.gmk
-@@ -1219,7 +1219,6 @@ endif
- ifndef BUILD_HEADLESS_ONLY
-   LIBSPLASHSCREEN_DIRS := \
-     $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \
--    $(JDK_TOPDIR)/src/share/native/sun/awt/libpng \
-     $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen
- 
-   ifeq ($(USE_EXTERNAL_LIBGIF), true)
-@@ -1236,6 +1235,13 @@ ifndef BUILD_HEADLESS_ONLY
-     LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg
-   endif
- 
-+  ifeq ($(USE_EXTERNAL_LIBPNG), true)
-+    LIBPNG_LDFLAGS := -lpng
-+  else
-+    LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/libpng
-+    LIBPNG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/libpng
-+  endif
-+
-   ifneq ($(OPENJDK_TARGET_OS), macosx)
-     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
-   else
-@@ -1297,12 +1303,12 @@ ifndef BUILD_HEADLESS_ONLY
-       LANG := C, \
-       OPTIMIZATION := LOW, \
-       CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \
--                $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS), \
-+                $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(LIBPNG_CFLAGS), \
-       MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsplashscreen/mapfile-vers, \
-       LDFLAGS := $(LDFLAGS_JDKLIB) \
-           $(call SET_SHARED_LIBRARY_ORIGIN), \
-       LDFLAGS_SUFFIX := $(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) \
--                        $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS), \
-+                        $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS) $(LIBPNG_LDFLAGS), \
-       LDFLAGS_SUFFIX_solaris := -lc, \
-       VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
-       RC_FLAGS := $(RC_FLAGS) \
-diff --git a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c
-index 3599433e..5bf002ea 100644
---- a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c
-+++ b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c
-@@ -25,8 +25,7 @@
- 
- #include "splashscreen_impl.h"
- 
--#include "../libpng/png.h"
--
-+#include <png.h>
- #include <setjmp.h>
- 
- #define SIG_BYTES 8
--- 
-2.16.2
-