1 diff -urN -x CVS arts.orig/admin/acinclude.m4.in arts/admin/acinclude.m4.in
2 --- arts.orig/admin/acinclude.m4.in 2005-02-09 23:21:09.000000000 +0100
3 +++ arts/admin/acinclude.m4.in 2005-03-09 11:53:14.000000000 +0100
5 ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), [])
8 +AC_DEFUN([KDE_CHECK_VISIBILITY_GCC_BUG],
10 + AC_CACHE_CHECK([for gcc -fvisibility-inlines-hidden bug], kde_cv_val_gcc_visibility_bug,
15 + safe_CXXFLAGS=$CXXFLAGS
16 + safe_LDFLAGS=$LDFLAGS
17 + CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0"
18 + LDFLAGS="$LDFLAGS -shared -fPIC"
22 + /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */
23 + template<typename CharT>
28 + template<typename CharT>
29 + inline VisTest<CharT>::VisTest()
31 + extern template class VisTest<char>; // It works if we drop that line
32 + int some_function( int do_something ) __attribute__ ((visibility("default")));
33 + int some_function( int )
38 + ], [/* elvis is alive */],
39 + kde_cv_val_gcc_visibility_bug=no, kde_cv_val_gcc_visibility_bug=yes)
41 + CXXFLAGS=$safe_CXXFLAGS
42 + LDFLAGS=$safe_LDFLAGS
47 + if test x$kde_cv_val_gcc_visibility_bug = xno; then
48 + CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
53 AC_DEFUN([KDE_CHECK_AND_ADD_HIDDEN_VISIBILITY],
55 if test "$GXX" = "yes"; then
57 KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
58 KDE_CHECK_COMPILER_FLAG(fvisibility=hidden,
60 - CXXFLAGS="$CXXFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
61 + CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
62 + KDE_CHECK_VISIBILITY_GCC_BUG
65 AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
67 diff -urN -x CVS arts.orig/flow/audioioalsa9.cc arts/flow/audioioalsa9.cc
68 --- arts.orig/flow/audioioalsa9.cc 2004-05-26 20:50:18.000000000 +0200
69 +++ arts/flow/audioioalsa9.cc 2005-03-09 15:07:43.000000000 +0100
71 int frames = snd_pcm_bytes_to_frames(m_pcm_capture, size);
73 while ((length = snd_pcm_readi(m_pcm_capture, buffer, frames)) < 0) {
74 - if (length == -EPIPE)
75 + if (length == -EINTR)
76 + continue; // Try again
77 + else if (length == -EPIPE)
78 length = xrun(m_pcm_capture);
79 #ifdef HAVE_SND_PCM_RESUME
80 else if (length == -ESTRPIPE)
82 int frames = snd_pcm_bytes_to_frames(m_pcm_playback, size);
84 while ((length = snd_pcm_writei(m_pcm_playback, buffer, frames)) < 0) {
85 - if (length == -EPIPE)
86 + if (length == -EINTR)
87 + continue; // Try again
88 + else if (length == -EPIPE)
89 length = xrun(m_pcm_playback);
90 #ifdef HAVE_SND_PCM_RESUME
91 else if (length == -ESTRPIPE)
92 diff -urN -x CVS arts.orig/flow/audioioalsa.cc arts/flow/audioioalsa.cc
93 --- arts.orig/flow/audioioalsa.cc 2001-11-05 18:29:57.000000000 +0100
94 +++ arts/flow/audioioalsa.cc 2005-03-09 15:07:43.000000000 +0100
97 int AudioIOALSA::read(void *buffer, int size)
99 - int length = snd_pcm_read(m_pcm_handle, buffer, size);
102 + length = snd_pcm_read(m_pcm_handle, buffer, size);
103 + } while (length == -EINTR);
104 if(length == -EPIPE) {
105 snd_pcm_channel_status_t status;
106 (void)memset(&status, 0, sizeof(status));
109 int AudioIOALSA::write(void *buffer, int size)
111 - while(snd_pcm_write(m_pcm_handle, buffer, size) != size) {
113 + while((length = snd_pcm_write(m_pcm_handle, buffer, size)) != size) {
114 + if (length == -EINTR)
115 + continue; // Try again
116 snd_pcm_channel_status_t status;
117 (void)memset(&status, 0, sizeof(status));
118 status.channel = SND_PCM_CHANNEL_PLAYBACK;