changeset in /hg/icedtea: 2008-10-10 Ioana Ivan <iivan at redhat.com>
Omair Majid
omajid at redhat.com
Sat Oct 18 21:23:28 PDT 2008
changeset 8b85ec866923 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8b85ec866923
description:
2008-10-10 Ioana Ivan <iivan at redhat.com>
Omair Majid <omajid at redhat.com>
* INSTALL: Updated to reflect requirements for pulse-java.
* Makefile.am
(distclean-local): Clean up pulse-java.
(EXTRA_DIST): Add pulseaudio folder.
(stamps/icedtea.stamp): Added dependency on stamps/pulse-java.stamp. Also
copy generated .jar and .so files to the jre images.
(stamps/icedtea-debug.stamp): Likewise.
(stamps/pulse-java.stamp): New target.
(stamps/pulse-java-jar.stamp): Likewise.
(stamps/pulse-java-class.stamp): Likewise.
(stamps/pulse-java-headers.stamp): Likewise.
(clean-pulse-java): Likewise.
* README: Added note for PulseAudio based mixer.
* acinclude.m4
(FIND_PULSEAUDIO): Find the pulseaudio binary.
* configure.ac: Check for pulseaudio server and header files being
installed.
* patches/icedtea-pulse-soundproperties.patch: Dont use pulse-java as the
default Mixer.
* pulseaudio/: Copied over sources from pulseaudio repository.
diffstat:
52 files changed, 11603 insertions(+), 4 deletions(-)
ChangeLog | 24
INSTALL | 4
Makefile.am | 134
README | 8
acinclude.m4 | 9
configure.ac | 25
patches/icedtea-pulse-soundproperties.patch | 16
pulseaudio/AUTHORS | 5
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 | 56
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextListener.java | 44
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java | 280 ++
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Operation.java | 147 +
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java | 568 ++++
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java | 471 +++
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java | 118
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java | 881 ++++++
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/PulseAudioMuteControl.java | 78
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPlaybackLine.java | 54
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPort.java | 155 +
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java | 340 ++
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourcePort.java | 94
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java | 373 ++
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetPort.java | 94
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioVolumeControl.java | 90
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java | 777 +++++
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 | 90
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_EventLoop.c | 362 ++
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Operation.c | 83
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.c | 102
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioStreamVolumeControl.c | 67
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.c | 107
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c | 1010 +++++++
pulseaudio/testsounds/README | 4
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/OtherSoundProvidersAvailableTest.java | 114
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioClipTest.java | 623 ++++
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 | 305 ++
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLineTest.java | 1345 ++++++++++
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourcePortTest.java | 122
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLineTest.java | 648 ++++
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioTargetPortTest.java | 122
diffs (truncated from 11924 to 500 lines):
diff -r fa94fa7ac782 -r 8b85ec866923 ChangeLog
--- a/ChangeLog Thu Oct 09 11:25:22 2008 -0400
+++ b/ChangeLog Fri Oct 10 16:03:12 2008 -0400
@@ -1,3 +1,27 @@ 2008-10-09 Gary Benson <gbenson at redhat
+2008-10-10 Ioana Ivan <iivan at redhat.com>
+ Omair Majid <omajid at redhat.com>
+
+ * INSTALL: Updated to reflect requirements for pulse-java.
+ * Makefile.am
+ (distclean-local): Clean up pulse-java.
+ (EXTRA_DIST): Add pulseaudio folder.
+ (stamps/icedtea.stamp): Added dependency on stamps/pulse-java.stamp. Also
+ copy generated .jar and .so files to the jre images.
+ (stamps/icedtea-debug.stamp): Likewise.
+ (stamps/pulse-java.stamp): New target.
+ (stamps/pulse-java-jar.stamp): Likewise.
+ (stamps/pulse-java-class.stamp): Likewise.
+ (stamps/pulse-java-headers.stamp): Likewise.
+ (clean-pulse-java): Likewise.
+ * README: Added note for PulseAudio based mixer.
+ * acinclude.m4
+ (FIND_PULSEAUDIO): Find the pulseaudio binary.
+ * configure.ac: Check for pulseaudio server and header files being
+ installed.
+ * patches/icedtea-pulse-soundproperties.patch: Dont use pulse-java as the
+ default Mixer.
+ * pulseaudio/: Copied over sources from pulseaudio repository.
+
2008-10-09 Gary Benson <gbenson at redhat.com>
Andrew Haley <aph at redhat.com>
diff -r fa94fa7ac782 -r 8b85ec866923 INSTALL
--- a/INSTALL Thu Oct 09 11:25:22 2008 -0400
+++ b/INSTALL Fri Oct 10 16:03:12 2008 -0400
@@ -31,6 +31,10 @@ zlib-devel
zlib-devel
rhino
netbeans (harness, platform8, apisupport1, java2, ide9) - for visualvm
+
+For builing the PulseAudio based mixer, you will need
+pulseaudio-libs-devel >= 0.9.11
+pulseaudio >= 0.9.11
For building the zero-assembler port (see below), you will need libffi.
diff -r fa94fa7ac782 -r 8b85ec866923 Makefile.am
--- a/Makefile.am Thu Oct 09 11:25:22 2008 -0400
+++ b/Makefile.am Fri Oct 10 16:03:12 2008 -0400
@@ -28,6 +28,19 @@ endif
endif
endif
+if ENABLE_PULSE_JAVA
+# include the makefile in pulseaudio subdir
+PULSE_JAVA_DIR = pulseaudio
+PULSE_JAVA_NATIVE_SRCDIR = $(PULSE_JAVA_DIR)/src/native
+PULSE_JAVA_JAVA_SRCDIR = $(PULSE_JAVA_DIR)/src/java
+PULSE_JAVA_CLASS_DIR = $(PULSE_JAVA_DIR)/bin
+else
+PULSE_JAVA_DIR =
+PULSE_JAVA_NATIVE_SRCDIR =
+PULSE_JAVA_JAVA_SRCDIR =
+PULSE_JAVA_CLASS_DIR =
+endif
+
if WITH_VISUALVM
VISUALVM_PATCH = patches/icedtea-visualvm.patch
else
@@ -39,7 +52,7 @@ endif
all-local: icedtea-against-icedtea
-distclean-local: clean-copy clean-jtreg clean-jtreg-reports
+distclean-local: clean-copy clean-jtreg clean-jtreg-reports clean-pulse-java
rm -rf stamps
rm -f rt-source-files.txt \
hotspot-tools-source-files.txt \
@@ -83,7 +96,7 @@ EXTRA_DIST = rt generated $(ICEDTEA_PATC
overlays extra jconsole.desktop policytool.desktop \
test/jtreg patches/icedtea-plugin.patch \
patches/icedtea-liveconnect.patch IcedTeaPlugin.cc \
- HACKING patches/icedtea-visualvm.patch
+ HACKING patches/icedtea-visualvm.patch pulseaudio
# The Binary plugs directory is called jdk1.7.0 for historical reasons. The
# name is completely irrelevant; only contains the plugs to build IcedTea.
@@ -520,6 +533,11 @@ ICEDTEA_PATCHES += \
patches/icedtea-cacao.patch
endif
+if ENABLE_PULSE_JAVA
+ICEDTEA_PATCHES += \
+ patches/icedtea-pulse-soundproperties.patch
+endif
+
ICEDTEA_PATCHES += \
$(DISTRIBUTION_PATCHES)
@@ -923,7 +941,8 @@ stamps/icedtea.stamp: stamps/bootstrap-d
stamps/hotspot-tools.stamp stamps/plugs.stamp \
stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
$(GCJWEBPLUGIN_TARGET) $(ICEDTEAPLUGIN_TARGET) \
- extra-lib/about.jar stamps/cacao.stamp stamps/visualvm.stamp
+ extra-lib/about.jar stamps/cacao.stamp stamps/visualvm.stamp \
+ stamps/pulse-java.stamp
$(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/control/make/ \
@@ -940,6 +959,16 @@ if ENABLE_PLUGIN
cp -pPRf gcjwebplugin.so \
$(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
endif
+endif
+if ENABLE_PULSE_JAVA
+ cp -pPRf libpulse-java.so \
+ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+ cp -pPRf 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
endif
if WITH_VISUALVM
mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc ; \
@@ -975,7 +1004,8 @@ stamps/icedtea-debug.stamp: stamps/boots
stamps/hotspot-tools.stamp stamps/plugs.stamp \
stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
$(GCJWEBPLUGIN_TARGET) $(ICEDTEAPLUGIN_TARGET) \
- extra-lib/about.jar stamps/cacao.stamp
+ extra-lib/about.jar stamps/cacao.stamp \
+ stamps/pulse-java.stamp
$(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/control/make \
@@ -992,6 +1022,16 @@ if ENABLE_PLUGIN
cp -pPRf gcjwebplugin.so \
$(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR)
endif
+endif
+if ENABLE_PULSE_JAVA
+ cp -pPRf libpulse-java.so \
+ $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+ cp -pPRf libpulse-java.so \
+ $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR)
+ cp -pPRf pulse-java.jar \
+ $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/ext
+ cp -pPRf pulse-java.jar \
+ $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/ext
endif
if WITH_VISUALVM
mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc ; \
@@ -1374,6 +1414,92 @@ clean-gcjwebplugin:
rm -f gcjwebplugin.so
endif
endif
+
+
+# PulseAudio based mixer
+# (pulse-java)
+
+stamps/pulse-java.stamp: stamps/pulse-java-jar.stamp stamps/pulse-java-headers.stamp
+if ENABLE_PULSE_JAVA
+ $(CC) $(CFLAGS) -c $(PULSE_JAVA_NATIVE_SRCDIR)/jni-common.c
+ $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fpic -fPIC -c $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_EventLoop.c
+ $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fpic -fPIC -c $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_Operation.c
+ $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fpic -fPIC -c $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_Stream.c
+ $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fpic -fPIC -c $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.c
+ $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fpic -fPIC -c $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.c
+ $(CC) $(LDFLAGS) -shared $(LIBPULSE_LIBS) -o libpulse-java.so org_*pulseaudio*.o jni-common.o
+ mv org_classpath_icedtea_pulseaudio_*.o $(PULSE_JAVA_CLASS_DIR)
+endif
+ mkdir -p stamps
+ touch stamps/pulse-java.stamp
+
+stamps/pulse-java-jar.stamp: stamps/pulse-java-class.stamp
+if ENABLE_PULSE_JAVA
+ mkdir -p $(PULSE_JAVA_CLASS_DIR);
+ if ! test -d $(ICEDTEA_BOOT_DIR) ; \
+ then \
+ $(JAR) cf pulse-java.jar -C $(PULSE_JAVA_CLASS_DIR) .; \
+ else \
+ $(ICEDTEA_BOOT_DIR)/bin/jar cf pulse-java.jar -C $(PULSE_JAVA_CLASS_DIR) .; \
+ fi
+endif
+ mkdir -p stamps
+ touch stamps/pulse-java-jar.stamp
+
+stamps/pulse-java-class.stamp:
+if ENABLE_PULSE_JAVA
+ mkdir -p $(PULSE_JAVA_CLASS_DIR)
+ if ! test -d $(ICEDTEA_BOOT_DIR) ; \
+ then \
+ (cd $(PULSE_JAVA_JAVA_SRCDIR); \
+ $(JAVAC) -d ../../../$(PULSE_JAVA_CLASS_DIR) \
+ -bootclasspath \
+ '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated' \
+ org/classpath/icedtea/pulseaudio/*.java\
+ ) \
+ else \
+ (cd $(PULSE_JAVA_JAVA_SRCDIR); \
+ $(ICEDTEA_BOOT_DIR)/bin/javac -d ../../../$(PULSE_JAVA_CLASS_DIR)\
+ -bootclasspath \
+ '$(ICEDTEA_BOOT_DIR)/jre/lib/rt.jar' \
+ org/classpath/icedtea/pulseaudio/*.java\
+ ) \
+ fi
+ cp -r $(PULSE_JAVA_JAVA_SRCDIR)/META-INF $(PULSE_JAVA_CLASS_DIR)
+endif
+ mkdir -p stamps
+ touch stamps/pulse-java-class.stamp
+
+
+stamps/pulse-java-headers.stamp: stamps/pulse-java-class.stamp
+if ENABLE_PULSE_JAVA
+ if ! test -d $(ICEDTEA_BOOT_DIR) ; \
+ then \
+ $(JAVAH) -d $(PULSE_JAVA_NATIVE_SRCDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.EventLoop ; \
+ $(JAVAH) -d $(PULSE_JAVA_NATIVE_SRCDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.Stream ; \
+ $(JAVAH) -d $(PULSE_JAVA_NATIVE_SRCDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.Operation; \
+ $(JAVAH) -d $(PULSE_JAVA_NATIVE_SRCDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioSourcePort ; \
+ $(JAVAH) -d $(PULSE_JAVA_NATIVE_SRCDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioTargetPort ; \
+ else \
+ $(ICEDTEA_BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_SRCDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.EventLoop ; \
+ $(ICEDTEA_BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_SRCDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.Stream ; \
+ $(ICEDTEA_BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_SRCDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.Operation; \
+ $(ICEDTEA_BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_SRCDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioSourcePort ; \
+ $(ICEDTEA_BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_SRCDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioTargetPort ; \
+ fi
+endif
+ mkdir -p stamps
+ touch stamps/pulse-java-headers.stamp
+
+
+clean-pulse-java:
+ rm -rf $(PULSE_JAVA_CLASS_DIR)/*
+ rm -f $(PULSE_JAVA_NATIVE_SRCDIR)/org_*.h
+ rm -f stamps/pulse-java*.stamp
+ rm -f pulse-java.jar
+ rm -f libpulse-java.so
+
+# end of pulse-java
# jtreg
diff -r fa94fa7ac782 -r 8b85ec866923 README
--- a/README Thu Oct 09 11:25:22 2008 -0400
+++ b/README Fri Oct 10 16:03:12 2008 -0400
@@ -159,3 +159,11 @@ and --with-netbeans-profiler-src-zip whi
and --with-netbeans-profiler-src-zip which can be used to prevent
re-downloading of the source zips. --with-netbeans-home can be used to specify
where the Netbeans tools are installed (default /usr/share/netbeans).
+
+
+
+PulseAudio Mixer
+================
+
+Passing --enable-pulse-java to configure will build the PulseAudio Mixer for
+java. This allows java programs to use PulseAudio as the sound backend.
diff -r fa94fa7ac782 -r 8b85ec866923 acinclude.m4
--- a/acinclude.m4 Thu Oct 09 11:25:22 2008 -0400
+++ b/acinclude.m4 Fri Oct 10 16:03:12 2008 -0400
@@ -665,6 +665,15 @@ AC_DEFUN([FIND_RHINO_JAR],
AC_SUBST(RHINO_JAR)
])
+AC_DEFUN([FIND_PULSEAUDIO],
+[
+ AC_PATH_PROG(PULSEAUDIO_BIN, "pulseaudio")
+ if test -z "${PULSEAUDIO_BIN}"; then
+ AC_MSG_ERROR("pulseaudio was not found.")
+ fi
+ AC_SUBST(PULSEAUDIO_BIN)
+])
+
AC_DEFUN([ENABLE_OPTIMIZATIONS],
[
AC_MSG_CHECKING(whether to disable optimizations)
diff -r fa94fa7ac782 -r 8b85ec866923 configure.ac
--- a/configure.ac Thu Oct 09 11:25:22 2008 -0400
+++ b/configure.ac Fri Oct 10 16:03:12 2008 -0400
@@ -125,6 +125,12 @@ AC_ARG_ENABLE([liveconnect],
[Enable experimental LiveConnect plugin])],
[enable_liveconnect="yes"], [enable_liveconnect="no"])
AM_CONDITIONAL(ENABLE_LIVECONNECT, test "x${enable_liveconnect}" = "xyes")
+
+AC_ARG_ENABLE([pulse-java],
+ [AS_HELP_STRING([--enable-pulse-java],
+ [Enable pulse-java - an audio mixer spi that uses PulseAudio])],
+ [enable_pulse_java="yes"], [enable_pulse_java="no"])
+AM_CONDITIONAL(ENABLE_PULSE_JAVA, test "x${enable_pulse_java}" = "xyes")
AC_ARG_ENABLE([docs],
[AS_HELP_STRING([--disable-docs],
@@ -247,6 +253,11 @@ ENABLE_ZERO_BUILD
ENABLE_ZERO_BUILD
SET_CORE_OR_SHARK_BUILD
+if test "x${enable_pulse_java}" = "xyes"
+then
+ FIND_PULSEAUDIO
+fi
+
dnl pkgconfig cannot be used to finid these headers and libraries.
AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[]
,[AC_MSG_ERROR("CUPS headers were not found -
@@ -354,6 +365,20 @@ AC_SUBST(ALSA_CFLAGS)
AC_SUBST(ALSA_CFLAGS)
AC_SUBST(ALSA_LIBS)
+if test "x${enable_pulse_java}" = "xyes"
+then
+ dnl Check for pulseaudio libraries.
+ PKG_CHECK_MODULES(LIBPULSE,[libpulse >= 0.9.11],[LIBPULSE_FOUND=yes]
+ ,[LIBPULSE_FOUND=no])
+ if test "x${LIBPULSE_FOUND}" = xno
+ then
+ AC_MSG_ERROR([Could not find pulseaudio>=0.9.11 libraries - \
+ Try installing pulseaudio-libs-devel>=0.9.11.])
+ fi
+ AC_SUBST(LIBPULSE_CFLAGS)
+ AC_SUBST(LIBPULSE_LIBS)
+fi
+
dnl Check for plugin support headers and libraries.
dnl FIXME: use unstable
if test "x${enable_liveconnect}" = "xyes"
diff -r fa94fa7ac782 -r 8b85ec866923 patches/icedtea-pulse-soundproperties.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-pulse-soundproperties.patch Fri Oct 10 16:03:12 2008 -0400
@@ -0,0 +1,16 @@
+--- openjdk/jdk/src/share/lib/sound.properties 2008-08-28 04:15:18.000000000 -0400
++++ openjdk/jdk/src/share/lib/sound.properties 2008-10-03 16:59:21.000000000 -0400
+@@ -37,3 +37,13 @@
+ # Specify the default Receiver by provider and name:
+ # javax.sound.midi.Receiver=com.sun.media.sound.MidiProvider#SunMIDI1
+ #
++
++# javax.sound.sampled.Clip=org.classpath.icedtea.pulseaudio.PulseAudioMixerProvider
++# javax.sound.sampled.Port=org.classpath.icedtea.pulseaudio.PulseAudioMixerProvider
++# javax.sound.sampled.SourceDataLine=org.classpath.icedtea.pulseaudio.PulseAudioMixerProvider
++# javax.sound.sampled.TargetDataLine=org.classpath.icedtea.pulseaudio.PulseAudioMixerProvider
++
++javax.sound.sampled.Clip=com.sun.media.sound.DirectAudioDeviceProvider
++javax.sound.sampled.Port=com.sun.media.sound.PortMixerProvider
++javax.sound.sampled.SourceDataLine=com.sun.media.sound.DirectAudioDeviceProvider
++javax.sound.sampled.TargetDataLine=com.sun.media.sound.DirectAudioDeviceProvider
diff -r fa94fa7ac782 -r 8b85ec866923 pulseaudio/AUTHORS
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pulseaudio/AUTHORS Fri Oct 10 16:03:12 2008 -0400
@@ -0,0 +1,5 @@
+Authors
+
+Ioana Iivan (iivan at redhat.com)
+
+Omair Majid (omajid at redhat.com)
\ No newline at end of file
diff -r fa94fa7ac782 -r 8b85ec866923 pulseaudio/COPYING
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pulseaudio/COPYING Fri Oct 10 16:03:12 2008 -0400
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
More information about the distro-pkg-dev
mailing list