diff --git a/lib/installer-exclude/jmf.jar b/lib/installer-exclude/jmf.jar index 41e36069f..813d93c40 100644 Binary files a/lib/installer-exclude/jmf.jar and b/lib/installer-exclude/jmf.jar differ diff --git a/lib/native/linux-64/libjportaudio.so b/lib/native/linux-64/libjportaudio.so index fd0d01ecb..2663c655c 100755 Binary files a/lib/native/linux-64/libjportaudio.so and b/lib/native/linux-64/libjportaudio.so differ diff --git a/lib/native/linux/libjportaudio.so b/lib/native/linux/libjportaudio.so index d7476dbf3..a0136d3b1 100755 Binary files a/lib/native/linux/libjportaudio.so and b/lib/native/linux/libjportaudio.so differ diff --git a/lib/os-specific/linux/installer-exclude/jmf.jar b/lib/os-specific/linux/installer-exclude/jmf.jar index 79d061e2c..1ca7441a9 100644 Binary files a/lib/os-specific/linux/installer-exclude/jmf.jar and b/lib/os-specific/linux/installer-exclude/jmf.jar differ diff --git a/lib/os-specific/mac/installer-exclude/jmf.jar b/lib/os-specific/mac/installer-exclude/jmf.jar index 8a8602cc0..4e28a33fe 100644 Binary files a/lib/os-specific/mac/installer-exclude/jmf.jar and b/lib/os-specific/mac/installer-exclude/jmf.jar differ diff --git a/lib/os-specific/solaris/installer-exclude/jmf.jar b/lib/os-specific/solaris/installer-exclude/jmf.jar index 778b8d8da..459c25fa6 100644 Binary files a/lib/os-specific/solaris/installer-exclude/jmf.jar and b/lib/os-specific/solaris/installer-exclude/jmf.jar differ diff --git a/lib/os-specific/windows/installer-exclude/jmf.jar b/lib/os-specific/windows/installer-exclude/jmf.jar index 9cc7ab34e..268e925ab 100644 Binary files a/lib/os-specific/windows/installer-exclude/jmf.jar and b/lib/os-specific/windows/installer-exclude/jmf.jar differ diff --git a/resources/install/build.xml b/resources/install/build.xml index a78716447..0378232b7 100644 --- a/resources/install/build.xml +++ b/resources/install/build.xml @@ -949,6 +949,21 @@ token="_PACKAGE_NAME_" value="${package.name}"/> + + + + + + + + + + + _DATE_ diff --git a/src/native/portaudio/README b/src/native/portaudio/README index 969cedc48..101913bc3 100644 --- a/src/native/portaudio/README +++ b/src/native/portaudio/README @@ -63,3 +63,8 @@ -02 \ LIBS=-L$(PORTAUDIO_HOME)/lib/.libs -static -lportaudio -lspeexdsp -lwinmm -lm -lstdc++ -lole32 -luuid $ make + + +NOTES: + The patch pa_linux_alsa.c.fix.blocked.renderer.patch must be applied after + applying pa_linux_alsa.c-by-Werner.patch. diff --git a/src/native/portaudio/pa_linux_alsa.c.fix.blocked.renderer.patch b/src/native/portaudio/pa_linux_alsa.c.fix.blocked.renderer.patch new file mode 100644 index 000000000..1f131bd50 --- /dev/null +++ b/src/native/portaudio/pa_linux_alsa.c.fix.blocked.renderer.patch @@ -0,0 +1,39 @@ +Index: pa_linux_alsa.c +=================================================================== +--- pa_linux_alsa.c (revision 1418) ++++ pa_linux_alsa.c (working copy) +@@ -315,7 +315,10 @@ + } + + PaUtil_FreeMemory( alsaHostApi ); +- snd_config_update_free_global(); ++// damencho, removed fo compability with pulseaudio versions before 0.9.16 ++// segfault application: ++// bugtrack alsa: 0002124: snd_config_update_free_global kills applications using user space alsa plugins ++// snd_config_update_free_global(); + } + + /** Determine max channels and default latencies. +@@ -1364,7 +1367,7 @@ + + ENSURE_( snd_pcm_sw_params_set_avail_min( self->pcm, swParams, self->framesPerBuffer ), paUnanticipatedHostError ); + ENSURE_( snd_pcm_sw_params_set_xfer_align( self->pcm, swParams, 1 ), paUnanticipatedHostError ); +- ENSURE_( snd_pcm_sw_params_set_tstamp_mode( self->pcm, swParams, SND_PCM_TSTAMP_ENABLE ), paUnanticipatedHostError ); ++ ENSURE_( snd_pcm_sw_params_set_tstamp_mode( self->pcm, swParams, SND_PCM_TSTAMP_MMAP ), paUnanticipatedHostError ); + + /* Set the parameters! */ + ENSURE_( snd_pcm_sw_params( self->pcm, swParams ), paUnanticipatedHostError ); +@@ -2788,6 +2807,13 @@ + + *shouldPoll = 0; + } ++ else ++ { ++ // not actually used ++ unsigned long framesAvail = 0; ++ // now check for xrun ++ PaAlsaStreamComponent_GetAvailableFrames(self, &framesAvail, xrun ); ++ } + + error: + return result;