[IcedTea7] FYI: Bump to b46
Andrew John Hughes
gnu_andrew at member.fsf.org
Tue Feb 10 12:53:30 PST 2009
This adds support to IcedTea7 for the new build drop, b46.
A number of patches were dropped:
directaudio-close-trick: Is applied but unlisted in
http://download.java.net/jdk7/changes/jdk7-b46.html
enum-bug-181: Fixed by S6736248
jsoundhs, sound: Fixed by S6702956 and related patches
(replacement of jsoundhs with Gervill)
There is still no support for IMPORT_BINARY_PLUGS=false
however; SNMP still seems to be required.
2009-02-10 Andrew John Hughes <ahughes at redhat.com>
Bump to b46.
* patches/icedtea-directaudio-close-trick.patch,
* patches/icedtea-enum-bug-181.patch,
* patches/icedtea-jsoundhs.patch,
* patches/icedtea-sound.patch:
Applied upstream.
* HACKING,
* Makefile.am: Updated.
* patches/ecj/icedtea.patch: Recreated due to
S6795030.
* patches/icedtea-copy-plugs.patch: Recreated
due to S6702956.
--
Andrew :)
Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
-------------- next part --------------
diff -r 5a2104fb2256 HACKING
--- a/HACKING Wed Feb 04 11:49:31 2009 +0000
+++ b/HACKING Tue Feb 10 20:30:15 2009 +0000
@@ -24,7 +24,6 @@
* icedtea-core-build.patch: Add support for building IcedTea core VM.
* icedtea-debuginfo.patch: Add -g option to build to generate debugging information.
* icedtea-demos.patch: Fix building of JVMTI demo.
-* icedtea-enum-bug-181.patch: Fixes class type check (PR181/S6736248)
* icedtea-float-double-trailing-zeros.patch: Remove trailing zeros from Double/Float (PR29/30)
* icedtea-fonts.patch: Add Fedora fontconfig.
* icedtea-gcc-suffix.patch: Append $(GCC_SUFFIX) to end of 'gcc' binary name.
@@ -86,6 +85,7 @@
* icedtea-corba.patch: Adds additional files to org.omg.CORBA Makefile.
* icedtea-display-mode-changer.patch: Add extra test class. (applied in OpenJDK7 b43)
+* icedtea-enum-bug-181.patch: Fixes class type check (PR181/S6736248)
* icedtea-gcc-4.3.patch: Fix code to compile with GCC 4.3 and turn off -Werror.
* icedtea-generated.patch: Force use of /bin/bash.
* icedtea-nomotif.patch: Remove sanity and GrabShell.h dependency on Motif/Lesstif library.
@@ -105,15 +105,12 @@
* icedtea-constructor-properties.patch: Explicitly cast to ConstructorProperties
as getAnnotation is broken in libgcj 4.3.
-* icedtea-jsoundhs.patch: Remove attempted build of proprietary jsoundhs library.
* icedtea-mbeanintrospector.patch: Explicitly cast to Description as getAnnotation
is broken in libgcj 4.3.
* icedtea-override.patch: Remove @Override annotation in
javax.management.AttributeValueExp (unsupported by ecj < 3.4).
* icedtea-snmp.patch: Remove proprietary SNMP support hooks.
* icedtea-sound.patch: Remove proprietary MIDI support hooks.
-* icedtea-fortify-source.patch: Fix build failures with -D_FORTIFY_SOURCE=2.
-* icedtea-format-warnings.patch: Fix build failures with -Wformat=1.
The following patches are only applied to the icedtea-ecj bootstrap tree:
diff -r 5a2104fb2256 Makefile.am
--- a/Makefile.am Wed Feb 04 11:49:31 2009 +0000
+++ b/Makefile.am Tue Feb 10 20:30:15 2009 +0000
@@ -1,6 +1,6 @@
-OPENJDK_DATE = 29_jan_2009
-OPENJDK_MD5SUM = 0d6ae1ed77b470c9665d069b34a1bc88
-OPENJDK_VERSION = b45
+OPENJDK_DATE = 05_feb_2009
+OPENJDK_MD5SUM = d5f92fec2f645d44437ab90e1dd2dbaf
+OPENJDK_VERSION = b46
CACAO_VERSION = 0.99.3
CACAO_MD5SUM = 80de3ad344c1a20c086ec5f1390bd1b8
@@ -1845,7 +1845,6 @@
patches/icedtea-uname.patch \
patches/icedtea-ia64-fdlibm.patch \
patches/icedtea-fonts.patch \
- patches/icedtea-directaudio-close-trick.patch \
patches/hotspot/$(HSBUILD)/icedtea-sparc-ptracefix.patch \
patches/hotspot/$(HSBUILD)/icedtea-sparc-trapsfix.patch \
patches/icedtea-override-redirect-metacity.patch \
@@ -1854,13 +1853,11 @@
patches/hotspot/$(HSBUILD)/icedtea-shark-build.patch \
patches/icedtea-toolkit.patch \
patches/icedtea-security-updates.patch \
- patches/icedtea-jsoundhs.patch \
patches/icedtea-jdk-docs-target.patch \
patches/icedtea-mbeanintrospector.patch \
patches/icedtea-hotspot-gcc-pr36917.patch \
patches/icedtea-alpha-fixes.patch \
patches/icedtea-alt-jar.patch \
- patches/icedtea-enum-bug-181.patch \
patches/icedtea-jdk-use-ssize_t.patch \
patches/hotspot/$(HSBUILD)/icedtea-use-idx_t.patch \
patches/hotspot/$(HSBUILD)/icedtea-params-cast-size_t.patch \
@@ -1876,7 +1873,6 @@
patches/icedtea-xjc.patch \
patches/icedtea-renderer-crossing.patch \
patches/icedtea-snmp.patch \
- patches/icedtea-sound.patch \
patches/icedtea-tests-jdk.patch \
patches/icedtea-stroker-finish.patch \
patches/icedtea-alsa-default-device.patch \
diff -r 5a2104fb2256 patches/ecj/icedtea.patch
--- a/patches/ecj/icedtea.patch Wed Feb 04 11:49:31 2009 +0000
+++ b/patches/ecj/icedtea.patch Tue Feb 10 20:30:15 2009 +0000
@@ -1,6 +1,6 @@
diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile openjdk-ecj/corba/make/com/sun/corba/se/Makefile
---- openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile 2008-10-09 08:41:14.000000000 +0100
-+++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile 2009-02-05 08:40:51.000000000 +0000
++++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile 2009-02-10 19:24:54.000000000 +0000
@@ -42,7 +42,7 @@
# the rmic iiop backend needs some classes that are part of the impl/util
# package. These classes use log wrappers, so they must be built after
@@ -12,7 +12,7 @@
diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/org/Makefile openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile
--- openjdk-ecj.orig/corba/make/com/sun/corba/se/org/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile 2008-10-24 13:32:48.000000000 +0100
++++ openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile 2009-02-10 19:24:54.000000000 +0000
@@ -0,0 +1,38 @@
+#
+# Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved.
@@ -53,8 +53,8 @@
+#
+include $(BUILDDIR)/common/Classes.gmk
diff -Nru openjdk-ecj.orig/corba/make/common/Defs.gmk openjdk-ecj/corba/make/common/Defs.gmk
---- openjdk-ecj.orig/corba/make/common/Defs.gmk 2008-10-09 08:41:14.000000000 +0100
-+++ openjdk-ecj/corba/make/common/Defs.gmk 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/corba/make/common/Defs.gmk 2009-02-05 08:40:51.000000000 +0000
++++ openjdk-ecj/corba/make/common/Defs.gmk 2009-02-10 19:24:54.000000000 +0000
@@ -53,6 +53,13 @@
_OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH)
@@ -88,8 +88,8 @@
vpath %.java $(VPATH.java)
vpath %.class $(CLASSBINDIR)
diff -Nru openjdk-ecj.orig/corba/make/common/Defs-linux.gmk openjdk-ecj/corba/make/common/Defs-linux.gmk
---- openjdk-ecj.orig/corba/make/common/Defs-linux.gmk 2008-10-24 10:16:06.000000000 +0100
-+++ openjdk-ecj/corba/make/common/Defs-linux.gmk 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/corba/make/common/Defs-linux.gmk 2009-02-10 18:12:00.000000000 +0000
++++ openjdk-ecj/corba/make/common/Defs-linux.gmk 2009-02-10 19:24:54.000000000 +0000
@@ -276,7 +276,7 @@
fi; \
done)
@@ -100,8 +100,8 @@
#
# We want to privatize JVM symbols on Solaris. This is so the user can
diff -Nru openjdk-ecj.orig/corba/make/common/Rules.gmk openjdk-ecj/corba/make/common/Rules.gmk
---- openjdk-ecj.orig/corba/make/common/Rules.gmk 2008-10-09 08:41:14.000000000 +0100
-+++ openjdk-ecj/corba/make/common/Rules.gmk 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/corba/make/common/Rules.gmk 2009-02-05 08:40:51.000000000 +0000
++++ openjdk-ecj/corba/make/common/Rules.gmk 2009-02-10 19:24:54.000000000 +0000
@@ -197,8 +197,10 @@
$(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \
$(CAT) $(JAVA_SOURCE_LIST); \
@@ -116,8 +116,8 @@
@$(java-vm-cleanup)
diff -Nru openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk openjdk-ecj/corba/make/common/shared/Defs-java.gmk
---- openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk 2008-10-24 10:16:06.000000000 +0100
-+++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk 2009-02-10 18:12:00.000000000 +0000
++++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2009-02-10 19:24:54.000000000 +0000
@@ -110,31 +110,13 @@
JAVACFLAGS += $(OTHER_JAVACFLAGS)
@@ -155,8 +155,8 @@
# Override of what javac to use (see deploy workspace)
ifdef JAVAC
diff -Nru openjdk-ecj.orig/corba/make/org/omg/sources/Makefile openjdk-ecj/corba/make/org/omg/sources/Makefile
---- openjdk-ecj.orig/corba/make/org/omg/sources/Makefile 2008-10-09 08:41:14.000000000 +0100
-+++ openjdk-ecj/corba/make/org/omg/sources/Makefile 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/corba/make/org/omg/sources/Makefile 2009-02-05 08:40:51.000000000 +0000
++++ openjdk-ecj/corba/make/org/omg/sources/Makefile 2009-02-10 19:24:54.000000000 +0000
@@ -93,8 +93,6 @@
POAHELHOLFILES = $(POA_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%)
@@ -234,8 +234,8 @@
pi.compile: $(PIGENERATEDFILES)
diff -Nru openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile
---- openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile 2008-10-24 10:16:05.000000000 +0100
-+++ openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile 2009-02-10 18:11:57.000000000 +0000
++++ openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile 2009-02-10 19:24:54.000000000 +0000
@@ -172,7 +172,6 @@
ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%)
@@ -253,8 +253,8 @@
portableactivation.idl.compile: $(PORTABLEACTIVATIONFILES)
diff -Nru openjdk-ecj.orig/jaxp/make/build.xml openjdk-ecj/jaxp/make/build.xml
---- openjdk-ecj.orig/jaxp/make/build.xml 2008-10-24 10:16:06.000000000 +0100
-+++ openjdk-ecj/jaxp/make/build.xml 2008-10-24 13:33:43.000000000 +0100
+--- openjdk-ecj.orig/jaxp/make/build.xml 2009-02-10 18:12:00.000000000 +0000
++++ openjdk-ecj/jaxp/make/build.xml 2009-02-10 19:24:54.000000000 +0000
@@ -71,7 +71,10 @@
<mkdir dir="${build.toolclasses.dir}"/>
<javac srcdir="${make.tools.dir}/StripProperties"
@@ -277,8 +277,8 @@
<compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>
<compilerarg line="${javac.version.opt}"/>
diff -Nru openjdk-ecj.orig/jaxp/make/Makefile openjdk-ecj/jaxp/make/Makefile
---- openjdk-ecj.orig/jaxp/make/Makefile 2008-10-24 10:16:06.000000000 +0100
-+++ openjdk-ecj/jaxp/make/Makefile 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jaxp/make/Makefile 2009-02-10 18:12:00.000000000 +0000
++++ openjdk-ecj/jaxp/make/Makefile 2009-02-10 19:24:54.000000000 +0000
@@ -75,7 +75,7 @@
endif
@@ -289,8 +289,8 @@
ifdef ALT_OUTPUTDIR
diff -Nru openjdk-ecj.orig/jaxws/make/build.properties openjdk-ecj/jaxws/make/build.properties
---- openjdk-ecj.orig/jaxws/make/build.properties 2008-10-24 10:16:06.000000000 +0100
-+++ openjdk-ecj/jaxws/make/build.properties 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jaxws/make/build.properties 2009-02-10 18:12:00.000000000 +0000
++++ openjdk-ecj/jaxws/make/build.properties 2009-02-10 19:24:54.000000000 +0000
@@ -37,7 +37,7 @@
# set the following to -version to verify the versions of javac being used
javac.version.opt =
@@ -301,8 +301,8 @@
# JVM memory size
javac.memoryInitialSize = 128m
diff -Nru openjdk-ecj.orig/jaxws/make/build.xml openjdk-ecj/jaxws/make/build.xml
---- openjdk-ecj.orig/jaxws/make/build.xml 2008-10-24 10:16:06.000000000 +0100
-+++ openjdk-ecj/jaxws/make/build.xml 2008-10-24 13:34:37.000000000 +0100
+--- openjdk-ecj.orig/jaxws/make/build.xml 2009-02-10 18:12:00.000000000 +0000
++++ openjdk-ecj/jaxws/make/build.xml 2009-02-10 19:24:54.000000000 +0000
@@ -84,7 +84,10 @@
<mkdir dir="${build.toolclasses.dir}"/>
<javac srcdir="${make.tools.dir}/StripProperties"
@@ -333,8 +333,8 @@
<compilerarg line="${javac.version.opt}"/>
<compilerarg line="${javac.no.jdk.warnings}"/>
diff -Nru openjdk-ecj.orig/jaxws/make/Makefile openjdk-ecj/jaxws/make/Makefile
---- openjdk-ecj.orig/jaxws/make/Makefile 2008-10-24 10:16:06.000000000 +0100
-+++ openjdk-ecj/jaxws/make/Makefile 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jaxws/make/Makefile 2009-02-10 18:12:00.000000000 +0000
++++ openjdk-ecj/jaxws/make/Makefile 2009-02-10 19:24:54.000000000 +0000
@@ -75,8 +75,8 @@
endif
@@ -347,8 +347,8 @@
ifdef ALT_OUTPUTDIR
diff -Nru openjdk-ecj.orig/jdk/make/common/BuildToolJar.gmk openjdk-ecj/jdk/make/common/BuildToolJar.gmk
---- openjdk-ecj.orig/jdk/make/common/BuildToolJar.gmk 2008-10-09 08:45:42.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/BuildToolJar.gmk 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/common/BuildToolJar.gmk 2009-02-05 08:44:12.000000000 +0000
++++ openjdk-ecj/jdk/make/common/BuildToolJar.gmk 2009-02-10 19:24:54.000000000 +0000
@@ -43,7 +43,8 @@
@$(prep-target)
@$(MKDIR) -p $(BUILDTOOLCLASSDIR)
@@ -360,8 +360,8 @@
-C $(BUILDTOOLCLASSDIR) $(PKGDIR) \
$(BOOT_JAR_JFLAGS) || $(RM) $@
diff -Nru openjdk-ecj.orig/jdk/make/common/Release.gmk openjdk-ecj/jdk/make/common/Release.gmk
---- openjdk-ecj.orig/jdk/make/common/Release.gmk 2008-10-24 10:16:06.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/Release.gmk 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/common/Release.gmk 2009-02-10 18:12:01.000000000 +0000
++++ openjdk-ecj/jdk/make/common/Release.gmk 2009-02-10 19:24:54.000000000 +0000
@@ -651,10 +651,23 @@
$(RES_JAR_ARGLIST): $(RES_JAR_FILELIST)
$(prep-target)
@@ -409,7 +409,7 @@
@$(java-vm-cleanup)
# Meta-index construction to make core class loaders lazier
-@@ -951,19 +972,6 @@
+@@ -944,19 +965,6 @@
@$(java-vm-cleanup)
$(CP) $(LIBDIR)/tools.jar $(JDK_IMAGE_DIR)/lib/tools.jar
@#
@@ -429,7 +429,7 @@
@# CORBA supported orb.idl and ir.idl should be copied to lib
@#
$(CP) $(LIBDIR)/orb.idl $(JDK_IMAGE_DIR)/lib/orb.idl
-@@ -1040,16 +1048,6 @@
+@@ -1033,16 +1041,6 @@
$(CP) $(PLATFORM_SRC)/bin/java_md.h $(JDK_IMAGE_DIR)/src/launcher
$(CD) $(JDK_IMAGE_DIR)/src && $(ZIPEXE) -qr ../src.zip *
$(RM) -r $(JDK_IMAGE_DIR)/src
@@ -447,8 +447,8 @@
$(call copy-man-pages,$(JDK_IMAGE_DIR),$(JDK_MAN_PAGES))
endif # !windows
diff -Nru openjdk-ecj.orig/jdk/make/common/Rules.gmk openjdk-ecj/jdk/make/common/Rules.gmk
---- openjdk-ecj.orig/jdk/make/common/Rules.gmk 2008-10-09 08:45:42.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/Rules.gmk 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/common/Rules.gmk 2009-02-05 08:44:12.000000000 +0000
++++ openjdk-ecj/jdk/make/common/Rules.gmk 2009-02-10 19:24:54.000000000 +0000
@@ -237,8 +237,9 @@
$(ECHO) "# Java sources to be compiled: (listed in file $<)"; \
$(CAT) $<.filtered; \
@@ -475,8 +475,8 @@
@$(TOUCH) $@
diff -Nru openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk openjdk-ecj/jdk/make/common/shared/Defs-java.gmk
---- openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk 2008-10-24 10:16:06.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk 2009-02-10 18:12:00.000000000 +0000
++++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk 2009-02-10 19:24:54.000000000 +0000
@@ -121,30 +121,19 @@
JAVACFLAGS += $(OTHER_JAVACFLAGS)
@@ -510,8 +510,8 @@
# Override of what javac to use (see deploy workspace)
diff -Nru openjdk-ecj.orig/jdk/make/java/nio/Makefile openjdk-ecj/jdk/make/java/nio/Makefile
---- openjdk-ecj.orig/jdk/make/java/nio/Makefile 2008-10-09 08:45:42.000000000 +0100
-+++ openjdk-ecj/jdk/make/java/nio/Makefile 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/java/nio/Makefile 2009-02-05 08:44:13.000000000 +0000
++++ openjdk-ecj/jdk/make/java/nio/Makefile 2009-02-10 19:24:54.000000000 +0000
@@ -31,7 +31,7 @@
PACKAGE = java.nio
LIBRARY = nio
@@ -522,8 +522,8 @@
NIO_SRC = $(SHARE_SRC)/classes/java/nio
diff -Nru openjdk-ecj.orig/jdk/make/java/text/Makefile openjdk-ecj/jdk/make/java/text/Makefile
---- openjdk-ecj.orig/jdk/make/java/text/Makefile 2008-10-09 08:45:42.000000000 +0100
-+++ openjdk-ecj/jdk/make/java/text/Makefile 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/java/text/Makefile 2009-02-05 08:44:13.000000000 +0000
++++ openjdk-ecj/jdk/make/java/text/Makefile 2009-02-10 19:24:54.000000000 +0000
@@ -80,8 +80,8 @@
-sourcepath $(TEXT_SRCDIR) \
$(TEXT_SOURCES)
@@ -536,8 +536,8 @@
-spec $(UNICODEDATA)/UnicodeData.txt
@$(java-vm-cleanup)
diff -Nru openjdk-ecj.orig/jdk/make/Makefile openjdk-ecj/jdk/make/Makefile
---- openjdk-ecj.orig/jdk/make/Makefile 2008-10-09 08:45:41.000000000 +0100
-+++ openjdk-ecj/jdk/make/Makefile 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/Makefile 2009-02-05 08:44:12.000000000 +0000
++++ openjdk-ecj/jdk/make/Makefile 2009-02-10 19:24:54.000000000 +0000
@@ -239,7 +239,7 @@
all build:: sanity-all post-sanity-all
@@ -548,8 +548,8 @@
$(SUBDIRS-loop)
diff -Nru openjdk-ecj.orig/jdk/make/sun/awt/FILES_export_unix.gmk openjdk-ecj/jdk/make/sun/awt/FILES_export_unix.gmk
---- openjdk-ecj.orig/jdk/make/sun/awt/FILES_export_unix.gmk 2008-10-09 08:45:43.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/awt/FILES_export_unix.gmk 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/sun/awt/FILES_export_unix.gmk 2009-02-05 08:44:14.000000000 +0000
++++ openjdk-ecj/jdk/make/sun/awt/FILES_export_unix.gmk 2009-02-10 19:24:54.000000000 +0000
@@ -188,3 +188,5 @@
java/awt/dnd/DnDConstants.java \
sun/awt/CausedFocusEvent.java
@@ -557,8 +557,8 @@
+EXPORTED_inner = \
+ sun.java2d.opengl.OGLContext$$OGLContextCaps
diff -Nru openjdk-ecj.orig/jdk/make/sun/awt/Makefile openjdk-ecj/jdk/make/sun/awt/Makefile
---- openjdk-ecj.orig/jdk/make/sun/awt/Makefile 2008-10-09 08:45:43.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/awt/Makefile 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/sun/awt/Makefile 2009-02-05 08:44:14.000000000 +0000
++++ openjdk-ecj/jdk/make/sun/awt/Makefile 2009-02-10 19:24:54.000000000 +0000
@@ -395,10 +395,9 @@
COMPILEFONTCONFIG_JARFILE = $(BUILDTOOLJARDIR)/compilefontconfig.jar
@@ -574,8 +574,8 @@
fontconfigs.clean :
diff -Nru openjdk-ecj.orig/jdk/make/sun/javazic/Makefile openjdk-ecj/jdk/make/sun/javazic/Makefile
---- openjdk-ecj.orig/jdk/make/sun/javazic/Makefile 2008-10-09 08:45:43.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/javazic/Makefile 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/sun/javazic/Makefile 2009-02-05 08:44:14.000000000 +0000
++++ openjdk-ecj/jdk/make/sun/javazic/Makefile 2009-02-10 19:24:54.000000000 +0000
@@ -62,7 +62,8 @@
$(WORKDIR)/$(MAPFILE): $(BUILDTOOLJARDIR)/javazic.jar $(TZFILES)
$(RM) -r $(@D)
@@ -587,8 +587,8 @@
$(INSTALLDIR)/$(MAPFILE): $(WORKDIR)/$(MAPFILE)
diff -Nru openjdk-ecj.orig/jdk/make/sun/text/Makefile openjdk-ecj/jdk/make/sun/text/Makefile
---- openjdk-ecj.orig/jdk/make/sun/text/Makefile 2008-10-09 08:45:44.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/text/Makefile 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/sun/text/Makefile 2009-02-05 08:44:14.000000000 +0000
++++ openjdk-ecj/jdk/make/sun/text/Makefile 2009-02-10 19:24:54.000000000 +0000
@@ -85,8 +85,9 @@
$(BOOT_JAVAC_CMD) -d $(TEXT_CLASSES) \
-sourcepath $(TEXT_SRCDIR) \
@@ -602,8 +602,8 @@
-spec $(UNICODEDATA)/UnicodeData.txt \
-language th
diff -Nru openjdk-ecj.orig/jdk/make/sun/xawt/Makefile openjdk-ecj/jdk/make/sun/xawt/Makefile
---- openjdk-ecj.orig/jdk/make/sun/xawt/Makefile 2008-10-09 08:45:44.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/xawt/Makefile 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/sun/xawt/Makefile 2009-02-10 18:12:01.000000000 +0000
++++ openjdk-ecj/jdk/make/sun/xawt/Makefile 2009-02-10 19:24:54.000000000 +0000
@@ -276,11 +276,7 @@
TEMPDIR_CLASSES = $(TEMPDIR)/classes
@@ -641,8 +641,8 @@
done
$(TOUCH) $@
diff -Nru openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java
---- openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2008-10-24 10:16:45.000000000 +0100
-+++ openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2009-02-10 18:11:22.000000000 +0000
++++ openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2009-02-10 19:24:54.000000000 +0000
@@ -647,9 +647,6 @@
throws FileNotFoundException, IOException {
BufferedReader in = new BufferedReader(new FileReader(theTemplateFileName));
@@ -662,8 +662,8 @@
if (plane == 0 && bLatin1 == false) {
genCaseMapTableDeclaration(result);
diff -Nru openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java openjdk-ecj/jdk/src/share/classes/java/lang/Double.java
---- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java 2008-10-24 10:16:33.000000000 +0100
-+++ openjdk-ecj/jdk/src/share/classes/java/lang/Double.java 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java 2009-02-10 18:11:12.000000000 +0000
++++ openjdk-ecj/jdk/src/share/classes/java/lang/Double.java 2009-02-10 19:24:54.000000000 +0000
@@ -76,7 +76,7 @@
* {@code 0x1.fffffffffffffP+1023} and also equal to
* {@code Double.longBitsToDouble(0x7fefffffffffffffL)}.
@@ -692,8 +692,8 @@
/**
* Maximum exponent a finite {@code double} variable may have.
diff -Nru openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java openjdk-ecj/jdk/src/share/classes/java/lang/Float.java
---- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java 2008-10-24 10:16:33.000000000 +0100
-+++ openjdk-ecj/jdk/src/share/classes/java/lang/Float.java 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java 2009-02-10 18:11:12.000000000 +0000
++++ openjdk-ecj/jdk/src/share/classes/java/lang/Float.java 2009-02-10 19:24:54.000000000 +0000
@@ -76,7 +76,7 @@
* {@code 0x1.fffffeP+127f} and also equal to
* {@code Float.intBitsToFloat(0x7f7fffff)}.
@@ -722,8 +722,8 @@
/**
* Maximum exponent a finite {@code float} variable may have. It
diff -Nru openjdk-ecj.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h openjdk-ecj/jdk/src/share/native/sun/java2d/opengl/OGLContext.h
---- openjdk-ecj.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2008-10-09 08:46:24.000000000 +0100
-+++ openjdk-ecj/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-02-05 08:44:52.000000000 +0000
++++ openjdk-ecj/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-02-10 19:24:54.000000000 +0000
@@ -27,6 +27,7 @@
#define OGLContext_h_Included
@@ -789,49 +789,44 @@
/**
* Evaluates to true if the given capability bitmask is present for the
diff -Nru openjdk-ecj.orig/langtools/make/build.xml openjdk-ecj/langtools/make/build.xml
---- openjdk-ecj.orig/langtools/make/build.xml 2008-10-09 08:47:11.000000000 +0100
-+++ openjdk-ecj/langtools/make/build.xml 2008-10-24 13:32:48.000000000 +0100
-@@ -498,7 +498,10 @@
+--- openjdk-ecj.orig/langtools/make/build.xml 2009-02-05 08:45:36.000000000 +0000
++++ openjdk-ecj/langtools/make/build.xml 2009-02-10 19:56:00.000000000 +0000
+@@ -502,7 +502,9 @@
includes="@{includes}"
sourcepath=""
includeAntRuntime="no"
- target="@{javac.target}">
+ target="@{javac.target}"
-+ executable="${javac.executable}"
+ source="1.5">
+ <compilerarg line="-bootclasspath @{classes.dir}:../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar"/>
<compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
<compilerarg line="${javac.version.opt}"/>
<compilerarg line="-Xlint"/>
-@@ -512,7 +515,10 @@
+@@ -517,7 +519,9 @@
includeAntRuntime="no"
target="@{javac.target}"
debug="${javac.debug}"
- debuglevel="${javac.debuglevel}">
-+ executable="${javac.executable}"
+ debuglevel="${javac.debuglevel}"
+ source="1.5">
+ <compilerarg line="-bootclasspath @{classes.dir}:../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar"/>
<compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
<compilerarg value="-Xbootclasspath/p:@{classes.dir}"/>
<compilerarg line="${javac.no.jdk.warnings}"/>
-@@ -563,8 +569,11 @@
- <target name="-def-pcompile">
- <mkdir dir="${build.toolclasses.dir}"/>
- <javac srcdir="${make.tools.dir}/CompileProperties"
-+ fork="true"
+@@ -571,7 +575,8 @@
+ executable="${boot.java.home}/bin/javac"
+ srcdir="${make.tools.dir}/CompileProperties"
destdir="${build.toolclasses.dir}/"
- classpath="${ant.home}/lib/ant.jar"/>
+ classpath="${ant.home}/lib/ant.jar"
-+ executable="${javac.executable}"
-+ source="1.5"/>
++ source="1.5" />
<taskdef name="pcompile"
classname="CompilePropertiesTask"
classpath="${build.toolclasses.dir}/"/>
diff -Nru openjdk-ecj.orig/langtools/make/Makefile openjdk-ecj/langtools/make/Makefile
---- openjdk-ecj.orig/langtools/make/Makefile 2008-10-24 10:16:06.000000000 +0100
-+++ openjdk-ecj/langtools/make/Makefile 2008-10-24 13:32:48.000000000 +0100
-@@ -108,7 +108,7 @@
+--- openjdk-ecj.orig/langtools/make/Makefile 2009-02-10 18:12:00.000000000 +0000
++++ openjdk-ecj/langtools/make/Makefile 2009-02-10 19:24:54.000000000 +0000
+@@ -112,7 +112,7 @@
ifdef ALT_BOOTDIR
ANT_OPTIONS += -Dboot.java.home=$(ALT_BOOTDIR)
@@ -841,8 +836,8 @@
ifdef ALT_OUTPUTDIR
diff -Nru openjdk-ecj.orig/make/jdk-rules.gmk openjdk-ecj/make/jdk-rules.gmk
---- openjdk-ecj.orig/make/jdk-rules.gmk 2008-10-24 10:16:06.000000000 +0100
-+++ openjdk-ecj/make/jdk-rules.gmk 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/make/jdk-rules.gmk 2009-02-10 18:12:00.000000000 +0000
++++ openjdk-ecj/make/jdk-rules.gmk 2009-02-10 19:24:54.000000000 +0000
@@ -58,7 +58,7 @@
endif
diff -r 5a2104fb2256 patches/icedtea-copy-plugs.patch
--- a/patches/icedtea-copy-plugs.patch Wed Feb 04 11:49:31 2009 +0000
+++ b/patches/icedtea-copy-plugs.patch Tue Feb 10 20:30:15 2009 +0000
@@ -1,7 +1,7 @@
diff -Nru openjdk.orig/jdk/make/common/internal/BinaryPlugs.gmk openjdk/jdk/make/common/internal/BinaryPlugs.gmk
---- openjdk.orig/jdk/make/common/internal/BinaryPlugs.gmk 2008-08-14 08:42:49.000000000 +0100
-+++ openjdk/jdk/make/common/internal/BinaryPlugs.gmk 2008-08-20 22:56:55.000000000 +0100
-@@ -147,6 +147,21 @@
+--- openjdk.orig/jdk/make/common/internal/BinaryPlugs.gmk 2009-02-05 08:44:12.000000000 +0000
++++ openjdk/jdk/make/common/internal/BinaryPlugs.gmk 2009-02-10 15:49:40.000000000 +0000
+@@ -93,11 +93,32 @@
@for i in $(PLUG_JMF_CLASS_NAMES) ; do \
$(ECHO) "$$i" >> $@; \
done
@@ -20,12 +20,10 @@
+ @for i in $(PLUG_NETX_CLASS_NAMES) ; do \
+ $(ECHO) "$$i" >> $@ ; \
+ done
- $(PLUG_TEMPDIR)/sound.clist:
+ $(PLUG_TEMPDIR)/all.clist: $(PLUG_CLISTS)
@$(prep-target)
- @for i in $(PLUG_SOUND_CLASS_NAMES) ; do \
-@@ -159,6 +174,12 @@
- $(plug-create-jargs)
- $(PLUG_TEMPDIR)/sound.jargs: $(PLUG_TEMPDIR)/sound.clist
+ $(CAT) $(PLUG_CLISTS) > $@
+ $(PLUG_TEMPDIR)/jmf.jargs: $(PLUG_TEMPDIR)/jmf.clist
$(plug-create-jargs)
+$(PLUG_TEMPDIR)/gnu.jargs: $(PLUG_TEMPDIR)/gnu.clist
+ $(plug-create-jargs)
@@ -36,7 +34,7 @@
$(PLUG_TEMPDIR)/all.jargs: $(PLUG_TEMPDIR)/all.clist
$(plug-create-jargs)
-@@ -183,9 +204,9 @@
+@@ -122,9 +143,9 @@
# Import classes command
define import-binary-plug-classes
@@ -49,9 +47,9 @@
endef # import-binary-plug-classes
diff -Nru openjdk.orig/jdk/src/share/classes/java/beans/MetaData.java openjdk/jdk/src/share/classes/java/beans/MetaData.java
---- openjdk.orig/jdk/src/share/classes/java/beans/MetaData.java 2008-08-14 08:43:00.000000000 +0100
-+++ openjdk/jdk/src/share/classes/java/beans/MetaData.java 2008-08-20 22:55:35.000000000 +0100
-@@ -1463,7 +1463,7 @@
+--- openjdk.orig/jdk/src/share/classes/java/beans/MetaData.java 2009-02-10 02:25:40.000000000 +0000
++++ openjdk/jdk/src/share/classes/java/beans/MetaData.java 2009-02-10 15:45:15.000000000 +0000
+@@ -1475,7 +1475,7 @@
}
private static String[] getAnnotationValue(Constructor<?> constructor) {
diff -r 5a2104fb2256 patches/icedtea-directaudio-close-trick.patch
--- a/patches/icedtea-directaudio-close-trick.patch Wed Feb 04 11:49:31 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,193 +0,0 @@
---- /home/mark/src/openjdk/jdk/src/share/classes/com/sun/media/sound/DirectAudioDevice.java 2008-04-13 01:05:30.000000000 +0200
-+++ openjdk/jdk/src/share/classes/com/sun/media/sound/DirectAudioDevice.java 2008-05-09 02:18:21.000000000 +0200
-@@ -394,7 +394,12 @@
- private float leftGain, rightGain;
- protected volatile boolean noService = false; // do not run the nService method
-
-+ // Guards all native calls.
- protected Object lockNative = new Object();
-+ // Guards the lastOpened static variable in implOpen and implClose.
-+ protected static Object lockLast = new Object();
-+ // Keeps track of last opened line, see implOpen "trick".
-+ protected static DirectDL lastOpened;
-
- // CONSTRUCTOR
- protected DirectDL(DataLine.Info info,
-@@ -496,20 +501,47 @@
- // align buffer to full frames
- bufferSize = ((int) bufferSize / format.getFrameSize()) * format.getFrameSize();
-
-- id = nOpen(mixerIndex, deviceID, isSource,
-- encoding,
-- hardwareFormat.getSampleRate(),
-- hardwareFormat.getSampleSizeInBits(),
-- hardwareFormat.getFrameSize(),
-- hardwareFormat.getChannels(),
-- hardwareFormat.getEncoding().equals(AudioFormat.Encoding.PCM_SIGNED),
-- hardwareFormat.isBigEndian(),
-- bufferSize);
-+ synchronized(lockLast) {
-+ id = nOpen(mixerIndex, deviceID, isSource,
-+ encoding,
-+ hardwareFormat.getSampleRate(),
-+ hardwareFormat.getSampleSizeInBits(),
-+ hardwareFormat.getFrameSize(),
-+ hardwareFormat.getChannels(),
-+ hardwareFormat.getEncoding().equals(AudioFormat.Encoding.PCM_SIGNED),
-+ hardwareFormat.isBigEndian(),
-+ bufferSize);
-+
-+ if (id == 0) {
-+ // Bah... Dirty trick. The most likely cause is an application
-+ // already having a line open for this particular hardware
-+ // format and forgetting about it. If so, silently close that
-+ // implementation and try again. Unfortuantely we can only
-+ // open one line per hardware format currently.
-+ if (lastOpened != null
-+ && hardwareFormat.matches(lastOpened.hardwareFormat)) {
-+ lastOpened.implClose();
-+ lastOpened = null;
-+
-+ id = nOpen(mixerIndex, deviceID, isSource,
-+ encoding,
-+ hardwareFormat.getSampleRate(),
-+ hardwareFormat.getSampleSizeInBits(),
-+ hardwareFormat.getFrameSize(),
-+ hardwareFormat.getChannels(),
-+ hardwareFormat.getEncoding().equals(AudioFormat.Encoding.PCM_SIGNED),
-+ hardwareFormat.isBigEndian(),
-+ bufferSize);
-+ }
-+
-+ if (id == 0) {
-+ // TODO: nicer error messages...
-+ throw new LineUnavailableException("line with format "+format+" not supported.");
-+ }
-+ }
-+ lastOpened = this;
-+ }
-
-- if (id == 0) {
-- // TODO: nicer error messages...
-- throw new LineUnavailableException("line with format "+format+" not supported.");
-- }
- this.bufferSize = nGetBufferSize(id, isSource);
- if (this.bufferSize < 1) {
- // this is an error!
-@@ -580,12 +612,12 @@
- }
- synchronized (lockNative) {
- nStop(id, isSource);
-- }
-
-- // need to set doIO to false before notifying the
-- // read/write thread, that's why isStartedRunning()
-- // cannot be used
-- doIO = false;
-+ // need to set doIO to false before notifying the
-+ // read/write thread, that's why isStartedRunning()
-+ // cannot be used
-+ doIO = false;
-+ }
- // wake up any waiting threads
- synchronized(lock) {
- lock.notifyAll();
-@@ -614,8 +646,12 @@
- doIO = false;
- long oldID = id;
- id = 0;
-- synchronized (lockNative) {
-- nClose(oldID, isSource);
-+ synchronized (lockLast) {
-+ synchronized (lockNative) {
-+ nClose(oldID, isSource);
-+ if (lastOpened == this)
-+ lastOpened = null;
-+ }
- }
- bytePosition = 0;
- softwareConversionSize = 0;
-@@ -630,7 +666,8 @@
- }
- int a = 0;
- synchronized (lockNative) {
-- a = nAvailable(id, isSource);
-+ if (doIO)
-+ a = nAvailable(id, isSource);
- }
- return a;
- }
-@@ -644,9 +681,9 @@
- int counter = 0;
- long startPos = getLongFramePosition();
- boolean posChanged = false;
-- while (!drained && doIO) {
-+ while (!drained) {
- synchronized (lockNative) {
-- if ((id == 0) || !nIsStillDraining(id, isSource))
-+ if ((id == 0) || (!doIO) || !nIsStillDraining(id, isSource))
- break;
- }
- // check every now and then for a new position
-@@ -686,7 +723,7 @@
- lock.notifyAll();
- }
- synchronized (lockNative) {
-- if (id != 0) {
-+ if (id != 0 && doIO) {
- // then flush native buffers
- nFlush(id, isSource);
- }
-@@ -697,9 +734,10 @@
-
- // replacement for getFramePosition (see AbstractDataLine)
- public long getLongFramePosition() {
-- long pos;
-+ long pos = 0;
- synchronized (lockNative) {
-- pos = nGetBytePosition(id, isSource, bytePosition);
-+ if (doIO)
-+ pos = nGetBytePosition(id, isSource, bytePosition);
- }
- // hack because ALSA sometimes reports wrong framepos
- if (pos < 0) {
-@@ -745,11 +783,12 @@
- }
- int written = 0;
- while (!flushing) {
-- int thisWritten;
-+ int thisWritten = 0;
- synchronized (lockNative) {
-- thisWritten = nWrite(id, b, off, len,
-- softwareConversionSize,
-- leftGain, rightGain);
-+ if (doIO)
-+ thisWritten = nWrite(id, b, off, len,
-+ softwareConversionSize,
-+ leftGain, rightGain);
- if (thisWritten < 0) {
- // error in native layer
- break;
-@@ -972,9 +1011,10 @@
- }
- int read = 0;
- while (doIO && !flushing) {
-- int thisRead;
-+ int thisRead = 0;
- synchronized (lockNative) {
-- thisRead = nRead(id, b, off, len, softwareConversionSize);
-+ if (doIO)
-+ thisRead = nRead(id, b, off, len, softwareConversionSize);
- if (thisRead < 0) {
- // error in native layer
- break;
-@@ -1209,7 +1249,8 @@
- // set new native position (if necessary)
- // this must come after the flush!
- synchronized (lockNative) {
-- nSetBytePosition(id, isSource, frames * frameSize);
-+ if (doIO)
-+ nSetBytePosition(id, isSource, frames * frameSize);
- }
-
- if (Printer.debug) Printer.debug(" DirectClip.setFramePosition: "
diff -r 5a2104fb2256 patches/icedtea-enum-bug-181.patch
--- a/patches/icedtea-enum-bug-181.patch Wed Feb 04 11:49:31 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- openjdkold/jdk/src/share/classes/sun/beans/editors/EnumEditor.java 2008-07-10 15:57:13.000000000 -0400
-+++ openjdk/jdk/src/share/classes/sun/beans/editors/EnumEditor.java 2008-08-11 15:07:05.000000000 -0400
-@@ -67,7 +67,7 @@
- }
-
- public void setValue( Object value ) {
-- if ( ( value != null ) && ( this.type != value.getClass() ) ) {
-+ if ( ( value != null ) && ! ( this.type.isInstance( value ) ) ) {
- throw new IllegalArgumentException( "Unsupported value: " + value );
- }
- Object oldValue;
diff -r 5a2104fb2256 patches/icedtea-jsoundhs.patch
--- a/patches/icedtea-jsoundhs.patch Wed Feb 04 11:49:31 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-diff -Nru openjdk.orig/jdk/make/common/internal/BinaryPlugs.gmk openjdk/jdk/make/common/internal/BinaryPlugs.gmk
---- openjdk.orig/jdk/make/common/internal/BinaryPlugs.gmk 2008-07-13 03:42:22.000000000 +0100
-+++ openjdk/jdk/make/common/internal/BinaryPlugs.gmk 2008-07-13 03:41:56.000000000 +0100
-@@ -27,16 +27,6 @@
-
- # Definitions for openjdk plugs (used by both import and export)
-
--# Names of native shared libraries
--
--PLUG_JSOUND_LIBRARY=$(LIB_PREFIX)jsoundhs.$(LIBRARY_SUFFIX)
--PLUG_LIBRARY_NAMES = \
-- $(PLUG_JSOUND_LIBRARY)
--
--# Sub-directory where native shared libraries are located (e.g. jre/bin or...)
--
--PLUG_LOCATION_SUBDIR=$(ARCH_VM_SUBDIR)
--
- # Explicit classfile lists
-
- # WARNING: These classlists will not work with pattern rules, only used in
-@@ -222,17 +212,6 @@
- import-binary-plug-jmf-classes \
- import-binary-plug-sound-classes
-
--# Import native libraries
--
--$(LIB_LOCATION)/$(PLUG_JSOUND_LIBRARY): \
-- $(PLUG_IMPORT_DIR)/$(PLUG_LOCATION_SUBDIR)/$(PLUG_JSOUND_LIBRARY)
-- $(import-binary-plug-file)
--
--# Rules only used by lower level makefiles
--
--import-binary-plug-jsound-library: \
-- $(LIB_LOCATION)/$(PLUG_JSOUND_LIBRARY)
--
- # Binary plug start/complete messages
-
- import-binary-plugs-started:
-diff -Nru openjdk.orig/jdk/make/javax/sound/Makefile openjdk/jdk/make/javax/sound/Makefile
---- openjdk.orig/jdk/make/javax/sound/Makefile 2008-07-13 03:42:40.000000000 +0100
-+++ openjdk/jdk/make/javax/sound/Makefile 2008-07-13 03:41:22.000000000 +0100
-@@ -96,11 +96,6 @@
-
-
- #
--# add "closed" library
--#
--SUBDIRS += jsoundhs
--
--#
- # system dependent flags
- #
- ifeq ($(PLATFORM), windows)
-diff -uNr openjdk-orig/jdk/src/share/classes/com/sun/media/sound/Platform.java openjdk/jdk/src/share/classes/com/sun/media/sound/Platform.java
---- openjdk-orig/jdk/src/share/classes/com/sun/media/sound/Platform.java 2008-11-07 10:38:15.000000000 -0500
-+++ openjdk/jdk/src/share/classes/com/sun/media/sound/Platform.java 2008-11-07 10:43:21.000000000 -0500
-@@ -42,7 +42,6 @@
-
- // native library we need to load
- private static final String libNameMain = "jsound";
-- private static final String libNameMain2 = "jsoundhs";
-
- private static final String libNameALSA = "jsoundalsa";
- private static final String libNameDSound = "jsoundds";
-@@ -160,7 +159,6 @@
- try {
- // load the main libraries
- JSSecurityManager.loadLibrary(libNameMain);
-- JSSecurityManager.loadLibrary(libNameMain2);
- // just for the heck of it...
- loadedLibs |= LIB_MAIN;
- } catch (SecurityException e) {
-
diff -r 5a2104fb2256 patches/icedtea-sound.patch
--- a/patches/icedtea-sound.patch Wed Feb 04 11:49:31 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,693 +0,0 @@
-diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java openjdk/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java
---- openjdk.orig/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java 2008-11-13 18:27:19.000000000 +0000
-+++ openjdk/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java 2008-11-13 18:27:03.000000000 +0000
-@@ -586,7 +586,6 @@
-
- private ArrayList<Transmitter> transmitters = new ArrayList<Transmitter>();
- private MidiOutDevice.MidiOutReceiver midiOutReceiver;
-- private MixerSynth.SynthReceiver mixerSynthReceiver;
-
- // how many transmitters must be present for optimized
- // handling
-@@ -621,22 +620,14 @@
- if (midiOutReceiver == oldR) {
- midiOutReceiver = null;
- }
-- if (mixerSynthReceiver == oldR) {
-- mixerSynthReceiver = null;
-- }
- if (newR != null) {
- if ((newR instanceof MidiOutDevice.MidiOutReceiver)
- && (midiOutReceiver == null)) {
- midiOutReceiver = ((MidiOutDevice.MidiOutReceiver) newR);
- }
-- if ((newR instanceof MixerSynth.SynthReceiver)
-- && (mixerSynthReceiver == null)) {
-- mixerSynthReceiver = ((MixerSynth.SynthReceiver) newR);
-- }
- }
- optimizedReceiverCount =
-- ((midiOutReceiver!=null)?1:0)
-- + ((mixerSynthReceiver!=null)?1:0);
-+ ((midiOutReceiver!=null)?1:0);
- }
- // more potential for optimization here
- }
-@@ -670,10 +661,6 @@
- if (TRACE_TRANSMITTER) Printer.println("Sending packed message to MidiOutReceiver");
- midiOutReceiver.sendPackedMidiMessage(packedMessage, timeStamp);
- }
-- if (mixerSynthReceiver != null) {
-- if (TRACE_TRANSMITTER) Printer.println("Sending packed message to MixerSynthReceiver");
-- mixerSynthReceiver.sendPackedMidiMessage(packedMessage, timeStamp);
-- }
- } else {
- if (TRACE_TRANSMITTER) Printer.println("Sending packed message to "+size+" transmitter's receivers");
- for (int i = 0; i < size; i++) {
-@@ -682,9 +669,6 @@
- if (optimizedReceiverCount > 0) {
- if (receiver instanceof MidiOutDevice.MidiOutReceiver) {
- ((MidiOutDevice.MidiOutReceiver) receiver).sendPackedMidiMessage(packedMessage, timeStamp);
-- }
-- else if (receiver instanceof MixerSynth.SynthReceiver) {
-- ((MixerSynth.SynthReceiver) receiver).sendPackedMidiMessage(packedMessage, timeStamp);
- } else {
- receiver.send(new FastShortMessage(packedMessage), timeStamp);
- }
-@@ -739,10 +723,6 @@
- if (TRACE_TRANSMITTER) Printer.println("Sending MIDI message to MidiOutReceiver");
- midiOutReceiver.send(message, timeStamp);
- }
-- if (mixerSynthReceiver != null) {
-- if (TRACE_TRANSMITTER) Printer.println("Sending MIDI message to MixerSynthReceiver");
-- mixerSynthReceiver.send(message, timeStamp);
-- }
- } else {
- if (TRACE_TRANSMITTER) Printer.println("Sending MIDI message to "+size+" transmitter's receivers");
- for (int i = 0; i < size; i++) {
-diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java openjdk/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java
---- openjdk.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2008-11-13 18:27:30.000000000 +0000
-+++ openjdk/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2008-11-13 18:26:52.000000000 +0000
-@@ -56,7 +56,7 @@
-
-
- /** if true, we bridge RMF files over to the old MixerSequencer */
-- private final static boolean RMF = true;
-+ private final static boolean RMF = false;
-
- /**
- * Event Dispatcher thread. Should be using a shared event
-@@ -145,9 +145,6 @@
- private ArrayList controllerEventListeners = new ArrayList();
-
-
-- /** for RMF media we need the RMF sequencer */
-- private MixerSequencer seqBridge = null;
--
- /** automatic connection support */
- private boolean autoConnect = false;
-
-@@ -221,10 +218,6 @@
- }
- }
- if (RMF) {
-- if (seqBridge != null) {
-- seqBridge.close();
-- seqBridge = null;
-- }
- // if previous file was an RMF, but this file is not RMF,
- // then need to call implOpen again!
- if (isOpen() && sequence != null && playThread == null) {
-@@ -255,44 +248,6 @@
- int type = fileFormat.getType();
- int resolution = fileFormat.getResolution();
- if (Printer.debug) Printer.debug("Got file with type="+type+" and resolution="+resolution);
-- if (resolution == MidiFileFormat.UNKNOWN_LENGTH) {
-- // seems to be RMF
-- if (seqBridge == null) {
-- try {
-- seqBridge = new MixerSequencer();
-- if (isOpen()) {
-- seqBridge.open();
-- }
-- } catch (MidiUnavailableException mue) {
-- // uhum, strange situation. Need to cast to InvalidMidiDataException
-- throw new InvalidMidiDataException(mue.getMessage());
-- }
-- }
-- seqBridge.setSequence(stream);
-- // propagate state
-- seqBridge.setTempoFactor(getTempoFactor());
--
-- // propagate listeners
-- synchronized(metaEventListeners) {
-- for (int i = 0 ; i < metaEventListeners.size(); i++) {
-- seqBridge.addMetaEventListener((MetaEventListener) (metaEventListeners.get(i)));
-- }
-- }
-- synchronized(controllerEventListeners) {
-- for (int i = 0 ; i < controllerEventListeners.size(); i++) {
-- ControllerListElement cve = (ControllerListElement) (controllerEventListeners.get(i));
-- seqBridge.addControllerEventListener(cve.listener, cve.controllers);
-- }
-- }
-- // disable the current sequence of RealTimeSequencer
-- //setSequence((Sequence) null); -> will remove bridge again!
-- this.sequence = null;
-- return;
-- }
-- if (seqBridge != null) {
-- seqBridge.close();
-- seqBridge = null;
-- }
- }
-
- Sequence seq = MidiSystem.getSequence(stream); // can throw IOException, InvalidMidiDataException
-@@ -305,22 +260,11 @@
-
-
- public Sequence getSequence() {
-- if (RMF) {
-- if (seqBridge != null) {
-- return seqBridge.getSequence();
-- }
-- }
- return sequence;
- }
-
-
- public synchronized void start() {
-- if (RMF) {
-- if (seqBridge != null) {
-- seqBridge.start();
-- return;
-- }
-- }
- if (Printer.trace) Printer.trace(">> RealTimeSequencer: start()");
-
- // sequencer not open: throw an exception
-@@ -346,12 +290,6 @@
-
-
- public synchronized void stop() {
-- if (RMF) {
-- if (seqBridge != null) {
-- seqBridge.stop();
-- return;
-- }
-- }
- if (Printer.trace) Printer.trace(">> RealTimeSequencer: stop()");
-
- if (!isOpen()) {
-@@ -373,22 +311,11 @@
-
-
- public boolean isRunning() {
-- if (RMF) {
-- if (seqBridge != null) {
-- return seqBridge.isRunning();
-- }
-- }
- return running;
- }
-
-
- public void startRecording() {
-- if (RMF) {
-- if (seqBridge != null) {
-- seqBridge.startRecording();
-- return;
-- }
-- }
-
- if (!isOpen()) {
- throw new IllegalStateException("Sequencer not open");
-@@ -400,12 +327,6 @@
-
-
- public void stopRecording() {
-- if (RMF) {
-- if (seqBridge != null) {
-- seqBridge.stopRecording();
-- return;
-- }
-- }
-
- if (!isOpen()) {
- throw new IllegalStateException("Sequencer not open");
-@@ -415,22 +336,11 @@
-
-
- public boolean isRecording() {
-- if (RMF) {
-- if (seqBridge != null) {
-- return seqBridge.isRecording();
-- }
-- }
- return recording;
- }
-
-
- public void recordEnable(Track track, int channel) {
-- if (RMF) {
-- if (seqBridge != null) {
-- seqBridge.recordEnable(track, channel);
-- return;
-- }
-- }
-
- if (!findTrack(track)) {
- throw new IllegalArgumentException("Track does not exist in the current sequence");
-@@ -449,12 +359,6 @@
-
-
- public void recordDisable(Track track) {
-- if (RMF) {
-- if (seqBridge != null) {
-- seqBridge.recordDisable(track);
-- return;
-- }
-- }
-
- synchronized(recordingTracks) {
- RecordingTrack rc = RecordingTrack.get(recordingTracks, track);
-@@ -482,11 +386,6 @@
-
-
- public float getTempoInBPM() {
-- if (RMF) {
-- if (seqBridge != null) {
-- return seqBridge.getTempoInBPM();
-- }
-- }
- if (Printer.trace) Printer.trace(">> RealTimeSequencer: getTempoInBPM() ");
-
- return (float) MidiUtils.convertTempo(getTempoInMPQ());
-@@ -494,12 +393,6 @@
-
-
- public void setTempoInBPM(float bpm) {
-- if (RMF) {
-- if (seqBridge != null) {
-- seqBridge.setTempoInBPM(bpm);
-- return;
-- }
-- }
- if (Printer.trace) Printer.trace(">> RealTimeSequencer: setTempoInBPM() ");
- if (bpm <= 0) {
- // should throw IllegalArgumentException
-@@ -511,11 +404,6 @@
-
-
- public float getTempoInMPQ() {
-- if (RMF) {
-- if (seqBridge != null) {
-- return seqBridge.getTempoInMPQ();
-- }
-- }
-
- if (Printer.trace) Printer.trace(">> RealTimeSequencer: getTempoInMPQ() ");
-
-@@ -537,12 +425,6 @@
-
-
- public void setTempoInMPQ(float mpq) {
-- if (RMF) {
-- if (seqBridge != null) {
-- seqBridge.setTempoInMPQ(mpq);
-- return;
-- }
-- }
- if (mpq <= 0) {
- // should throw IllegalArgumentException
- mpq = 1.0f;
-@@ -564,12 +446,6 @@
-
-
- public void setTempoFactor(float factor) {
-- if (RMF) {
-- if (seqBridge != null) {
-- seqBridge.setTempoFactor(factor);
-- return;
-- }
-- }
- if (factor <= 0) {
- // should throw IllegalArgumentException
- return;
-@@ -588,11 +464,6 @@
-
-
- public float getTempoFactor() {
-- if (RMF) {
-- if (seqBridge != null) {
-- return seqBridge.getTempoFactor();
-- }
-- }
- if (Printer.trace) Printer.trace(">> RealTimeSequencer: getTempoFactor() ");
-
- if (needCaching()) {
-@@ -606,11 +477,6 @@
-
-
- public long getTickLength() {
-- if (RMF) {
-- if (seqBridge != null) {
-- return seqBridge.getTickLength();
-- }
-- }
- if (Printer.trace) Printer.trace(">> RealTimeSequencer: getTickLength() ");
-
- if (sequence == null) {
-@@ -622,11 +488,6 @@
-
-
- public synchronized long getTickPosition() {
-- if (RMF) {
-- if (seqBridge != null) {
-- return seqBridge.getTickPosition();
-- }
-- }
- if (Printer.trace) Printer.trace(">> RealTimeSequencer: getTickPosition() ");
-
- if (getDataPump() == null || sequence == null) {
-@@ -638,12 +499,6 @@
-
-
- public synchronized void setTickPosition(long tick) {
-- if (RMF) {
-- if (seqBridge != null) {
-- seqBridge.setTickPosition(tick);
-- return;
-- }
-- }
- if (tick < 0) {
- // should throw IllegalArgumentException
- return;
-@@ -667,11 +522,6 @@
-
-
- public long getMicrosecondLength() {
-- if (RMF) {
-- if (seqBridge != null) {
-- return seqBridge.getMicrosecondLength();
-- }
-- }
-
- if (Printer.trace) Printer.trace(">> RealTimeSequencer: getMicrosecondLength() ");
-
-@@ -684,11 +534,6 @@
-
-
- public long getMicrosecondPosition() {
-- if (RMF) {
-- if (seqBridge != null) {
-- return seqBridge.getMicrosecondPosition();
-- }
-- }
-
- if (Printer.trace) Printer.trace(">> RealTimeSequencer: getMicrosecondPosition() ");
-
-@@ -702,12 +547,6 @@
-
-
- public void setMicrosecondPosition(long microseconds) {
-- if (RMF) {
-- if (seqBridge != null) {
-- seqBridge.setMicrosecondPosition(microseconds);
-- return;
-- }
-- }
-
- if (microseconds < 0) {
- // should throw IllegalArgumentException
-@@ -734,32 +573,16 @@
-
-
- public void setMasterSyncMode(Sequencer.SyncMode sync) {
-- if (RMF) {
-- if (seqBridge != null) {
-- seqBridge.setMasterSyncMode(sync);
-- return;
-- }
-- }
- // not supported
- }
-
-
- public Sequencer.SyncMode getMasterSyncMode() {
-- if (RMF) {
-- if (seqBridge != null) {
-- return seqBridge.getMasterSyncMode();
-- }
-- }
- return masterSyncMode;
- }
-
-
- public Sequencer.SyncMode[] getMasterSyncModes() {
-- if (RMF) {
-- if (seqBridge != null) {
-- return seqBridge.getMasterSyncModes();
-- }
-- }
-
- Sequencer.SyncMode[] returnedModes = new Sequencer.SyncMode[masterSyncModes.length];
- System.arraycopy(masterSyncModes, 0, returnedModes, 0, masterSyncModes.length);
-@@ -768,32 +591,16 @@
-
-
- public void setSlaveSyncMode(Sequencer.SyncMode sync) {
-- if (RMF) {
-- if (seqBridge != null) {
-- seqBridge.setSlaveSyncMode(sync);
-- return;
-- }
-- }
- // not supported
- }
-
-
- public Sequencer.SyncMode getSlaveSyncMode() {
-- if (RMF) {
-- if (seqBridge != null) {
-- return seqBridge.getSlaveSyncMode();
-- }
-- }
- return slaveSyncMode;
- }
-
-
- public Sequencer.SyncMode[] getSlaveSyncModes() {
-- if (RMF) {
-- if (seqBridge != null) {
-- return seqBridge.getSlaveSyncModes();
-- }
-- }
-
- Sequencer.SyncMode[] returnedModes = new Sequencer.SyncMode[slaveSyncModes.length];
- System.arraycopy(slaveSyncModes, 0, returnedModes, 0, slaveSyncModes.length);
-@@ -812,12 +619,6 @@
-
-
- public synchronized void setTrackMute(int track, boolean mute) {
-- if (RMF) {
-- if (seqBridge != null) {
-- seqBridge.setTrackMute(track, mute);
-- return;
-- }
-- }
- int trackCount = getTrackCount();
- if (track < 0 || track >= getTrackCount()) return;
- trackMuted = ensureBoolArraySize(trackMuted, trackCount);
-@@ -829,11 +630,6 @@
-
-
- public synchronized boolean getTrackMute(int track) {
-- if (RMF) {
-- if (seqBridge != null) {
-- return seqBridge.getTrackMute(track);
-- }
-- }
- if (track < 0 || track >= getTrackCount()) return false;
- if (trackMuted == null || trackMuted.length <= track) return false;
- return trackMuted[track];
-@@ -841,12 +637,6 @@
-
-
- public synchronized void setTrackSolo(int track, boolean solo) {
-- if (RMF) {
-- if (seqBridge != null) {
-- seqBridge.setTrackSolo(track, solo);
-- return;
-- }
-- }
- int trackCount = getTrackCount();
- if (track < 0 || track >= getTrackCount()) return;
- trackSolo = ensureBoolArraySize(trackSolo, trackCount);
-@@ -858,11 +648,6 @@
-
-
- public synchronized boolean getTrackSolo(int track) {
-- if (RMF) {
-- if (seqBridge != null) {
-- return seqBridge.getTrackSolo(track);
-- }
-- }
- if (track < 0 || track >= getTrackCount()) return false;
- if (trackSolo == null || trackSolo.length <= track) return false;
- return trackSolo[track];
-@@ -870,12 +655,6 @@
-
-
- public boolean addMetaEventListener(MetaEventListener listener) {
-- if (RMF) {
-- if (seqBridge != null) {
-- seqBridge.addMetaEventListener(listener);
-- // do not return here!
-- }
-- }
- synchronized(metaEventListeners) {
- if (! metaEventListeners.contains(listener)) {
-
-@@ -887,12 +666,6 @@
-
-
- public void removeMetaEventListener(MetaEventListener listener) {
-- if (RMF) {
-- if (seqBridge != null) {
-- seqBridge.removeMetaEventListener(listener);
-- // do not return here!
-- }
-- }
- synchronized(metaEventListeners) {
- int index = metaEventListeners.indexOf(listener);
- if (index >= 0) {
-@@ -903,12 +676,6 @@
-
-
- public int[] addControllerEventListener(ControllerEventListener listener, int[] controllers) {
-- if (RMF) {
-- if (seqBridge != null) {
-- seqBridge.addControllerEventListener(listener, controllers);
-- // do not return here!
-- }
-- }
-
- synchronized(controllerEventListeners) {
-
-@@ -938,12 +705,6 @@
-
-
- public int[] removeControllerEventListener(ControllerEventListener listener, int[] controllers) {
-- if (RMF) {
-- if (seqBridge != null) {
-- seqBridge.removeControllerEventListener(listener, controllers);
-- // do not return here!
-- }
-- }
- synchronized(controllerEventListeners) {
- ControllerListElement cve = null;
- boolean flag = false;
-@@ -973,12 +734,6 @@
- ////////////////// LOOPING (added in 1.5) ///////////////////////
-
- public void setLoopStartPoint(long tick) {
-- if (RMF) {
-- if (seqBridge != null) {
-- seqBridge.setLoopStartPoint(tick);
-- return;
-- }
-- }
- if ((tick > getTickLength())
- || ((loopEnd != -1) && (tick > loopEnd))
- || (tick < 0)) {
-@@ -988,21 +743,10 @@
- }
-
- public long getLoopStartPoint() {
-- if (RMF) {
-- if (seqBridge != null) {
-- return seqBridge.getLoopStartPoint();
-- }
-- }
- return loopStart;
- }
-
- public void setLoopEndPoint(long tick) {
-- if (RMF) {
-- if (seqBridge != null) {
-- seqBridge.setLoopEndPoint(tick);
-- return;
-- }
-- }
- if ((tick > getTickLength())
- || ((loopStart > tick) && (tick != -1))
- || (tick < -1)) {
-@@ -1012,21 +756,10 @@
- }
-
- public long getLoopEndPoint() {
-- if (RMF) {
-- if (seqBridge != null) {
-- return seqBridge.getLoopEndPoint();
-- }
-- }
- return loopEnd;
- }
-
- public void setLoopCount(int count) {
-- if (RMF) {
-- if (seqBridge != null) {
-- seqBridge.setLoopCount(count);
-- return;
-- }
-- }
- if (count != LOOP_CONTINUOUSLY
- && count < 0) {
- throw new IllegalArgumentException("illegal value for loop count: "+count);
-@@ -1038,11 +771,6 @@
- }
-
- public int getLoopCount() {
-- if (RMF) {
-- if (seqBridge != null) {
-- return seqBridge.getLoopCount();
-- }
-- }
- return loopCount;
- }
-
-@@ -1053,13 +781,6 @@
- */
- protected void implOpen() throws MidiUnavailableException {
- if (Printer.trace) Printer.trace(">> RealTimeSequencer: implOpen()");
-- if (RMF) {
-- if (seqBridge != null) {
-- seqBridge.open();
-- if (Printer.trace) Printer.trace("<< RealTimeSequencer: -> called seqBridge.open");
-- return;
-- }
-- }
-
- //openInternalSynth();
-
-@@ -1147,12 +868,7 @@
-
-
- protected synchronized void implClose() {
-- if (RMF) {
-- if (seqBridge != null) {
-- seqBridge.close();
-- // don't return here!
-- }
-- }
-+
- if (Printer.trace) Printer.trace(">> RealTimeSequencer: implClose() ");
-
- if (playThread == null) {
-@@ -1302,12 +1018,6 @@
- // OVERRIDES OF ABSTRACT MIDI DEVICE METHODS
-
- protected boolean hasReceivers() {
-- if (RMF) {
-- if (seqBridge != null) {
-- //RMF does not allow recording
-- return false;
-- }
-- }
- return true;
- }
-
-@@ -1318,12 +1028,6 @@
-
-
- protected boolean hasTransmitters() {
-- if (RMF) {
-- if (seqBridge != null) {
-- //RMF does never allow setting own receivers
-- return false;
-- }
-- }
- return true;
- }
-
More information about the distro-pkg-dev
mailing list