system-libpng.patch

   1 diff -durN -x '*.orig' jdk8u-jdk8u66-b02.orig/common/autoconf/libraries.m4 jdk8u-jdk8u66-b02/common/autoconf/libraries.m4
   2 --- jdk8u-jdk8u66-b02.orig/common/autoconf/libraries.m4 2015-09-18 13:13:58.000000000 +0200
   3 +++ jdk8u-jdk8u66-b02/common/autoconf/libraries.m4      2015-09-18 13:16:52.000000000 +0200
   4 @@ -666,6 +666,47 @@
   5
   6    ###############################################################################
   7    #
   8 +  # Check for the png library
   9 +  #
  10 +
  11 +  AC_ARG_WITH(libpng, [AS_HELP_STRING([--with-libpng],
  12 +     [use libpng from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
  13 +
  14 +  AC_CHECK_LIB(png, png_sig_cmp,
  15 +               [ LIBPNG_FOUND=yes ],
  16 +               [ LIBPNG_FOUND=no ])
  17 +
  18 +  AC_MSG_CHECKING([for which libpng to use])
  19 +
  20 +  # default is bundled
  21 +  DEFAULT_LIBPNG=bundled
  22 +
  23 +  #
  24 +  # if user didn't specify, use DEFAULT_LIBPNG
  25 +  #
  26 +  if test "x${with_libpng}" = "x"; then
  27 +      with_libpng=${DEFAULT_libpng}
  28 +  fi
  29 +
  30 +
  31 +  if test "x${with_libpng}" = "xbundled"; then
  32 +      USE_EXTERNAL_LIBPNG=false
  33 +      AC_MSG_RESULT([bundled])
  34 +  elif test "x${with_libpng}" = "xsystem"; then
  35 +      if test "x${LIBPNG_FOUND}" = "xyes"; then
  36 +          USE_EXTERNAL_LIBPNG=true
  37 +          AC_MSG_RESULT([system])
  38 +      else
  39 +          AC_MSG_RESULT([system not found])
  40 +          AC_MSG_ERROR([--with-libpng=system specified, but no libpng found!])
  41 +      fi
  42 +  else
  43 +      AC_MSG_ERROR([Invalid value of --with-libpng: ${with_libpng}, use 'system' or 'bundled'])
  44 +  fi
  45 +  AC_SUBST(USE_EXTERNAL_LIBPNG)
  46 +
  47 +  ###############################################################################
  48 +  #
  49    # Check for the zlib library
  50    #
  51
  52 diff -durN -x '*.orig' jdk8u-jdk8u66-b02.orig/common/autoconf/spec.gmk.in jdk8u-jdk8u66-b02/common/autoconf/spec.gmk.in
  53 --- jdk8u-jdk8u66-b02.orig/common/autoconf/spec.gmk.in  2015-07-17 09:35:23.000000000 +0200
  54 +++ jdk8u-jdk8u66-b02/common/autoconf/spec.gmk.in       2015-09-18 13:16:52.000000000 +0200
  55 @@ -563,6 +563,7 @@
  56  ENABLE_JFR=@ENABLE_JFR@
  57  ENABLE_INTREE_EC=@ENABLE_INTREE_EC@
  58  USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@
  59 +USE_EXTERNAL_LIBPNG:=@USE_EXTERNAL_LIBPNG@
  60  USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@
  61  USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@
  62  LIBZIP_CAN_USE_MMAP:=@LIBZIP_CAN_USE_MMAP@
  63 diff -durN -x '*.orig' jdk8u-jdk8u66-b02.orig/jdk/make/lib/Awt2dLibraries.gmk jdk8u-jdk8u66-b02/jdk/make/lib/Awt2dLibraries.gmk
  64 --- jdk8u-jdk8u66-b02.orig/jdk/make/lib/Awt2dLibraries.gmk      2015-09-18 13:13:58.000000000 +0200
  65 +++ jdk8u-jdk8u66-b02/jdk/make/lib/Awt2dLibraries.gmk   2015-09-18 13:16:52.000000000 +0200
  66 @@ -1204,7 +1204,6 @@
  67  ifndef BUILD_HEADLESS_ONLY
  68    LIBSPLASHSCREEN_DIRS := \
  69      $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \
  70 -    $(JDK_TOPDIR)/src/share/native/sun/awt/libpng \
  71      $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen
  72
  73    ifeq ($(USE_EXTERNAL_LIBGIF), true)
  74 @@ -1221,6 +1220,13 @@
  75      LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg
  76    endif
  77
  78 +  ifeq ($(USE_EXTERNAL_LIBPNG), true)
  79 +    LIBPNG_LDFLAGS := -lpng
  80 +  else
  81 +    LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/image/libpng
  82 +    LIBPNG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/libpng
  83 +  endif
  84 +
  85    ifneq ($(OPENJDK_TARGET_OS), macosx)
  86      LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
  87    else
  88 @@ -1282,12 +1288,12 @@
  89        LANG := C, \
  90        OPTIMIZATION := LOW, \
  91        CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \
  92 -                $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS), \
  93 +                $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(LIBPNG_CFLAGS), \
  94        MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsplashscreen/mapfile-vers, \
  95        LDFLAGS := $(LDFLAGS_JDKLIB) \
  96            $(call SET_SHARED_LIBRARY_ORIGIN), \
  97        LDFLAGS_SUFFIX := $(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) \
  98 -                        $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS), \
  99 +                        $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS) $(LIBPNG_LDFLAGS), \
 100        LDFLAGS_SUFFIX_solaris := -lc, \
 101        VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
 102        RC_FLAGS := $(RC_FLAGS) \
 103 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
 104 --- jdk8u-jdk8u66-b02.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2015-07-23 16:17:35.000000000 +0200
 105 +++ jdk8u-jdk8u66-b02/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c      2015-09-18 13:16:52.000000000 +0200
 106 @@ -25,8 +25,7 @@
 107
 108  #include "splashscreen_impl.h"
 109
 110 -#include "../libpng/png.h"
 111 -
 112 +#include <png.h>
 113  #include <setjmp.h>
 114
 115  #define SIG_BYTES 8