up to 9.0.4.12

[packages/openjdk9.git] / system-libpng.patch

diff --git a/system-libpng.patch b/system-libpng.patch
deleted file mode 100644 (file)
index e8259b4..0000000
--- a/system-libpng.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff -durN -x '*.orig' jdk8u-jdk8u66-b02.orig/common/autoconf/libraries.m4 jdk8u-jdk8u66-b02/common/autoconf/libraries.m4
---- jdk8u-jdk8u66-b02.orig/common/autoconf/libraries.m4        2015-09-18 13:13:58.000000000 +0200
-+++ jdk8u-jdk8u66-b02/common/autoconf/libraries.m4     2015-09-18 13:16:52.000000000 +0200
-@@ -666,6 +666,47 @@
- 
-   ###############################################################################
-   #
-+  # 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 -durN -x '*.orig' jdk8u-jdk8u66-b02.orig/common/autoconf/spec.gmk.in jdk8u-jdk8u66-b02/common/autoconf/spec.gmk.in
---- jdk8u-jdk8u66-b02.orig/common/autoconf/spec.gmk.in 2015-07-17 09:35:23.000000000 +0200
-+++ jdk8u-jdk8u66-b02/common/autoconf/spec.gmk.in      2015-09-18 13:16:52.000000000 +0200
-@@ -563,6 +563,7 @@
- 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 -durN -x '*.orig' jdk8u-jdk8u66-b02.orig/jdk/make/lib/Awt2dLibraries.gmk jdk8u-jdk8u66-b02/jdk/make/lib/Awt2dLibraries.gmk
---- jdk8u-jdk8u66-b02.orig/jdk/make/lib/Awt2dLibraries.gmk     2015-09-18 13:13:58.000000000 +0200
-+++ jdk8u-jdk8u66-b02/jdk/make/lib/Awt2dLibraries.gmk  2015-09-18 13:16:52.000000000 +0200
-@@ -1204,7 +1204,6 @@
- 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)
-@@ -1221,6 +1220,13 @@
-     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/image/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
-@@ -1282,12 +1288,12 @@
-       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 -durN -x '*.orig' jdk8u-jdk8u66-b02.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c jdk8u-jdk8u66-b02/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c
---- jdk8u-jdk8u66-b02.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c        2015-07-23 16:17:35.000000000 +0200
-+++ jdk8u-jdk8u66-b02/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c     2015-09-18 13:16:52.000000000 +0200
-@@ -25,8 +25,7 @@
- 
- #include "splashscreen_impl.h"
- 
--#include "../libpng/png.h"
--
-+#include <png.h>
- #include <setjmp.h>
- 
- #define SIG_BYTES 8