/hg/icedtea7: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Jun 13 13:57:49 UTC 2014
changeset 38b2afc62b2d in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=38b2afc62b2d
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Jun 12 16:27:24 2014 +0100
PR1741: Break PulseAudio provider out into IcedTea-Sound
2014-06-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1741: Break PulseAudio provider out into IcedTea-Sound
* patches/pulse-soundproperties.patch,
* pulseaudio/COPYING,
* pulseaudio/README,
* pulseaudio/src/java/META-INF/services/javax.sound.sampled.spi.MixerProvider,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextEvent.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextListener.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Debug.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Operation.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixerInfo.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixerProvider.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPlaybackLine.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPort.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourcePort.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetPort.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioVolumeControl.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/SecurityWrapper.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/StreamBufferAttributes.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/StreamSampleSpecification.java,
* pulseaudio/src/native/jni-common.c,
* pulseaudio/src/native/jni-common.h,
* pulseaudio/src/native/org_classpath_icedtea_pulseaudio_ContextEvent.c,
* pulseaudio/src/native/org_classpath_icedtea_pulseaudio_EventLoop.c,
* pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Operation.c,
* pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.c,
* pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.c,
* pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c,
* pulseaudio/testsounds/README,
* pulseaudio/unittests/org/classpath/icedtea/pulseaudio/OtherSoundProvidersAvailableTest.java,
* pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioClipTest.java,
* pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioEventLoopOverhead.java,
* pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioMixerProviderTest.java,
* pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioMixerRawTest.java,
* pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioMixerTest.java,
* pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLineRawTest.java,
* pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLineTest.java,
* pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourcePortTest.java,
* pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLineTest.java,
* pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioTargetPortTest.java:
Moved to IcedTea-Sound.
* INSTALL: Remove PulseAudio references.
* Makefile.am:
(PULSE_JAVA_DIR): Removed.
(PULSE_JAVA_NATIVE_SRCDIR): Likewise.
(PULSE_JAVA_NATIVE_SRCS): Likewise.
(PULSE_JAVA_BUILDDIR): Likewise.
(PULSE_JAVA_NATIVE_BUILDDIR): Likewise.
(PULSE_JAVA_NATIVE_OBJECTS): Likewise.
(PULSE_JAVA_JAVA_SRCDIR): Likewise.
(PULSE_JAVA_CLASS_DIR): Likewise.
(PULSE_JAVA_TARGET): Removed.
(ICEDTEA_PATCHES): Drop PulseAudio patch.
(PULSEAUDIO_SRCS): Removed.
(EXTRA_DIST): Removed PULSEAUDIO_SRCS.
(clean-local): Remove clean-add-pulseaudio
and clean-add-pulseaudio-debug.
(.PHONY): Likewise and clean-add-pulseaudio-boot.
(add-pulseaudio): Removed.
(clean-add-pulseaudio): Likewise.
(add-pulseaudio-debug): Likewise.
(clean-add-pulseaudio-debug): Likewise.
(icedtea-stage2): Remove add-pulseaudio dependency.
(icedtea-debug-stage2): Remove add-pulseaudio-debug
dependency.
(add-pulseaudio-boot): Removed.
(clean-add-pulseaudio-boot): Likewise.
(icedtea-stage1): Remove add-pulseaudio-boot debug.
(clean-icedtea-stage1): Remove clean-add-pulseaudio-boot
dependency.
(pulse-java): Removed.
(pulse-java-class): Likewise.
(pulse-java-jar): Likewise.
(pulse-java-headers): Likewise.
($(PULSE_JAVA_NATIVE_BUILDDIR)/%.o): Likewise.
($(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so): Likewise.
(clean-pulse-java): Likewise.
* NEWS: Updated.
* configure.ac:
Remove --enable-pulse-java option and PulseAudio library
checks.
changeset be6a6d7150e5 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=be6a6d7150e5
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Apr 02 20:10:19 2014 +0100
PR1713: Support AArch64 port
2014-03-27 Andrew John Hughes <gnu.andrew at member.fsf.org>
* acinclude.m4:
(IT_ENABLE_ZERO_BUILD): Default to off on aarch64/arm64.
(IT_WITH_HOTSPOT_BUILD): Default to aarch64 port on aarch64.
changeset 87847ca9d356 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=87847ca9d356
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Jun 13 02:02:33 2014 +0100
PR1843: Fail early if there is no native HotSpot JIT & all other options are disabled
2014-06-12 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1843: Fail early if there is no native HotSpot JIT
& all other options are disabled
* acinclude.m4:
(IT_ENABLE_ZERO_BUILD): Depend on
IT_HAS_NATIVE_HOTSPOT_PORT. Split out arch-dependent
code into that macro. Make ENABLE_CACAO test more
readable.
(IT_ENABLE_CACAO): Handle enableval same as other macros
so possible values are only ever yes or no.
(IT_ENABLE_JAMVM): Likewise.
(IT_HAS_NATIVE_HOTSPOT_PORT): Architecture detection
split out from IT_ENABLE_ZERO_BUILD. Now sets
has_native_hotspot_port for later reference.
* configure.ac:
Error out if there is no native HotSpot port and
Zero (which implies Shark & ARM32 JIT), CACAO and
JamVM are all disabled.
diffstat:
ChangeLog | 117 +
INSTALL | 9 -
Makefile.am | 199 +-
NEWS | 2 +
acinclude.m4 | 67 +-
configure.ac | 31 +-
patches/pulse-soundproperties.patch | 16 -
pulseaudio/COPYING | 340 --
pulseaudio/README | 28 -
pulseaudio/src/java/META-INF/services/javax.sound.sampled.spi.MixerProvider | 3 -
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextEvent.java | 104 -
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextListener.java | 50 -
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Debug.java | 114 -
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java | 246 -
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Operation.java | 166 -
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java | 574 ----
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java | 498 ---
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java | 124 -
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java | 792 -----
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixerInfo.java | 62 -
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixerProvider.java | 63 -
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPlaybackLine.java | 87 -
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPort.java | 161 -
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java | 347 --
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourcePort.java | 95 -
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java | 421 --
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetPort.java | 88 -
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioVolumeControl.java | 101 -
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/SecurityWrapper.java | 31 -
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java | 869 ------
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/StreamBufferAttributes.java | 84 -
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/StreamSampleSpecification.java | 70 -
pulseaudio/src/native/jni-common.c | 236 -
pulseaudio/src/native/jni-common.h | 100 -
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_ContextEvent.c | 63 -
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_EventLoop.c | 297 --
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Operation.c | 100 -
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.c | 102 -
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.c | 107 -
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c | 1103 -------
pulseaudio/testsounds/README | 4 -
pulseaudio/testsounds/error.wav | Bin
pulseaudio/testsounds/logout.wav | Bin
pulseaudio/testsounds/startup.wav | Bin
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/OtherSoundProvidersAvailableTest.java | 114 -
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioClipTest.java | 637 ----
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioEventLoopOverhead.java | 100 -
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioMixerProviderTest.java | 118 -
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioMixerRawTest.java | 120 -
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioMixerTest.java | 434 ---
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLineRawTest.java | 299 --
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLineTest.java | 1406 ----------
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourcePortTest.java | 117 -
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLineTest.java | 648 ----
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioTargetPortTest.java | 117 -
55 files changed, 188 insertions(+), 11993 deletions(-)
diffs (truncated from 12603 to 500 lines):
diff -r 1e199b277a83 -r 87847ca9d356 ChangeLog
--- a/ChangeLog Wed Jun 11 02:35:36 2014 +0100
+++ b/ChangeLog Fri Jun 13 02:02:33 2014 +0100
@@ -1,3 +1,120 @@
+2014-06-12 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1843: Fail early if there is no native HotSpot JIT
+ & all other options are disabled
+ * acinclude.m4:
+ (IT_ENABLE_ZERO_BUILD): Depend on
+ IT_HAS_NATIVE_HOTSPOT_PORT. Split out arch-dependent
+ code into that macro. Make ENABLE_CACAO test more
+ readable.
+ (IT_ENABLE_CACAO): Handle enableval same as other macros
+ so possible values are only ever yes or no.
+ (IT_ENABLE_JAMVM): Likewise.
+ (IT_HAS_NATIVE_HOTSPOT_PORT): Architecture detection
+ split out from IT_ENABLE_ZERO_BUILD. Now sets
+ has_native_hotspot_port for later reference.
+ * configure.ac:
+ Error out if there is no native HotSpot port and
+ Zero (which implies Shark & ARM32 JIT), CACAO and
+ JamVM are all disabled.
+
+2014-03-27 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * acinclude.m4:
+ (IT_ENABLE_ZERO_BUILD): Default to off on aarch64/arm64.
+ (IT_WITH_HOTSPOT_BUILD): Default to aarch64 port on aarch64.
+
+2014-06-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1741: Break PulseAudio provider out into IcedTea-Sound
+ * patches/pulse-soundproperties.patch,
+ * pulseaudio/COPYING,
+ * pulseaudio/README,
+ * pulseaudio/src/java/META-INF/services/javax.sound.sampled.spi.MixerProvider,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextEvent.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextListener.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Debug.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Operation.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixerInfo.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixerProvider.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPlaybackLine.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPort.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourcePort.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetPort.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioVolumeControl.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/SecurityWrapper.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/StreamBufferAttributes.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/StreamSampleSpecification.java,
+ * pulseaudio/src/native/jni-common.c,
+ * pulseaudio/src/native/jni-common.h,
+ * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_ContextEvent.c,
+ * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_EventLoop.c,
+ * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Operation.c,
+ * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.c,
+ * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.c,
+ * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c,
+ * pulseaudio/testsounds/README,
+ * pulseaudio/unittests/org/classpath/icedtea/pulseaudio/OtherSoundProvidersAvailableTest.java,
+ * pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioClipTest.java,
+ * pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioEventLoopOverhead.java,
+ * pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioMixerProviderTest.java,
+ * pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioMixerRawTest.java,
+ * pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioMixerTest.java,
+ * pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLineRawTest.java,
+ * pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLineTest.java,
+ * pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourcePortTest.java,
+ * pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLineTest.java,
+ * pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioTargetPortTest.java:
+ Moved to IcedTea-Sound.
+ * INSTALL: Remove PulseAudio references.
+ * Makefile.am:
+ (PULSE_JAVA_DIR): Removed.
+ (PULSE_JAVA_NATIVE_SRCDIR): Likewise.
+ (PULSE_JAVA_NATIVE_SRCS): Likewise.
+ (PULSE_JAVA_BUILDDIR): Likewise.
+ (PULSE_JAVA_NATIVE_BUILDDIR): Likewise.
+ (PULSE_JAVA_NATIVE_OBJECTS): Likewise.
+ (PULSE_JAVA_JAVA_SRCDIR): Likewise.
+ (PULSE_JAVA_CLASS_DIR): Likewise.
+ (PULSE_JAVA_TARGET): Removed.
+ (ICEDTEA_PATCHES): Drop PulseAudio patch.
+ (PULSEAUDIO_SRCS): Removed.
+ (EXTRA_DIST): Removed PULSEAUDIO_SRCS.
+ (clean-local): Remove clean-add-pulseaudio
+ and clean-add-pulseaudio-debug.
+ (.PHONY): Likewise and clean-add-pulseaudio-boot.
+ (add-pulseaudio): Removed.
+ (clean-add-pulseaudio): Likewise.
+ (add-pulseaudio-debug): Likewise.
+ (clean-add-pulseaudio-debug): Likewise.
+ (icedtea-stage2): Remove add-pulseaudio dependency.
+ (icedtea-debug-stage2): Remove add-pulseaudio-debug
+ dependency.
+ (add-pulseaudio-boot): Removed.
+ (clean-add-pulseaudio-boot): Likewise.
+ (icedtea-stage1): Remove add-pulseaudio-boot debug.
+ (clean-icedtea-stage1): Remove clean-add-pulseaudio-boot
+ dependency.
+ (pulse-java): Removed.
+ (pulse-java-class): Likewise.
+ (pulse-java-jar): Likewise.
+ (pulse-java-headers): Likewise.
+ ($(PULSE_JAVA_NATIVE_BUILDDIR)/%.o): Likewise.
+ ($(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so): Likewise.
+ (clean-pulse-java): Likewise.
+ * NEWS: Updated.
+ * configure.ac:
+ Remove --enable-pulse-java option and PulseAudio library
+ checks.
+
2014-06-10 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1833, RH1022017: Report elliptic curves
diff -r 1e199b277a83 -r 87847ca9d356 INSTALL
--- a/INSTALL Wed Jun 11 02:35:36 2014 +0100
+++ b/INSTALL Fri Jun 13 02:02:33 2014 +0100
@@ -33,7 +33,6 @@
libpcsclite (for --enable-system-pcsc)
rhino (can be disabled using --without-rhino)
libffi (for --enable-zero or on archs other than x86/x86_64/sparc/ppc64)
-pulseaudio-libs-devel >= 0.9.11 (for --enable-pulse-java)
LLVM 2.5 or later (for --enable-shark)
systemtap-sdl-devel >= 0.9.5 (Java method tracing requires systemtap >= 0.9.9)
@@ -190,7 +189,6 @@
* --disable-hotspot-tests: Disable the running of the HotSpot JTReg suite.
* --disable-langtools-tests: Disable the running of the langtools JTReg suite.
* --disable-jdk-tests: Disable the running of the jdk JTreg suite.
-* --enable-pulse-java: Build the PulseAudio sound provider.
* --disable-xrender: Don't include the XRender pipeline.
* --enable-systemtap: Include support for tracing using systemtap.
* --enable-nss: Enable the NSS security provider.
@@ -223,13 +221,6 @@
as a way of avoiding running the extensive JDK test suite which
takes several hours.
-The PulseAudio provider
-=======================
-
-IcedTea7 includes an implementation of the javax.sound.* APIs using
-PulseAudio which can be enabled using --enable-pulse-java. The resulting
-provider is org.classpath.icedtea.pulseaudio.PulseAudioMixerProvider.
-
XRender Support
===============
diff -r 1e199b277a83 -r 87847ca9d356 Makefile.am
--- a/Makefile.am Wed Jun 11 02:35:36 2014 +0100
+++ b/Makefile.am Fri Jun 13 02:02:33 2014 +0100
@@ -72,16 +72,6 @@
CORBA = openjdk-boot/corba/src/share/classes
JAXWS = openjdk-boot/jaxws/src/share/jaxws_classes:openjdk-boot/jaxws/src/share/jaf_classes
-PULSE_JAVA_DIR = $(abs_top_srcdir)/pulseaudio
-PULSE_JAVA_NATIVE_SRCDIR = $(PULSE_JAVA_DIR)/src/native
-PULSE_JAVA_NATIVE_SRCS = $(wildcard $(PULSE_JAVA_NATIVE_SRCDIR)/*.c)
-PULSE_JAVA_BUILDDIR = $(abs_top_builddir)/pulseaudio.build
-PULSE_JAVA_NATIVE_BUILDDIR = $(PULSE_JAVA_BUILDDIR)/native
-PULSE_JAVA_NATIVE_OBJECTS = \
- $(subst $(PULSE_JAVA_NATIVE_SRCDIR),$(PULSE_JAVA_NATIVE_BUILDDIR),$(patsubst %.c,%.o,$(PULSE_JAVA_NATIVE_SRCS)))
-PULSE_JAVA_JAVA_SRCDIR = $(PULSE_JAVA_DIR)/src/java
-PULSE_JAVA_CLASS_DIR = $(PULSE_JAVA_BUILDDIR)/classes
-
OPENJDK_SOURCEPATH_DIRS = \
$(SHARE):$(SOLARIS):$(LANGTOOLS):$(CORBA):$(JAXWS)
@@ -170,10 +160,6 @@
REV_ARG = -r $(HGREV)
endif
-if ENABLE_PULSE_JAVA
-PULSE_JAVA_TARGET = stamps/pulse-java.stamp
-endif
-
# This should not depend on bootstrapping
# but on whether MEMORY_LIMIT is accepted
# as an argument to javac
@@ -281,11 +267,6 @@
patches/cacao/ignore-tests.patch
endif
-if ENABLE_PULSE_JAVA
-ICEDTEA_PATCHES += \
- patches/pulse-soundproperties.patch
-endif
-
if ENABLE_SYSTEMTAP
#ICEDTEA_PATCHES += \
# patches/hotspot/$(HSBUILD)/systemtap_gc.patch
@@ -751,19 +732,6 @@
$(top_srcdir)/test/jtreg/JavaTest.cmdMgrs.lst \
$(top_srcdir)/test/jtreg/excludelist.langtools.jtx
-PULSEAUDIO_SRCS = $(top_srcdir)/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/*.java \
- $(top_srcdir)/pulseaudio/src/java/META-INF/services/javax.sound.sampled.spi.MixerProvider \
- $(top_srcdir)/pulseaudio/src/native/*.h \
- $(top_srcdir)/pulseaudio/src/native/*.c \
- $(top_srcdir)/pulseaudio/TODO \
- $(top_srcdir)/pulseaudio/README \
- $(top_srcdir)/pulseaudio/testsounds/README \
- $(top_srcdir)/pulseaudio/testsounds/startup.wav \
- $(top_srcdir)/pulseaudio/testsounds/logout.wav \
- $(top_srcdir)/pulseaudio/testsounds/error.wav \
- $(top_srcdir)/pulseaudio/unittests/org/classpath/icedtea/pulseaudio/*.java \
- $(top_srcdir)/pulseaudio/COPYING
-
EXTRA_DIST = $(GENERATED_FILES) $(top_srcdir)/patches/*.patch \
$(top_srcdir)/patches/boot/*.patch \
$(top_srcdir)/patches/cacao/*.patch \
@@ -771,8 +739,7 @@
tools-copy contrib overlays \
javaws.png javaws.desktop \
jconsole.desktop policytool.desktop \
- $(JTREG_SRCS) \
- HACKING $(PULSEAUDIO_SRCS) fsg.sh \
+ $(JTREG_SRCS) HACKING fsg.sh \
hotspot.map autogen.sh \
tapset/hotspot.stp.in \
tapset/hotspot_jni.stp.in \
@@ -799,15 +766,15 @@
fi \
fi
-clean-local: clean-tests clean-pulse-java \
+clean-local: clean-tests \
clean-icedtea clean-icedtea-boot clean-clone clean-clone-boot \
clean-bootstrap-directory-stage1 clean-bootstrap-directory-stage2 \
clean-bootstrap-directory-symlink-stage1 clean-bootstrap-directory-symlink-stage2 \
clean-extract clean-generated clean-native-ecj clean-icedtea-stage2 \
clean-icedtea-debug-stage2 clean-icedtea-stage1 clean-add-zero clean-add-zero-debug \
clean-add-cacao clean-add-cacao-debug clean-rt clean-rewrite-rhino clean-rewriter \
- clean-add-systemtap clean-add-systemtap-debug clean-add-pulseaudio clean-add-pulseaudio-debug \
- clean-add-nss clean-add-tzdata-support clean-add-tzdata-support-debug clean-cryptocheck
+ clean-add-systemtap clean-add-systemtap-debug clean-add-nss clean-add-tzdata-support \
+ clean-add-tzdata-support-debug clean-cryptocheck
if [ -e bootstrap ]; then \
rmdir bootstrap ; \
fi
@@ -838,9 +805,9 @@
clean-jamvm clean-extract-jamvm clean-add-jamvm clean-add-jamvm-debug \
clean-extract-hotspot clean-sanitise-openjdk \
clean-tests clean-tapset-report clean-add-systemtap \
- clean-add-systemtap-debug clean-add-pulseaudio clean-add-pulseaudio-debug \
+ clean-add-systemtap-debug clean-add-systemtap-boot \
clean-add-nss clean-add-tzdata-support clean-add-tzdata-support-debug \
- clean-add-systemtap-boot clean-add-pulseaudio-boot clean-add-tzdata-support-boot \
+ clean-add-tzdata-support-boot \
clean-check-crypto clean-check-crypto-debug clean-check-crypto-boot \
clean-add-archive clean-add-archive-debug clean-add-archive-boot clean-cryptocheck \
clean-download-hotspot
@@ -1761,29 +1728,6 @@
rm -rf $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset
rm -f stamps/add-systemtap.stamp
-stamps/add-pulseaudio.stamp: stamps/icedtea.stamp $(PULSE_JAVA_TARGET)
-if ENABLE_PULSE_JAVA
- cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
- cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
- $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
- cp -pPRf pulse-java.jar \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
- cp -pPRf pulse-java.jar \
- $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext
- (cd $(PULSE_JAVA_JAVA_SRCDIR) && \
- $(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
-endif
- touch stamps/add-pulseaudio.stamp
-
-# Note: for simplicity, we don't revert the update of src.zip
-clean-add-pulseaudio:
- rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so
- rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so
- rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext/pulse-java.jar
- rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext/pulse-java.jar
- rm -f stamps/add-pulseaudio.stamp
-
stamps/add-nss.stamp: stamps/extract-openjdk.stamp
cp -v $(abs_top_builddir)/nss.cfg openjdk/jdk/src/share/lib/security;
touch stamps/add-nss.stamp
@@ -1899,29 +1843,6 @@
rm -rf $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset
rm -f stamps/add-systemtap-debug.stamp
-stamps/add-pulseaudio-debug.stamp: stamps/icedtea-debug.stamp $(PULSE_JAVA_TARGET)
-if ENABLE_PULSE_JAVA
- cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
- cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
- $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
- cp -pPRf pulse-java.jar \
- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
- cp -pPRf pulse-java.jar \
- $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext
- (cd $(PULSE_JAVA_JAVA_SRCDIR) && \
- $(ZIP) -qur $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
-endif
- touch stamps/add-pulseaudio-debug.stamp
-
-# Note: for simplicity, we don't revert the update of src.zip
-clean-add-pulseaudio-debug:
- rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so
- rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so
- rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext/pulse-java.jar
- rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext/pulse-java.jar
- rm -f stamps/add-pulseaudio-debug.stamp
-
stamps/add-tzdata-support-debug.stamp: stamps/icedtea-debug.stamp
if WITH_TZDATA_DIR
if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib ] ; then \
@@ -1967,8 +1888,7 @@
stamps/icedtea-stage2.stamp: stamps/icedtea.stamp stamps/add-cacao.stamp \
stamps/add-zero.stamp stamps/add-jamvm.stamp stamps/add-systemtap.stamp \
- stamps/add-pulseaudio.stamp stamps/add-tzdata-support.stamp stamps/check-crypto.stamp \
- stamps/add-archive.stamp
+ stamps/add-tzdata-support.stamp stamps/check-crypto.stamp stamps/add-archive.stamp
mkdir -p stamps
touch $@
@@ -1977,9 +1897,8 @@
stamps/icedtea-debug-stage2.stamp: stamps/icedtea-debug.stamp \
stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp stamps/add-jamvm-debug.stamp \
- stamps/add-systemtap-debug.stamp stamps/add-pulseaudio-debug.stamp \
- stamps/add/tzdata-support-debug.stamp stamps/check-crypto-debug.stamp \
- stamps/add-archive-debug.stamp
+ stamps/add-systemtap-debug.stamp stamps/add/tzdata-support-debug.stamp \
+ stamps/check-crypto-debug.stamp stamps/add-archive-debug.stamp
mkdir -p stamps
touch $@
@@ -2038,29 +1957,6 @@
rm -rf $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset
rm -f stamps/add-systemtap-boot.stamp
-stamps/add-pulseaudio-boot.stamp: stamps/icedtea-boot.stamp $(PULSE_JAVA_TARGET)
-if ENABLE_PULSE_JAVA
- cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
- $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
- cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
- $(BOOT_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
- cp -pPRf pulse-java.jar \
- $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
- cp -pPRf pulse-java.jar \
- $(BOOT_BUILD_OUTPUT_DIR)/j2re-image/lib/ext
- (cd $(PULSE_JAVA_JAVA_SRCDIR) && \
- $(ZIP) -qur $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
-endif
- touch stamps/add-pulseaudio-boot.stamp
-
-# Note: for simplicity, we don't revert the update of src.zip
-clean-add-pulseaudio-boot:
- rm -f $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so
- rm -f $(BOOT_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so
- rm -f $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext/pulse-java.jar
- rm -f $(BOOT_BUILD_OUTPUT_DIR)/j2re-image/lib/ext/pulse-java.jar
- rm -f stamps/add-pulseaudio-boot.stamp
-
stamps/add-tzdata-support-boot.stamp: stamps/icedtea-boot.stamp
if WITH_TZDATA_DIR
if [ -e $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib ] ; then \
@@ -2105,14 +2001,13 @@
rm -f stamps/add-archive-boot.stamp
stamps/icedtea-stage1.stamp: stamps/icedtea-boot.stamp \
- stamps/add-systemtap-boot.stamp stamps/add-pulseaudio-boot.stamp \
- stamps/add-tzdata-support-boot.stamp stamps/check-crypto-boot.stamp \
- stamps/add-archive-boot.stamp
+ stamps/add-systemtap-boot.stamp stamps/add-tzdata-support-boot.stamp \
+ stamps/check-crypto-boot.stamp stamps/add-archive-boot.stamp
mkdir -p stamps
touch $@
-clean-icedtea-stage1: clean-add-systemtap-boot clean-add-pulseaudio-boot \
- clean-add-tzdata-support-boot clean-check-crypto-boot clean-add-archive-boot
+clean-icedtea-stage1: clean-add-systemtap-boot clean-add-tzdata-support-boot \
+ clean-check-crypto-boot clean-add-archive-boot
rm -f stamps/icedtea-stage1.stamp
# Rebuild targets
@@ -2151,68 +2046,6 @@
@echo "HotSpot is served:" $(BUILD_OUTPUT_DIR)/j2sdk-image
endif
-# PulseAudio based mixer
-# (pulse-java)
-if ENABLE_PULSE_JAVA
-
-stamps/pulse-java.stamp: stamps/pulse-java-jar.stamp $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so
- mkdir -p stamps
- touch $@
-
-stamps/pulse-java-class.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP)
- mkdir -p $(PULSE_JAVA_CLASS_DIR)
- (cd $(PULSE_JAVA_JAVA_SRCDIR); \
- $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d $(PULSE_JAVA_CLASS_DIR) \
- -bootclasspath $(RUNTIME) org/classpath/icedtea/pulseaudio/*.java \
- )
- cp -r $(PULSE_JAVA_JAVA_SRCDIR)/META-INF $(PULSE_JAVA_CLASS_DIR)
- chmod -R ug+w $(PULSE_JAVA_CLASS_DIR)/META-INF
- mkdir -p stamps
- touch $@
-
-stamps/pulse-java-jar.stamp: stamps/pulse-java-class.stamp
- $(BOOT_DIR)/bin/jar cf pulse-java.jar -C $(PULSE_JAVA_CLASS_DIR) .;
- mkdir -p stamps
- touch $@
-
-stamps/pulse-java-headers.stamp: stamps/pulse-java-class.stamp
- mkdir -p $(PULSE_JAVA_NATIVE_BUILDDIR)
- $(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
- -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.EventLoop ; \
- $(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
- -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.Stream ; \
- $(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
- -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.Operation; \
- $(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
- -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioSourcePort ; \
- $(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
- -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioTargetPort ; \
- $(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
- -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.ContextEvent
- mkdir -p stamps
- touch $@
-
-$(PULSE_JAVA_NATIVE_BUILDDIR)/%.o: $(PULSE_JAVA_NATIVE_SRCDIR)/%.c stamps/pulse-java-headers.stamp
- $(CC) $(IT_CFLAGS) -fPIC -I$(BOOT_DIR)/include/linux -I$(BOOT_DIR)/include \
- -I$(PULSE_JAVA_NATIVE_BUILDDIR) -o $@ -c $<
-
-$(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so: $(PULSE_JAVA_NATIVE_OBJECTS)
- $(CC) $(LDFLAGS) -shared $(PULSE_JAVA_NATIVE_OBJECTS) $(LIBPULSE_LIBS) \
- -o $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so
-
-endif
-
-clean-pulse-java:
- rm -rf $(PULSE_JAVA_NATIVE_BUILDDIR)
- rm -rf $(PULSE_JAVA_CLASS_DIR)
- rm -f pulse-java.jar
- if [ -e $(PULSE_JAVA_BUILDDIR) ]; then \
- rmdir $(PULSE_JAVA_BUILDDIR) ; \
- fi
- rm -f stamps/pulse-java*.stamp
-
-# end of pulse-java
-
# Rhino support
stamps/rewriter.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP)
@@ -2703,10 +2536,6 @@
add-nss-debug: stamps/add-nss-debug.stamp
-add-pulseaudio: stamps/add-pulseaudio.stamp
-
-add-pulseaudio-debug: stamps/add-pulseaudio-debug.stamp
-
add-systemtap: stamps/add-systemtap.stamp
add-systemtap-debug: stamps/add-systemtap-debug.stamp
@@ -2785,8 +2614,6 @@
patch-fsg: stamps/patch-fsg.stamp
-pulse-java: $(PULSE_JAVA_TARGET)
-
rewriter: stamps/rewriter.stamp
rewrite-rhino: stamps/rewrite-rhino.stamp
diff -r 1e199b277a83 -r 87847ca9d356 NEWS
--- a/NEWS Wed Jun 11 02:35:36 2014 +0100
+++ b/NEWS Fri Jun 13 02:02:33 2014 +0100
@@ -191,6 +191,8 @@
- PR1827: Support AM_MAINTAINER_MODE
- PR1830: Drop version requirement for LCMS 2
- PR1833, RH1022017: Report elliptic curves supported by NSS, not the SunEC library
+ - PR1741: Break PulseAudio provider out into IcedTea-Sound
+ - PR1843: Fail early if there is no native HotSpot JIT & all other options are disabled
New in release 2.5.0 (2014-XX-XX):
diff -r 1e199b277a83 -r 87847ca9d356 acinclude.m4
--- a/acinclude.m4 Wed Jun 11 02:35:36 2014 +0100
+++ b/acinclude.m4 Fri Jun 13 02:02:33 2014 +0100
@@ -686,6 +686,7 @@
AC_REQUIRE([IT_ENABLE_CACAO])
AC_REQUIRE([IT_ENABLE_JAMVM])
AC_REQUIRE([IT_ENABLE_SHARK])
More information about the distro-pkg-dev
mailing list