diff options
Diffstat (limited to 'java/openjdk6/files/patch-set')
| -rw-r--r-- | java/openjdk6/files/patch-set | 68 |
1 files changed, 26 insertions, 42 deletions
diff --git a/java/openjdk6/files/patch-set b/java/openjdk6/files/patch-set index 8b4cb0066108..ac9ce2ef6394 100644 --- a/java/openjdk6/files/patch-set +++ b/java/openjdk6/files/patch-set @@ -8554,28 +8554,6 @@ FILES_windows = \ PLATFORM_API_WinOS_MidiIn.c \ PLATFORM_API_WinOS_MidiOut.c \ ---- jdk/make/javax/sound/Makefile 2011-01-20 18:54:05.000000000 -0500 -+++ jdk/make/javax/sound/Makefile 2011-02-01 17:46:55.000000000 -0500 -@@ -105,6 +105,19 @@ - #MXSPP_ADD = $(PLATFORM)-$(ARCH)/ - endif # PLATFORM linux - -+# XXXBSD: ??? -+ifeq ($(PLATFORM), bsd) -+ # build with empty MIDI i/o -+ INCLUDE_MIDI = TRUE -+ # build with empty ports -+ INCLUDE_PORTS = TRUE -+ # build with empty direct audio -+ INCLUDE_DAUDIO = TRUE -+ ifeq ($(OS_VENDOR), OpenBSD) -+ LDFLAGS += -lossaudio -+ endif -+endif # PLATFORM bsd -+ - ifeq ($(PLATFORM), solaris) - ifneq ($(ARCH), amd64) - # build with ports and direct audio --- jdk/make/javax/sound/SoundDefs.gmk 2011-01-20 18:54:05.000000000 -0500 +++ jdk/make/javax/sound/SoundDefs.gmk 2011-02-01 17:46:55.000000000 -0500 @@ -40,6 +40,10 @@ @@ -8589,6 +8567,32 @@ ifeq ($(PLATFORM), solaris) CPPFLAGS += -DX_PLATFORM=X_SOLARIS +--- jdk/make/javax/sound/jsoundalsa/Makefile 2011-01-20 18:54:05.000000000 -0500 ++++ jdk/make/javax/sound/jsoundalsa/Makefile 2011-02-11 16:20:52.000000000 -0500 +@@ -65,6 +65,15 @@ + $(MIDIFILES_export) \ + $(PORTFILES_export) + ++ifeq ($(PLATFORM), bsd) ++LDFLAGS += -L$(PACKAGE_PATH)/lib -lasound ++ ++CPPFLAGS += \ ++ -DUSE_DAUDIO=TRUE \ ++ -DUSE_PORTS=TRUE \ ++ -I$(PACKAGE_PATH)/include \ ++ -I$(SHARE_SRC)/native/com/sun/media/sound ++else + LDFLAGS += -lasound + + CPPFLAGS += \ +@@ -73,6 +82,7 @@ + -DUSE_PLATFORM_MIDI_OUT=TRUE \ + -DUSE_PLATFORM_MIDI_IN=TRUE \ + -I$(SHARE_SRC)/native/com/sun/media/sound ++endif + + # + # Add to the ambient VPATH. --- jdk/make/jpda/back/Makefile 2011-01-20 18:54:05.000000000 -0500 +++ jdk/make/jpda/back/Makefile 2011-02-01 17:46:55.000000000 -0500 @@ -49,8 +49,10 @@ @@ -9764,26 +9768,6 @@ #include "SoundDefs.h" #include "DirectAudio.h" #include "Utilities.h" ---- jdk/src/share/native/com/sun/media/sound/Platform.c 2011-01-20 18:54:37.000000000 -0500 -+++ jdk/src/share/native/com/sun/media/sound/Platform.c 2011-02-01 17:46:55.000000000 -0500 -@@ -99,5 +99,17 @@ - return com_sun_media_sound_Platform_LIB_ALSA; - } - #endif -+#if (X_PLATFORM == X_BSD) -+ switch (feature) { -+ case com_sun_media_sound_Platform_FEATURE_MIDIIO: -+ return com_sun_media_sound_Platform_LIB_MAIN; -+ case com_sun_media_sound_Platform_FEATURE_PORTS: -+ return com_sun_media_sound_Platform_LIB_MAIN; -+ case com_sun_media_sound_Platform_FEATURE_DIRECT_AUDIO: -+ // XXXBSD: When native Direct Audio support is ported change -+ // this back to returning com_sun_media_sound_Platform_LIB_MAIN -+ return 0; -+ } -+#endif - return 0; - } --- jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2011-01-20 18:54:37.000000000 -0500 +++ jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2011-02-01 17:46:55.000000000 -0500 @@ -31,6 +31,7 @@ |