1 # DP: taken from http://icedtea.classpath.org/wiki/IcedTea_Patches_for_OpenJDK_8
3 --- a/common/autoconf/libraries.m4
4 +++ b/common/autoconf/libraries.m4
5 @@ -845,6 +845,46 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS],
7 ###############################################################################
9 + # Check for the lcms2 library
12 + AC_ARG_WITH(lcms, [AS_HELP_STRING([--with-lcms],
13 + [use lcms2 from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
15 + AC_CHECK_LIB(lcms2, cmsOpenProfileFromFile,
19 + AC_MSG_CHECKING([for which lcms to use])
21 + DEFAULT_LCMS=bundled
24 + # If user didn't specify, use DEFAULT_LCMS
26 + if test "x${with_lcms}" = "x"; then
27 + with_lcms=${DEFAULT_LCMS}
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])
38 + AC_MSG_RESULT([system not found])
39 + AC_MSG_ERROR([--with-lcms=system specified, but no lcms found!])
42 + AC_MSG_ERROR([Invalid value for --with-lcms: ${with_lcms}, use 'system' or 'bundled'])
45 + AC_SUBST(USE_EXTERNAL_LCMS)
47 + ###############################################################################
49 # Check for the png library
52 --- a/jdk/make/lib/Awt2dLibraries.gmk
53 +++ b/jdk/make/lib/Awt2dLibraries.gmk
54 @@ -666,8 +666,8 @@ ifeq ($(TOOLCHAIN_TYPE), clang)
57 # TODO: Update awt lib path when awt is converted
58 -$(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \
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, \
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)))
83 -BUILD_LIBRARIES += $(BUILD_LIBLCMS)
84 +BUILD_LIBRARIES += $(BUILD_LIBJAVALCMS)
86 -$(BUILD_LIBLCMS): $(BUILD_LIBAWT)
87 +$(BUILD_LIBJAVALCMS): $(BUILD_LIBAWT)
89 ##########################################################################################
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 {
96 System.loadLibrary("awt");
97 - System.loadLibrary("lcms");
98 + System.loadLibrary("javalcms");