diff options
Diffstat (limited to 'java/openjdk6/files/alsa-enable.patch')
| -rw-r--r-- | java/openjdk6/files/alsa-enable.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/java/openjdk6/files/alsa-enable.patch b/java/openjdk6/files/alsa-enable.patch index 4f7201ef72bb..686f029b88dc 100644 --- a/java/openjdk6/files/alsa-enable.patch +++ b/java/openjdk6/files/alsa-enable.patch @@ -16,6 +16,27 @@ ifeq ($(PLATFORM), solaris) ifneq ($(ARCH), amd64) # build with ports and direct audio +--- jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.c 2012-05-01 17:18:35.000000000 -0400 ++++ jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.c 2012-09-26 17:35:48.000000000 -0400 +@@ -131,6 +131,10 @@ + + void getALSAVersion(char* buffer, int len) { + if (!hasGottenALSAVersion) { ++#ifdef __FreeBSD__ ++ // XXX We do not use ALSA drivers. Just copy the library version. ++ strcpy(ALSAVersionString, SND_LIB_VERSION_STR); ++#else + // get alsa version from proc interface + FILE* file; + int curr, len, totalLen, inVersionString; +@@ -171,6 +175,7 @@ + // null terminate + ALSAVersionString[len] = 0; + } ++#endif + hasGottenALSAVersion = TRUE; + } + strncpy(buffer, ALSAVersionString, len); --- 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-11 16:20:52.000000000 -0500 @@ -99,5 +99,15 @@ |