rpms/java-1.8.0-openjdk
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to jdk8-b115

Browse Source
This commit is contained in:
Omair Majid 2013-11-14 22:45:09 -05:00
parent f2b10f1445
commit 582db12172
4 changed files with 332 additions and 279 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
java-1.8.0-openjdk.spec
View File

@ -1,7 +1,7 @@
# If debug is 1, OpenJDK is built with all debug info present. # If debug is 1, OpenJDK is built with all debug info present.
%global debug 0 %global debug 0
%global jdk8_version b106 %global jdk8_version b115
%global hg_tag jdk8-%{jdk8_version} %global hg_tag jdk8-%{jdk8_version}
%global aarch64_hg_tag preview_rc2 %global aarch64_hg_tag preview_rc2
@ -125,7 +125,7 @@
Name: java-%{javaver}-%{origin} Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{buildver} Version: %{javaver}.%{buildver}
Release: 0.21.%{jdk8_version}%{?dist} Release: 0.22.%{jdk8_version}%{?dist}
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons, # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
# and this change was brought into RHEL-4. java-1.5.0-ibm packages # and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a # also included the epoch in their virtual provides. This created a
@ -837,9 +837,7 @@ exit 0
%{_jvmdir}/%{jredir}/lib/security/cacerts %{_jvmdir}/%{jredir}/lib/security/cacerts
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.policy %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.policy
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security
%ifarch %{aarch64}
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/blacklisted.certs %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/blacklisted.certs
%endif
%{_datadir}/icons/hicolor/*x*/apps/java-%{javaver}.png %{_datadir}/icons/hicolor/*x*/apps/java-%{javaver}.png
%{_mandir}/man1/java-%{name}.1* %{_mandir}/man1/java-%{name}.1*
%{_mandir}/man1/keytool-%{name}.1* %{_mandir}/man1/keytool-%{name}.1*
@ -924,6 +922,9 @@ exit 0
%doc %{buildoutputdir}/images/j2sdk-image/jre/LICENSE %doc %{buildoutputdir}/images/j2sdk-image/jre/LICENSE
%changelog %changelog
* Tue Nov 14 2013 Omair Majid <omajid@redhat.com - 1:1.8.0.0-0.22.b115
- Update to jdk8-b115
* Wed Oct 30 2013 Jiri Vanek <jvanek@redhat.com - 1:1.8.0.0-0.21.b106 * Wed Oct 30 2013 Jiri Vanek <jvanek@redhat.com - 1:1.8.0.0-0.21.b106
- added jre/lib/security/blacklisted.certs for aarch64 - added jre/lib/security/blacklisted.certs for aarch64
- updated to preview_rc2 aarch64 tarball - updated to preview_rc2 aarch64 tarball

112
system-lcms.patch
View File

@ -1,35 +1,35 @@
diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4 diff -ruN jdk8/common/autoconf/libraries.m4 jdk8/common/autoconf/libraries.m4
--- jdk8/common/autoconf/libraries.m4 --- jdk8/common/autoconf/libraries.m4 2013-11-14 22:04:38.039440136 -0500
+++ jdk8/common/autoconf/libraries.m4 +++ jdk8/common/autoconf/libraries.m4 2013-11-14 22:05:11.474356424 -0500
@@ -607,6 +607,46 @@ @@ -676,6 +676,46 @@
############################################################################### ###############################################################################
# #
+# Check for the lcms2 library + # Check for the lcms2 library
+# + #
+ +
+AC_ARG_WITH(lcms, [AS_HELP_STRING([--with-lcms], + AC_ARG_WITH(lcms, [AS_HELP_STRING([--with-lcms],
+ [use lcms2 from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])]) + [use lcms2 from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
+ +
+AC_CHECK_LIB(lcms2, cmsOpenProfileFromFile, + AC_CHECK_LIB(lcms2, cmsOpenProfileFromFile,
+ [ LCMS_FOUND=yes ], + [ LCMS_FOUND=yes ],
+ [ LCMS_FOUND=no ]) + [ LCMS_FOUND=no ])
+ +
+AC_MSG_CHECKING([for which lcms to use]) + AC_MSG_CHECKING([for which lcms to use])
+ +
+DEFAULT_LCMS=bundled + DEFAULT_LCMS=bundled
+ +
+# + #
+# If user didn't specify, use DEFAULT_LCMS + # If user didn't specify, use DEFAULT_LCMS
+# + #
+if test "x${with_lcms}" = "x"; then + if test "x${with_lcms}" = "x"; then
+ with_lcms=${DEFAULT_LCMS} + with_lcms=${DEFAULT_LCMS}
+fi + fi
+ +
+if test "x${with_lcms}" = "xbundled"; then + if test "x${with_lcms}" = "xbundled"; then
+ USE_EXTERNAL_LCMS=false + USE_EXTERNAL_LCMS=false
+ AC_MSG_RESULT([bundled]) + AC_MSG_RESULT([bundled])
+elif test "x${with_lcms}" = "xsystem"; then + elif test "x${with_lcms}" = "xsystem"; then
+ if test "x${LCMS_FOUND}" = "xyes"; then + if test "x${LCMS_FOUND}" = "xyes"; then
+ USE_EXTERNAL_LCMS=true + USE_EXTERNAL_LCMS=true
+ AC_MSG_RESULT([system]) + AC_MSG_RESULT([system])
@ -37,60 +37,60 @@ diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4
+ AC_MSG_RESULT([system not found]) + AC_MSG_RESULT([system not found])
+ AC_MSG_ERROR([--with-lcms=system specified, but no lcms found!]) + AC_MSG_ERROR([--with-lcms=system specified, but no lcms found!])
+ fi + fi
+else + else
+ AC_MSG_ERROR([Invalid value for --with-lcms: ${with_lcms}, use 'system' or 'bundled']) + AC_MSG_ERROR([Invalid value for --with-lcms: ${with_lcms}, use 'system' or 'bundled'])
+fi + fi
+ +
+AC_SUBST(USE_EXTERNAL_LCMS) + AC_SUBST(USE_EXTERNAL_LCMS)
+ +
+############################################################################### + ###############################################################################
+# + #
# Check for the zlib library # Check for the png library
# #
diff --git jdk8/jdk/makefiles/CompileNativeLibraries.gmk jdk8/jdk/makefiles/CompileNativeLibraries.gmk diff -ruN jdk8/jdk/makefiles/lib/Awt2dLibraries.gmk jdk8/jdk/makefiles/lib/Awt2dLibraries.gmk
--- jdk8/jdk/makefiles/CompileNativeLibraries.gmk --- jdk8/jdk/makefiles/lib/Awt2dLibraries.gmk 2013-11-14 22:04:38.040440133 -0500
+++ jdk8/jdk/makefiles/CompileNativeLibraries.gmk +++ jdk8/jdk/makefiles/lib/Awt2dLibraries.gmk 2013-11-14 22:05:11.475356411 -0500
@@ -1214,8 +1214,8 @@ @@ -661,8 +661,8 @@
########################################################################################## ##########################################################################################
# TODO: Update awt lib path when awt is converted # TODO: Update awt lib path when awt is converted
- $(eval $(call SetupNativeCompilation,BUILD_LIBLCMS,\ -$(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \
- LIBRARY:=lcms,\ - LIBRARY := lcms, \
+ $(eval $(call SetupNativeCompilation,BUILD_LIBJAVALCMS,\ +$(eval $(call SetupNativeCompilation,BUILD_LIBJAVALCMS, \
+ LIBRARY:=javalcms,\ + LIBRARY := javalcms, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms,\ SRC := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms, \
LANG:=C,\ LANG := C, \
@@ -1233,18 +1233,18 @@ @@ -680,18 +680,18 @@
LDFLAGS_windows:=$(WIN_AWT_LIB) $(WIN_JAVA_LIB),\ LDFLAGS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \
LDFLAGS_SUFFIX_solaris:=-lawt -ljava -ljvm -lc,\ LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc, \
LDFLAGS_SUFFIX_macosx:=$(LIBM) -lawt -ljava -ljvm,\ LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm, \
- LDFLAGS_SUFFIX_linux:=-lm -lawt -ljava -ljvm,\ - LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm, \
+ LDFLAGS_SUFFIX_linux:=-lm -lawt -ljava -ljvm -llcms2,\ + LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm -llcms2, \
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
RC_FLAGS:=$(RC_FLAGS)\ RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=lcms.dll" \ - -D "JDK_FNAME=lcms.dll" \
- -D "JDK_INTERNAL_NAME=lcms" \ - -D "JDK_INTERNAL_NAME=lcms" \
+ -D "JDK_FNAME=javalcms.dll" \ + -D "JDK_FNAME=javalcms.dll" \
+ -D "JDK_INTERNAL_NAME=libjavalcms" \ + -D "JDK_INTERNAL_NAME=javalcms" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/liblcms,\ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/liblcms, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) + OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjavalcms, \
DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
- BUILD_LIBRARIES += $(BUILD_LIBLCMS) -BUILD_LIBRARIES += $(BUILD_LIBLCMS)
- +BUILD_LIBRARIES += $(BUILD_LIBJAVALCMS)
- $(BUILD_LIBLCMS) : $(BUILD_LIBAWT)
+ BUILD_LIBRARIES += $(BUILD_LIBJAVALCMS) -$(BUILD_LIBLCMS): $(BUILD_LIBAWT)
+ +$(BUILD_LIBJAVALCMS): $(BUILD_LIBAWT)
+ $(BUILD_LIBJAVALCMS) : $(BUILD_LIBAWT)
########################################################################################## ##########################################################################################
diff --git jdk8/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java jdk8/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java diff -ruN jdk8/jdk/src/share/classes/sun/cmm/lcms/LCMS.java jdk8/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java
--- jdk8/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java --- jdk8/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java 2013-10-31 19:44:18.000000000 -0400
+++ jdk8/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java +++ jdk8/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java 2013-11-14 22:05:11.476356403 -0500
@@ -164,7 +164,7 @@ @@ -207,7 +207,7 @@
* disposer frameworks * disposer frameworks
*/ */
System.loadLibrary("awt"); System.loadLibrary("awt");

222
system-libjpeg.patch
View File

@ -1,38 +1,37 @@
diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4 diff -ruN jdk8/common/autoconf/libraries.m4 jdk8/common/autoconf/libraries.m4
--- jdk8/common/autoconf/libraries.m4 --- jdk8/common/autoconf/libraries.m4 2013-10-31 19:24:33.000000000 -0400
+++ jdk8/common/autoconf/libraries.m4 +++ jdk8/common/autoconf/libraries.m4 2013-11-14 21:55:20.249903347 -0500
@@ -487,11 +487,40 @@ @@ -601,12 +601,42 @@
# Check for the jpeg library
# #
-USE_EXTERNAL_LIBJPEG=true USE_EXTERNAL_LIBJPEG=true
-AC_CHECK_LIB(jpeg, main, [], - AC_CHECK_LIB(jpeg, main, [],
- [ USE_EXTERNAL_LIBJPEG=false - [ USE_EXTERNAL_LIBJPEG=false
- AC_MSG_NOTICE([Will use jpeg decoder bundled with the OpenJDK source]) - AC_MSG_NOTICE([Will use jpeg decoder bundled with the OpenJDK source])
- ]) - ])
+AC_ARG_WITH(libjpeg, [AS_HELP_STRING([--with-libjpeg], + AC_ARG_WITH(libjpeg, [AS_HELP_STRING([--with-libjpeg],
+ [use libjpeg from build system or OpenJDK sources (system, bundled) @<:@bundled@:>@])]) + [use libjpeg from build system or OpenJDK sources (system, bundled) @<:@bundled@:>@])])
+ +
+AC_CHECK_LIB(jpeg, jpeg_destroy_compress, + AC_CHECK_LIB(jpeg, jpeg_destroy_compress,
+ [ LIBJPEG_FOUND=yes ], + [ LIBJPEG_FOUND=yes ],
+ [ LIBJPEG_FOUND=no ]) + [ LIBJPEG_FOUND=no ])
+ +
+AC_MSG_CHECKING([for which libjpeg to use]) + AC_MSG_CHECKING([for which libjpeg to use])
+ +
+# default is bundled + # default is bundled
+DEFAULT_LIBJPEG=bundled + DEFAULT_LIBJPEG=bundled
+ +
+# + #
+# if user didn't specify, use DEFAULT_LIBJPEG + # if user didn't specify, use DEFAULT_LIBJPEG
+# + #
+if test "x${with_libjpeg}" = "x"; then + if test "x${with_libjpeg}" = "x"; then
+ with_libjpeg=${DEFAULT_LIBJPEG} + with_libjpeg=${DEFAULT_LIBJPEG}
+fi + fi
+ +
+if test "x${with_libjpeg}" = "xbundled"; then + if test "x${with_libjpeg}" = "xbundled"; then
+ USE_EXTERNAL_LIBJPEG=false + USE_EXTERNAL_LIBJPEG=false
+ AC_MSG_RESULT([bundled]) + AC_MSG_RESULT([bundled])
+elif test "x${with_libjpeg}" = "xsystem"; then + elif test "x${with_libjpeg}" = "xsystem"; then
+ if test "x${LIBJPEG_FOUND}" = "xyes"; then + if test "x${LIBJPEG_FOUND}" = "xyes"; then
+ USE_EXTERNAL_LIBJPEG=true + USE_EXTERNAL_LIBJPEG=true
+ AC_MSG_RESULT([system]) + AC_MSG_RESULT([system])
@ -40,113 +39,134 @@ diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4
+ AC_MSG_RESULT([system not found]) + AC_MSG_RESULT([system not found])
+ AC_MSG_ERROR([--with-libjpeg=system specified, but no libjpeg found]) + AC_MSG_ERROR([--with-libjpeg=system specified, but no libjpeg found])
+ fi + fi
+else + else
+ AC_MSG_ERROR([Invalid use of --with-libjpeg: ${with_libjpeg}, use 'system' or 'bundled']) + AC_MSG_ERROR([Invalid use of --with-libjpeg: ${with_libjpeg}, use 'system' or 'bundled'])
+fi + fi
+
AC_SUBST(USE_EXTERNAL_LIBJPEG) AC_SUBST(USE_EXTERNAL_LIBJPEG)
+
############################################################################### ###############################################################################
diff --git a/makefiles/CompileNativeLibraries.gmk b/makefiles/CompileNativeLibraries.gmk #
--- jdk8/jdk/makefiles/CompileNativeLibraries.gmk # Check for the gif library
+++ jdk8/jdk/makefiles/CompileNativeLibraries.gmk diff -ruN jdk8/jdk/makefiles/lib/Awt2dLibraries.gmk jdk8/jdk/makefiles/lib/Awt2dLibraries.gmk
@@ -1249,17 +1249,17 @@ --- jdk8/jdk/makefiles/lib/Awt2dLibraries.gmk 2013-10-31 19:44:18.000000000 -0400
+++ jdk8/jdk/makefiles/lib/Awt2dLibraries.gmk 2013-11-14 21:56:01.020796703 -0500
@@ -696,17 +696,17 @@
########################################################################################## ##########################################################################################
ifdef OPENJDK ifdef OPENJDK
- BUILD_LIBJPEG_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/mapfile-vers - BUILD_LIBJPEG_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/mapfile-vers
+ BUILD_LIBJAVAJPEG_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/mapfile-vers + BUILD_LIBJAVAJPEG_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/mapfile-vers
else else
- BUILD_LIBJPEG_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/mapfile-vers-closed - BUILD_LIBJPEG_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/mapfile-vers-closed
- BUILD_LIBJPEG_CLOSED_SRC:=$(JDK_TOPDIR)/src/closed/share/native/sun/awt/image/jpeg - BUILD_LIBJPEG_CLOSED_SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/awt/image/jpeg
- BUILD_LIBJPEG_CLOSED_INCLUDES:=-I$(BUILD_LIBJPEG_CLOSED_SRC) - BUILD_LIBJPEG_CLOSED_INCLUDES := -I$(BUILD_LIBJPEG_CLOSED_SRC)
+ BUILD_LIBJAVAJPEG_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/mapfile-vers-closed + BUILD_LIBJAVAJPEG_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/mapfile-vers-closed
+ BUILD_LIBJAVAJPEG_CLOSED_SRC:=$(JDK_TOPDIR)/src/closed/share/native/sun/awt/image/jpeg + BUILD_LIBJAVAJPEG_CLOSED_SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/awt/image/jpeg
+ BUILD_LIBJAVAJPEG_CLOSED_INCLUDES:=-I$(BUILD_LIBJAVAJPEG_CLOSED_SRC) + BUILD_LIBJAVAJPEG_CLOSED_INCLUDES := -I$(BUILD_LIBJPEG_CLOSED_SRC)
endif endif
-BUILD_LIBJPEG_REORDER:= -BUILD_LIBJPEG_REORDER :=
+BUILD_LIBJAVAJPEG_REORDER:= +BUILD_LIBJAVAJPEG_REORDER :=
ifeq ($(OPENJDK_TARGET_OS), solaris) ifeq ($(OPENJDK_TARGET_OS), solaris)
ifneq ($(OPENJDK_TARGET_CPU), x86_64) ifneq ($(OPENJDK_TARGET_CPU), x86_64)
- BUILD_LIBJPEG_REORDER:=$(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/reorder-$(OPENJDK_TARGET_CPU) - BUILD_LIBJPEG_REORDER := $(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/reorder-$(OPENJDK_TARGET_CPU)
+ BUILD_LIBJAVAJPEG_REORDER:=$(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/reorder-$(OPENJDK_TARGET_CPU) + BUILD_LIBJAVAJPEG_REORDER := $(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/reorder-$(OPENJDK_TARGET_CPU)
endif endif
endif endif
@@ -1274,37 +1274,37 @@ @@ -721,37 +721,37 @@
# $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \ # $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \
# \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) ) # \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) )
# ifeq ($(CC_43_OR_NEWER),1) # ifeq ($(CC_43_OR_NEWER), 1)
-# BUILD_LIBJPEG_CFLAGS_linux += -Wno-clobbered -# BUILD_LIBJPEG_CFLAGS_linux += -Wno-clobbered
+# BUILD_LIBJAVAJPEG_CFLAGS_linux += -Wno-clobbered +# BUILD_LIBJAVAJPEG_CFLAGS_linux += -Wno-clobbered
# endif # endif
#endif #endif
-$(eval $(call SetupNativeCompilation,BUILD_LIBJPEG,\ -$(eval $(call SetupNativeCompilation,BUILD_LIBJPEG, \
- LIBRARY:=jpeg, \ - LIBRARY := jpeg, \
+$(eval $(call SetupNativeCompilation,BUILD_LIBJAVAJPEG,\ +$(eval $(call SetupNativeCompilation,BUILD_LIBJAVAJPEG, \
+ LIBRARY:=javajpeg, \ + LIBRARY := javajpeg, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC:=$(BUILD_LIBJPEG_CLOSED_SRC) \ - SRC := $(BUILD_LIBJPEG_CLOSED_SRC) \
+ SRC:=$(BUILD_LIBJAVAJPEG_CLOSED_SRC) \ + SRC := $(BUILD_LIBJAVAJPEG_CLOSED_SRC) \
$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg,\ $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=HIGHEST, \ OPTIMIZATION := HIGHEST, \
CFLAGS:=$(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
- $(BUILD_LIBJPEG_CLOSED_INCLUDES) \ - $(BUILD_LIBJPEG_CLOSED_INCLUDES) \
+ $(BUILD_LIBJAVAJPEG_CLOSED_INCLUDES) \ + $(BUILD_LIBJAVAJPEG_CLOSED_INCLUDES) \
-I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg,\ -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \
- MAPFILE:=$(BUILD_LIBJPEG_MAPFILE), \ - MAPFILE := $(BUILD_LIBJPEG_MAPFILE), \
- LDFLAGS:=$(LDFLAGS_JDKLIB) \ - LDFLAGS := $(LDFLAGS_JDKLIB) \
+ MAPFILE:=$(BUILD_LIBJAVAJPEG_MAPFILE), \ + MAPFILE := $(BUILD_LIBJAVAJPEG_MAPFILE), \
+ LDFLAGS:=$(LDFLAGS_JDKLIB) -ljpeg \ + LDFLAGS := $(LDFLAGS_JDKLIB) -ljpeg \
$(call SET_SHARED_LIBRARY_ORIGIN),\ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_windows:=$(WIN_JAVA_LIB) jvm.lib,\ LDFLAGS_windows := $(WIN_JAVA_LIB) jvm.lib, \
LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\ LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
RC_FLAGS:=$(RC_FLAGS)\ RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=jpeg.dll" \ - -D "JDK_FNAME=jpeg.dll" \
- -D "JDK_INTERNAL_NAME=jpeg" \ - -D "JDK_INTERNAL_NAME=jpeg" \
+ -D "JDK_FNAME=javajpeg.dll" \ + -D "JDK_FNAME=javajpeg.dll" \
+ -D "JDK_INTERNAL_NAME=javajpeg" \ + -D "JDK_INTERNAL_NAME=javajpeg" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
- REORDER:=$(BUILD_LIBJPEG_REORDER),\ - REORDER := $(BUILD_LIBJPEG_REORDER), \
- OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjpeg,\ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjpeg, \
+ REORDER:=$(BUILD_LIBJAVAJPEG_REORDER),\ + REORDER := $(BUILD_LIBJAVAJPEG_REORDER), \
+ OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjavajpeg,\ + OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjavajpeg, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-$(BUILD_LIBJPEG): $(BUILD_LIBJAVA)
+$(BUILD_LIBJAVAJPEG): $(BUILD_LIBJAVA)
-$(BUILD_LIBJPEG) : $(BUILD_LIBJAVA)
-
-BUILD_LIBRARIES += $(BUILD_LIBJPEG) -BUILD_LIBRARIES += $(BUILD_LIBJPEG)
+$(BUILD_LIBJAVAJPEG) : $(BUILD_LIBJAVA)
+
+BUILD_LIBRARIES += $(BUILD_LIBJAVAJPEG) +BUILD_LIBRARIES += $(BUILD_LIBJAVAJPEG)
########################################################################################## ##########################################################################################
@@ -2441,7 +2441,7 @@ @@ -1183,7 +1183,6 @@
-F/System/Library/Frameworks/JavaVM.framework/Frameworks \
-framework JavaNativeFoundation ifndef BUILD_HEADLESS_ONLY
else ifneq ($(OPENJDK_TARGET_OS), windows) LIBSPLASHSCREEN_DIRS := \
- LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -lX11 -lXext $(LIBM) -lpthread - $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \
+ LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -lX11 -lXext $(LIBM) -lpthread -ljpeg $(JDK_TOPDIR)/src/share/native/sun/awt/libpng \
else # OPENJDK_TARGET_OS $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen
LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib -DELAYLOAD:user32.dll
endif # OPENJDK_TARGET_OS @@ -1194,6 +1193,13 @@
@@ -2457,7 +2457,7 @@ GIFLIB_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/giflib
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libsplashscreen/mapfile-vers, \ endif
LDFLAGS:=$(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN),\ + ifeq ($(USE_EXTERNAL_LIBJPEG), true)
- LDFLAGS_SUFFIX:=$(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) $(GIFLIB_LDFLAGS),\ + LIBJPEG_LDFLAGS := -ljpeg
+ LDFLAGS_SUFFIX:=$(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) $(GIFLIB_LDFLAGS) -ljpeg,\ + else
LDFLAGS_SUFFIX_solaris:=-lc,\ + LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ + LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/jpeg
RC_FLAGS:=$(RC_FLAGS)\ + endif
diff --git a/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java b/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java +
--- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java ifneq ($(OPENJDK_TARGET_OS), macosx)
+++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
else
@@ -1256,11 +1262,13 @@
EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \
LANG := C, \
OPTIMIZATION := LOW, \
- CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) $(GIFLIB_CFLAGS), \
+ CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \
+ $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS), \
MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libsplashscreen/mapfile-vers, \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX := $(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) $(GIFLIB_LDFLAGS), \
+ LDFLAGS_SUFFIX := $(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) \
+ $(LIBZ) $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS), \
LDFLAGS_SUFFIX_solaris := -lc, \
VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
RC_FLAGS := $(RC_FLAGS) \
diff -ruN jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
--- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2013-10-31 19:44:18.000000000 -0400
+++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2013-11-14 21:55:20.250903340 -0500
@@ -89,7 +89,7 @@ @@ -89,7 +89,7 @@
java.security.AccessController.doPrivileged( java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<Void>() { new java.security.PrivilegedAction<Void>() {
@ -156,9 +176,9 @@ diff --git a/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
return null; return null;
} }
}); });
diff --git a/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java b/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java diff -ruN jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java
--- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java --- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2013-10-31 19:44:18.000000000 -0400
+++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java +++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2013-11-14 21:55:20.250903340 -0500
@@ -179,7 +179,7 @@ @@ -179,7 +179,7 @@
java.security.AccessController.doPrivileged( java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<Void>() { new java.security.PrivilegedAction<Void>() {
@ -168,9 +188,9 @@ diff --git a/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java
return null; return null;
} }
}); });
diff --git a/src/share/classes/sun/awt/image/JPEGImageDecoder.java b/src/share/classes/sun/awt/image/JPEGImageDecoder.java diff -ruN jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java
--- jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java --- jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java 2013-10-31 19:44:18.000000000 -0400
+++ jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java +++ jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java 2013-11-14 21:55:20.251903376 -0500
@@ -56,7 +56,7 @@ @@ -56,7 +56,7 @@
java.security.AccessController.doPrivileged( java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<Void>() { new java.security.PrivilegedAction<Void>() {
@ -180,9 +200,9 @@ diff --git a/src/share/classes/sun/awt/image/JPEGImageDecoder.java b/src/share/c
return null; return null;
} }
}); });
diff --git a/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c b/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c diff -ruN jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c
--- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c --- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2013-10-31 19:44:18.000000000 -0400
+++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c +++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2013-11-14 21:55:20.251903376 -0500
@@ -25,7 +25,6 @@ @@ -25,7 +25,6 @@
#include "splashscreen_impl.h" #include "splashscreen_impl.h"

120
system-libpng.patch
View File

@ -1,37 +1,37 @@
diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4 diff -ruN jdk8/common/autoconf/libraries.m4 jdk8/common/autoconf/libraries.m4
--- jdk8/common/autoconf/libraries.m4 --- jdk8/common/autoconf/libraries.m4 2013-11-14 20:08:01.845065585 -0500
+++ jdk8/common/autoconf/libraries.m4 +++ jdk8/common/autoconf/libraries.m4 2013-11-14 20:10:56.186553066 -0500
@@ -566,6 +566,47 @@ @@ -676,6 +676,47 @@
############################################################################### ###############################################################################
# #
+# Check for the png library + # Check for the png library
+# + #
+ +
+AC_ARG_WITH(libpng, [AS_HELP_STRING([--with-libpng], + AC_ARG_WITH(libpng, [AS_HELP_STRING([--with-libpng],
+ [use libpng from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])]) + [use libpng from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
+ +
+AC_CHECK_LIB(png, png_sig_cmp, + AC_CHECK_LIB(png, png_sig_cmp,
+ [ LIBPNG_FOUND=yes ], + [ LIBPNG_FOUND=yes ],
+ [ LIBPNG_FOUND=no ]) + [ LIBPNG_FOUND=no ])
+ +
+AC_MSG_CHECKING([for which libpng to use]) + AC_MSG_CHECKING([for which libpng to use])
+ +
+# default is bundled + # default is bundled
+DEFAULT_LIBPNG=bundled + DEFAULT_LIBPNG=bundled
+ +
+# + #
+# if user didn't specify, use DEFAULT_LIBPNG + # if user didn't specify, use DEFAULT_LIBPNG
+# + #
+if test "x${with_libpng}" = "x"; then + if test "x${with_libpng}" = "x"; then
+ with_libpng=${DEFAULT_libpng} + with_libpng=${DEFAULT_libpng}
+fi + fi
+ +
+ +
+if test "x${with_libpng}" = "xbundled"; then + if test "x${with_libpng}" = "xbundled"; then
+ USE_EXTERNAL_LIBPNG=false + USE_EXTERNAL_LIBPNG=false
+ AC_MSG_RESULT([bundled]) + AC_MSG_RESULT([bundled])
+elif test "x${with_libpng}" = "xsystem"; then + elif test "x${with_libpng}" = "xsystem"; then
+ if test "x${LIBPNG_FOUND}" = "xyes"; then + if test "x${LIBPNG_FOUND}" = "xyes"; then
+ USE_EXTERNAL_LIBPNG=true + USE_EXTERNAL_LIBPNG=true
+ AC_MSG_RESULT([system]) + AC_MSG_RESULT([system])
@ -39,45 +39,77 @@ diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4
+ AC_MSG_RESULT([system not found]) + AC_MSG_RESULT([system not found])
+ AC_MSG_ERROR([--with-libpng=system specified, but no libpng found!]) + AC_MSG_ERROR([--with-libpng=system specified, but no libpng found!])
+ fi + fi
+else + else
+ AC_MSG_ERROR([Invalid value of --with-libpng: ${with_libpng}, use 'system' or 'bundled']) + AC_MSG_ERROR([Invalid value of --with-libpng: ${with_libpng}, use 'system' or 'bundled'])
+fi + fi
+AC_SUBST(USE_EXTERNAL_LIBPNG) + AC_SUBST(USE_EXTERNAL_LIBPNG)
+ +
+############################################################################### + ###############################################################################
+# + #
# Check for the zlib library # Check for the zlib library
# #
diff --git a/makefiles/CompileNativeLibraries.gmk b/makefiles/CompileNativeLibraries.gmk diff -ruN jdk8/common/autoconf/spec.gmk.in jdk8/common/autoconf/spec.gmk.in
--- jdk8/jdk/makefiles/CompileNativeLibraries.gmk --- jdk8/common/autoconf/spec.gmk.in 2013-10-31 19:24:33.000000000 -0400
+++ jdk8/jdk/makefiles/CompileNativeLibraries.gmk +++ jdk8/common/autoconf/spec.gmk.in 2013-11-14 21:10:56.365976518 -0500
@@ -2386,7 +2386,6 @@ @@ -548,6 +548,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 -ruN jdk8/jdk/makefiles/lib/Awt2dLibraries.gmk jdk8/jdk/makefiles/lib/Awt2dLibraries.gmk
--- jdk8/jdk/makefiles/lib/Awt2dLibraries.gmk 2013-11-14 20:08:01.845065585 -0500
+++ jdk8/jdk/makefiles/lib/Awt2dLibraries.gmk 2013-11-14 20:14:10.791982343 -0500
@@ -1183,7 +1183,6 @@
ifndef BUILD_HEADLESS_ONLY ifndef BUILD_HEADLESS_ONLY
LIBSPLASHSCREEN_DIRS:=\ 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/libpng \
$(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen
ifeq ($(USE_EXTERNAL_LIBGIF),true) ifeq ($(USE_EXTERNAL_LIBGIF), true)
@@ -2457,7 +2456,7 @@ @@ -1200,6 +1199,13 @@
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libsplashscreen/mapfile-vers, \ LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/jpeg
LDFLAGS:=$(LDFLAGS_JDKLIB) \ endif
$(call SET_SHARED_LIBRARY_ORIGIN),\
- LDFLAGS_SUFFIX:=$(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) $(GIFLIB_LDFLAGS) -ljpeg,\ + ifeq ($(USE_EXTERNAL_LIBPNG), true)
+ LDFLAGS_SUFFIX:=$(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) $(GIFLIB_LDFLAGS) -ljpeg -lpng,\ + LIBPNG_LDFLAGS := -lpng
LDFLAGS_SUFFIX_solaris:=-lc,\ + else
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ + LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/image/libpng
RC_FLAGS:=$(RC_FLAGS)\ + LIBPNG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/libpng
diff --git a/src/share/native/sun/awt/splashscreen/splashscreen_png.c b/src/share/native/sun/awt/splashscreen/splashscreen_png.c + endif
--- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c +
+++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c ifneq ($(OPENJDK_TARGET_OS), macosx)
@@ -25,7 +25,7 @@ LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
else
@@ -1263,12 +1269,12 @@
LANG := C, \
OPTIMIZATION := LOW, \
CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \
- $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS), \
+ $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(LIBPNG_CFLAGS), \
MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libsplashscreen/mapfile-vers, \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX := $(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) \
- $(LIBZ) $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS), \
+ $(LIBZ) $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS) $(LIBPNG_LDFLAGS), \
LDFLAGS_SUFFIX_solaris := -lc, \
VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
RC_FLAGS := $(RC_FLAGS) \
diff -ruN jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c
--- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2013-10-31 19:44:18.000000000 -0400
+++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2013-11-14 20:14:41.363892797 -0500
@@ -25,8 +25,7 @@
#include "splashscreen_impl.h" #include "splashscreen_impl.h"
-#include "../libpng/png.h" -#include "../libpng/png.h"
-
+#include <png.h> +#include <png.h>
#include <setjmp.h> #include <setjmp.h>
#define SIG_BYTES 8