# HG changeset patch # User Mark Wielaard # Date 1209339999 -7200 # Node ID 20700688fd03aea2c800729d5d62bb560bda92ae # Parent 794c2af9fd6822f5f8773934f01bb19cb125769d Add new color profiles. 2008-04-27 Mark Wielaard * Makefile.am (ICEDTEA_PATCHES): Add icedtea-color-profiles.patch. (stamps/overlay.stamp): New target. (overlay): Likewise. (stamps/extract-ecj.stamp): Depend on stamps/overlay.stamp. (icedtea): Likewise. (icedtea-debug): Likewise. (stamps/hotspot-tools-copy-source-files.stamp): Likewise. * Makefile.in: Regenerated. * overlays/openjdk/jdk/src/share/lib/cmm/lcms/GRAY.pf: New file. * overlays/openjdk/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf: Likewise. * overlays/openjdk/jdk/src/share/lib/cmm/lcms/PYCC.pf: Likewise. * patches/icedtea-color-profiles.patch: New patch. diff -r 794c2af9fd68 -r 20700688fd03 ChangeLog --- a/ChangeLog Thu Apr 24 16:46:35 2008 -0400 +++ b/ChangeLog Mon Apr 28 01:46:39 2008 +0200 @@ -1,3 +1,18 @@ +2008-04-27 Mark Wielaard + + * Makefile.am (ICEDTEA_PATCHES): Add icedtea-color-profiles.patch. + (stamps/overlay.stamp): New target. + (overlay): Likewise. + (stamps/extract-ecj.stamp): Depend on stamps/overlay.stamp. + (icedtea): Likewise. + (icedtea-debug): Likewise. + (stamps/hotspot-tools-copy-source-files.stamp): Likewise. + * Makefile.in: Regenerated. + * overlays/openjdk/jdk/src/share/lib/cmm/lcms/GRAY.pf: New file. + * overlays/openjdk/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf: Likewise. + * overlays/openjdk/jdk/src/share/lib/cmm/lcms/PYCC.pf: Likewise. + * patches/icedtea-color-profiles.patch: New patch. + 2008-04-24 Lillian Angel * patches/icedtea-version.patch: Changed product name to OpenJDK. diff -r 794c2af9fd68 -r 20700688fd03 Makefile.am --- a/Makefile.am Thu Apr 24 16:46:35 2008 -0400 +++ b/Makefile.am Mon Apr 28 01:46:39 2008 +0200 @@ -303,6 +303,7 @@ patches/icedtea-ia64-fdlibm.patch \ patches/icedtea-LCMS-setTagData.patch \ patches/icedtea-color-createcontext.patch \ + patches/icedtea-color-profiles.patch \ patches/icedtea-fonts.patch \ $(GCC_PATCH) \ $(DISTRIBUTION_PATCHES) @@ -366,11 +367,14 @@ echo "WARNING Not all patches reverted cleanly" ; \ fi +stamps/overlay.stamp: stamps/patch.stamp + cp -r overlays/openjdk/* openjdk/ && touch stamps/overlay.stamp + # OpenJDK ecj Source Preparation Targets # ====================================== # Copy over OpenJDK sources for ecj. -stamps/extract-ecj.stamp: stamps/patch.stamp +stamps/extract-ecj.stamp: stamps/patch.stamp stamps/overlay.stamp if ! test -d openjdk-ecj ; then \ cp -pPRl openjdk openjdk-ecj ; \ fi @@ -563,8 +567,8 @@ # you change it in the icedtea-debug target as well. icedtea: stamps/bootstrap-directory-symlink.stamp \ stamps/hotspot-tools.stamp stamps/plugs.stamp \ - stamps/ports.stamp stamps/patch.stamp gcjwebplugin.so \ - extra-lib/about.jar + stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \ + gcjwebplugin.so extra-lib/about.jar $(MAKE) \ $(ICEDTEA_ENV) \ -C openjdk/control/make/ \ @@ -586,8 +590,8 @@ icedtea-debug: stamps/bootstrap-directory-symlink.stamp \ stamps/hotspot-tools.stamp stamps/plugs.stamp \ - stamps/ports.stamp stamps/patch.stamp gcjwebplugin.so \ - extra-lib/about.jar + stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \ + gcjwebplugin.so extra-lib/about.jar $(MAKE) \ $(ICEDTEA_ENV) \ -C openjdk/control/make \ @@ -741,7 +745,7 @@ $(SHARE):$(SOLARIS):$(LANGTOOLS):$(JAXP):$(CORBA):$(JAXWS) # tools.jar class files. -stamps/hotspot-tools-copy-source-files.stamp: stamps/patch.stamp +stamps/hotspot-tools-copy-source-files.stamp: stamps/patch.stamp stamps/overlay.stamp for copy_dir in `cat tools-copy/tools-jdk-copy-files.txt` ; \ do \ mkdir -p hotspot-tools/$$copy_dir ; \ @@ -939,6 +943,8 @@ patch: stamps/patch.stamp +overlay: stamps/overlay.stamp + plugs: stamps/plugs.stamp rt-class-files: stamps/rt-class-files.stamp diff -r 794c2af9fd68 -r 20700688fd03 Makefile.in --- a/Makefile.in Thu Apr 24 16:46:35 2008 -0400 +++ b/Makefile.in Mon Apr 28 01:46:39 2008 +0200 @@ -410,6 +410,7 @@ patches/icedtea-ia64-fdlibm.patch \ patches/icedtea-LCMS-setTagData.patch \ patches/icedtea-color-createcontext.patch \ + patches/icedtea-color-profiles.patch \ patches/icedtea-fonts.patch $(GCC_PATCH) \ $(DISTRIBUTION_PATCHES) $(am__append_7) @@ -874,11 +875,14 @@ echo "WARNING Not all patches reverted cleanly" ; \ fi +stamps/overlay.stamp: stamps/patch.stamp + cp -r overlays/openjdk/* openjdk/ && touch stamps/overlay.stamp + # OpenJDK ecj Source Preparation Targets # ====================================== # Copy over OpenJDK sources for ecj. -stamps/extract-ecj.stamp: stamps/patch.stamp +stamps/extract-ecj.stamp: stamps/patch.stamp stamps/overlay.stamp if ! test -d openjdk-ecj ; then \ cp -pPRl openjdk openjdk-ecj ; \ fi @@ -1033,8 +1037,8 @@ # you change it in the icedtea-debug target as well. icedtea: stamps/bootstrap-directory-symlink.stamp \ stamps/hotspot-tools.stamp stamps/plugs.stamp \ - stamps/ports.stamp stamps/patch.stamp gcjwebplugin.so \ - extra-lib/about.jar + stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \ + gcjwebplugin.so extra-lib/about.jar $(MAKE) \ $(ICEDTEA_ENV) \ -C openjdk/control/make/ \ @@ -1056,8 +1060,8 @@ icedtea-debug: stamps/bootstrap-directory-symlink.stamp \ stamps/hotspot-tools.stamp stamps/plugs.stamp \ - stamps/ports.stamp stamps/patch.stamp gcjwebplugin.so \ - extra-lib/about.jar + stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \ + gcjwebplugin.so extra-lib/about.jar $(MAKE) \ $(ICEDTEA_ENV) \ -C openjdk/control/make \ @@ -1181,7 +1185,7 @@ done # tools.jar class files. -stamps/hotspot-tools-copy-source-files.stamp: stamps/patch.stamp +stamps/hotspot-tools-copy-source-files.stamp: stamps/patch.stamp stamps/overlay.stamp for copy_dir in `cat tools-copy/tools-jdk-copy-files.txt` ; \ do \ mkdir -p hotspot-tools/$$copy_dir ; \ @@ -1379,6 +1383,8 @@ patch: stamps/patch.stamp +overlay: stamps/overlay.stamp + plugs: stamps/plugs.stamp rt-class-files: stamps/rt-class-files.stamp diff -r 794c2af9fd68 -r 20700688fd03 overlays/openjdk/jdk/src/share/lib/cmm/lcms/GRAY.pf Binary file overlays/openjdk/jdk/src/share/lib/cmm/lcms/GRAY.pf has changed diff -r 794c2af9fd68 -r 20700688fd03 overlays/openjdk/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf Binary file overlays/openjdk/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf has changed diff -r 794c2af9fd68 -r 20700688fd03 overlays/openjdk/jdk/src/share/lib/cmm/lcms/PYCC.pf Binary file overlays/openjdk/jdk/src/share/lib/cmm/lcms/PYCC.pf has changed diff -r 794c2af9fd68 -r 20700688fd03 patches/icedtea-color-profiles.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-color-profiles.patch Mon Apr 28 01:46:39 2008 +0200 @@ -0,0 +1,29 @@ +# Changeset: 804b0757d801 +# Author: prr +# Date: 2008-04-24 11:58 -0700 +# URL: http://hg.openjdk.java.net/jdk7/2d/jdk/rev/804b0757d801 +# +# 6523403: Need to provide lcms library with PYCC and LINEAR_RGB OS ICC profiles +# Summary: Add two contributed profiles and a fix to GRAY.pf, all from Redhat, keiths at redhat.com contributed the GRAY.pf fix. +# Reviewed-by: jgodinez, avu, prr +# Contributed-by: aph at redhat.com +# +# .pf files can be found under overlays/openjdk/jdk/src/share/lib/cmm/lcms/ + +--- openjdk/jdk/make/sun/cmm/Makefile.orig 2008-04-27 23:59:37.000000000 +0200 ++++ openjdk/jdk/make/sun/cmm/Makefile 2008-04-27 23:59:45.000000000 +0200 +@@ -41,12 +41,8 @@ + ICCPROFILE_DEST_DIR = $(LIBDIR)/cmm + + iccprofiles: $(ICCPROFILE_DEST_DIR)/sRGB.pf $(ICCPROFILE_DEST_DIR)/GRAY.pf \ +- $(ICCPROFILE_DEST_DIR)/CIEXYZ.pf +- +-ifndef OPENJDK +-iccprofiles: $(ICCPROFILE_DEST_DIR)/PYCC.pf \ +- $(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf +-endif ++ $(ICCPROFILE_DEST_DIR)/CIEXYZ.pf $(ICCPROFILE_DEST_DIR)/PYCC.pf \ ++ $(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf + + $(ICCPROFILE_DEST_DIR)/sRGB.pf: $(ICCPROFILE_SRC_DIR)/sRGB.pf + $(RM) $(ICCPROFILE_DEST_DIR)/sRGB.pf