changeset in /hg/icedtea: 2008-11-07 Omair Majid <omajid at redha...

[Omair Majid]

changeset e61d84115155 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e61d84115155
description:
	2008-11-07  Omair Majid  <omajid at redhat.com>

	    * patches/icedtea-jsoundhs.patch: Added two more diffs to remove all uses
	    of jsoundhs and Headspace libraries.

diffstat:

2 files changed, 33 insertions(+)
ChangeLog                      |    5 +++++
patches/icedtea-jsoundhs.patch |   28 ++++++++++++++++++++++++++++

diffs (47 lines):

diff -r c6ae181e1021 -r e61d84115155 ChangeLog
--- a/ChangeLog	Fri Nov 07 15:44:03 2008 +0000
+++ b/ChangeLog	Fri Nov 07 16:31:49 2008 -0500
@@ -1,3 +1,8 @@ 2008-11-07  Andrew John Hughes  <ahughes
+2008-11-07  Omair Majid  <omajid at redhat.com>
+
+	* patches/icedtea-jsoundhs.patch: Added two more diffs to remove all uses 
+	of jsoundhs and Headspace libraries.
+
 2008-11-07  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am: Use 'node|short' instead of 'rev'
diff -r c6ae181e1021 -r e61d84115155 patches/icedtea-jsoundhs.patch
--- a/patches/icedtea-jsoundhs.patch	Fri Nov 07 15:44:03 2008 +0000
+++ b/patches/icedtea-jsoundhs.patch	Fri Nov 07 16:31:49 2008 -0500
@@ -51,3 +51,31 @@ diff -Nru openjdk.orig/jdk/make/javax/so
  # 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 -uNr openjdk-orig/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider
+--- openjdk-orig/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider	2008-11-07 10:38:15.000000000 -0500
++++ openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider	2008-11-07 10:43:38.000000000 -0500
+@@ -1,5 +1,4 @@
+ # last mixer is default mixer
+ com.sun.media.sound.PortMixerProvider
+ com.sun.media.sound.SimpleInputDeviceProvider
+-com.sun.media.sound.HeadspaceMixerProvider
+ com.sun.media.sound.DirectAudioDeviceProvider