system-lcms.patch

   1 # DP: taken from http://icedtea.classpath.org/wiki/IcedTea_Patches_for_OpenJDK_8
   2
   3 --- a/common/autoconf/libraries.m4
   4 +++ b/common/autoconf/libraries.m4
   5 @@ -845,6 +845,46 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS],
   6
   7    ###############################################################################
   8    #
   9 +  # Check for the lcms2 library
  10 +  #
  11 +
  12 +  AC_ARG_WITH(lcms, [AS_HELP_STRING([--with-lcms],
  13 +       [use lcms2 from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
  14 +
  15 +  AC_CHECK_LIB(lcms2, cmsOpenProfileFromFile,
  16 +               [ LCMS_FOUND=yes ],
  17 +               [ LCMS_FOUND=no ])
  18 +
  19 +  AC_MSG_CHECKING([for which lcms to use])
  20 +
  21 +  DEFAULT_LCMS=bundled
  22 +
  23 +  #
  24 +  # If user didn't specify, use DEFAULT_LCMS
  25 +  #
  26 +  if test "x${with_lcms}" = "x"; then
  27 +      with_lcms=${DEFAULT_LCMS}
  28 +  fi
  29 +
  30 +  if test "x${with_lcms}" = "xbundled"; then
  31 +      USE_EXTERNAL_LCMS=false
  32 +      AC_MSG_RESULT([bundled])
  33 +  elif test "x${with_lcms}" = "xsystem"; then
  34 +      if test "x${LCMS_FOUND}" = "xyes"; then
  35 +          USE_EXTERNAL_LCMS=true
  36 +          AC_MSG_RESULT([system])
  37 +      else
  38 +          AC_MSG_RESULT([system not found])
  39 +          AC_MSG_ERROR([--with-lcms=system specified, but no lcms found!])
  40 +      fi
  41 +  else
  42 +      AC_MSG_ERROR([Invalid value for --with-lcms: ${with_lcms}, use 'system' or 'bundled'])
  43 +  fi
  44 +
  45 +  AC_SUBST(USE_EXTERNAL_LCMS)
  46 +
  47 +  ###############################################################################
  48 +  #
  49    # Check for the png library
  50    #
  51
  52 --- a/jdk/make/lib/Awt2dLibraries.gmk
  53 +++ b/jdk/make/lib/Awt2dLibraries.gmk
  54 @@ -666,8 +666,8 @@ ifeq ($(TOOLCHAIN_TYPE), clang)
  55  endif
  56
  57  # TODO: Update awt lib path when awt is converted
  58 -$(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \
  59 -    LIBRARY := lcms, \
  60 +$(eval $(call SetupNativeCompilation,BUILD_LIBJAVALCMS, \
  61 +    LIBRARY := javalcms, \
  62      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
  63      SRC := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms, \
  64      LANG := C, \
  65 @@ -686,19 +686,19 @@ $(eval $(call SetupNativeCompilation,BUI
  66      LDFLAGS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \
  67      LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc, \
  68      LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm, \
  69 -    LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm, \
  70 +    LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm -llcms2, \
  71      LDFLAGS_SUFFIX_aix := -lm -lawt -ljava -ljvm,\
  72      VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
  73      RC_FLAGS := $(RC_FLAGS) \
  74 -        -D "JDK_FNAME=lcms.dll" \
  75 -        -D "JDK_INTERNAL_NAME=lcms" \
  76 +        -D "JDK_FNAME=javalcms.dll" \
  77 +        -D "JDK_INTERNAL_NAME=javalcms" \
  78          -D "JDK_FTYPE=0x2L", \
  79 -    OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/liblcms, \
  80 +    OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjavalcms, \
  81      DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
  82
  83 -BUILD_LIBRARIES += $(BUILD_LIBLCMS)
  84 +BUILD_LIBRARIES += $(BUILD_LIBJAVALCMS)
  85
  86 -$(BUILD_LIBLCMS): $(BUILD_LIBAWT)
  87 +$(BUILD_LIBJAVALCMS): $(BUILD_LIBAWT)
  88
  89  ##########################################################################################
  90
  91 --- a/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java
  92 +++ b/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java
  93 @@ -207,7 +207,7 @@ public class LCMS implements PCMM {
  94                           * disposer frameworks
  95                           */
  96                          System.loadLibrary("awt");
  97 -                        System.loadLibrary("lcms");
  98 +                        System.loadLibrary("javalcms");
  99                          return null;
 100                      }
 101                  });