diff options
author | Greg Lewis <glewis@FreeBSD.org> | 2019-09-23 18:26:43 +0000 |
---|---|---|
committer | Greg Lewis <glewis@FreeBSD.org> | 2019-09-23 18:26:43 +0000 |
commit | 2b31ab00a2f9c1a28acb9480a7dd437db3f87948 (patch) | |
tree | b5d9078afa485771076f40528f0082509de58240 /java/openjdk6/files/alsa-disable.patch | |
parent | Remove references to openjdk6 (diff) |
Delete java/openjdk6 and java/openjdk6-jre ports
* Both of these ports are EoL upstream. Remove them per the DEPRECATED
and EXPIRATION_DATE entries added previously
* Note that bootstrap-openjdk6 is left solely to be able to bootstrap
java/openjdk7
Notes
Notes:
svn path=/head/; revision=512663
Diffstat (limited to 'java/openjdk6/files/alsa-disable.patch')
-rw-r--r-- | java/openjdk6/files/alsa-disable.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/java/openjdk6/files/alsa-disable.patch b/java/openjdk6/files/alsa-disable.patch deleted file mode 100644 index 5c4d6d29c5a1..000000000000 --- a/java/openjdk6/files/alsa-disable.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- 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/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; - } |