-diff -urN -x CVS arts.orig/admin/acinclude.m4.in arts/admin/acinclude.m4.in
---- arts.orig/admin/acinclude.m4.in 2005-02-09 23:21:09.000000000 +0100
-+++ arts/admin/acinclude.m4.in 2005-03-09 11:53:14.000000000 +0100
-@@ -3194,6 +3194,51 @@
- ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), [])
- ])
-
-+AC_DEFUN([KDE_CHECK_VISIBILITY_GCC_BUG],
-+ [
-+ AC_CACHE_CHECK([for gcc -fvisibility-inlines-hidden bug], kde_cv_val_gcc_visibility_bug,
-+ [
-+ AC_LANG_SAVE
-+ AC_LANG_CPLUSPLUS
-+
-+ safe_CXXFLAGS=$CXXFLAGS
-+ safe_LDFLAGS=$LDFLAGS
-+ CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0"
-+ LDFLAGS="$LDFLAGS -shared -fPIC"
-+
-+ AC_TRY_LINK(
-+ [
-+ /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */
-+ template<typename CharT>
-+ struct VisTest
-+ {
-+ inline VisTest ();
-+ };
-+ template<typename CharT>
-+ inline VisTest<CharT>::VisTest()
-+ {}
-+ extern template class VisTest<char>; // It works if we drop that line
-+ int some_function( int do_something ) __attribute__ ((visibility("default")));
-+ int some_function( int )
-+ {
-+ VisTest<char> a;
-+ return 0;
-+ }
-+ ], [/* elvis is alive */],
-+ kde_cv_val_gcc_visibility_bug=no, kde_cv_val_gcc_visibility_bug=yes)
-+
-+ CXXFLAGS=$safe_CXXFLAGS
-+ LDFLAGS=$safe_LDFLAGS
-+ AC_LANG_RESTORE
-+ ]
-+ )
-+
-+ if test x$kde_cv_val_gcc_visibility_bug = xno; then
-+ CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-+ fi
-+ ]
-+)
-+
- AC_DEFUN([KDE_CHECK_AND_ADD_HIDDEN_VISIBILITY],
- [
- if test "$GXX" = "yes"; then
-@@ -3202,7 +3247,9 @@
- KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
- KDE_CHECK_COMPILER_FLAG(fvisibility=hidden,
- [
-- CXXFLAGS="$CXXFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
-+ CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-+ KDE_CHECK_VISIBILITY_GCC_BUG
-+
- HAVE_GCC_VISIBILITY=1
- AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
- ])
-diff -urN -x CVS arts.orig/flow/audioioalsa9.cc arts/flow/audioioalsa9.cc
---- arts.orig/flow/audioioalsa9.cc 2004-05-26 20:50:18.000000000 +0200
-+++ arts/flow/audioioalsa9.cc 2005-03-09 15:07:43.000000000 +0100
-@@ -394,7 +394,9 @@
- int frames = snd_pcm_bytes_to_frames(m_pcm_capture, size);
- int length;
- while ((length = snd_pcm_readi(m_pcm_capture, buffer, frames)) < 0) {
-- if (length == -EPIPE)
-+ if (length == -EINTR)
-+ continue; // Try again
-+ else if (length == -EPIPE)
- length = xrun(m_pcm_capture);
- #ifdef HAVE_SND_PCM_RESUME
- else if (length == -ESTRPIPE)
-@@ -413,7 +415,9 @@
- int frames = snd_pcm_bytes_to_frames(m_pcm_playback, size);
- int length;
- while ((length = snd_pcm_writei(m_pcm_playback, buffer, frames)) < 0) {
-- if (length == -EPIPE)
-+ if (length == -EINTR)
-+ continue; // Try again
-+ else if (length == -EPIPE)
- length = xrun(m_pcm_playback);
- #ifdef HAVE_SND_PCM_RESUME
- else if (length == -ESTRPIPE)
-diff -urN -x CVS arts.orig/flow/audioioalsa.cc arts/flow/audioioalsa.cc
---- arts.orig/flow/audioioalsa.cc 2001-11-05 18:29:57.000000000 +0100
-+++ arts/flow/audioioalsa.cc 2005-03-09 15:07:43.000000000 +0100
-@@ -374,7 +374,10 @@
-
- int AudioIOALSA::read(void *buffer, int size)
- {
-- int length = snd_pcm_read(m_pcm_handle, buffer, size);
-+ int length;
-+ do {
-+ length = snd_pcm_read(m_pcm_handle, buffer, size);
-+ } while (length == -EINTR);
- if(length == -EPIPE) {
- snd_pcm_channel_status_t status;
- (void)memset(&status, 0, sizeof(status));
-@@ -409,7 +412,10 @@
-
- int AudioIOALSA::write(void *buffer, int size)
- {
-- while(snd_pcm_write(m_pcm_handle, buffer, size) != size) {
-+ int length;
-+ while((length = snd_pcm_write(m_pcm_handle, buffer, size)) != size) {
-+ if (length == -EINTR)
-+ continue; // Try again
- snd_pcm_channel_status_t status;
- (void)memset(&status, 0, sizeof(status));
- status.channel = SND_PCM_CHANNEL_PLAYBACK;
+Index: tests/testifacerepo.cc
+===================================================================
+--- tests/testifacerepo.cc (.../tags/arts/1.5.4/arts) (revision 582125)
++++ tests/testifacerepo.cc (.../branches/arts/1.5/arts) (revision 582125)
+@@ -21,7 +21,7 @@
+ */
+
+ #include <algorithm>
+-#include "core.h"
++#include "common.h"
+ #include "test.h"
+
+ using namespace Arts;
+Index: tests/testanyref.cc
+===================================================================
+--- tests/testanyref.cc (.../tags/arts/1.5.4/arts) (revision 582125)
++++ tests/testanyref.cc (.../branches/arts/1.5/arts) (revision 582125)
+@@ -20,8 +20,7 @@
+
+ */
+
+-#include "anyref.h"
+-#include "core.h"
++#include "common.h"
+ #include "test.h"
+
+ using namespace Arts;
+Index: flow/audioioalsa.cc
+===================================================================
+--- flow/audioioalsa.cc (.../tags/arts/1.5.4/arts) (revision 582125)
++++ flow/audioioalsa.cc (.../branches/arts/1.5/arts) (revision 582125)
+@@ -114,7 +114,11 @@
+ */
+ m_card = snd_defaults_pcm_card(); //!! need interface !!
+ m_device = snd_defaults_pcm_device(); //!!
++#ifdef WORDS_BIGENDIAN
++ m_format = SND_PCM_SFMT_S16_BE;
++#else
+ m_format = SND_PCM_SFMT_S16_LE;
++#endif
+ m_bufferMode = block; //block/stream (stream mode doesn't work yet)
+
+ if(m_card >= 0) {
+Index: examples/referenceinfo.cc
+===================================================================
+--- examples/referenceinfo.cc (.../tags/arts/1.5.4/arts) (revision 582125)
++++ examples/referenceinfo.cc (.../branches/arts/1.5/arts) (revision 582125)
+@@ -23,7 +23,7 @@
+
+ */
+
+-#include "core.h"
++#include "common.h"
+ #include <stdio.h>
+
+ using namespace Arts;
+Index: examples/x11commtest.cc
+===================================================================
+--- examples/x11commtest.cc (.../tags/arts/1.5.4/arts) (revision 582125)
++++ examples/x11commtest.cc (.../branches/arts/1.5/arts) (revision 582125)
+@@ -25,7 +25,7 @@
+ */
+
+ #include <iostream>
+-#include "core.h"
++#include "common.h"
+
+ using namespace std;
+ using namespace Arts;
+Index: examples/helloserver.cc
+===================================================================
+--- examples/helloserver.cc (.../tags/arts/1.5.4/arts) (revision 582125)
++++ examples/helloserver.cc (.../branches/arts/1.5/arts) (revision 582125)
+@@ -23,7 +23,7 @@
+
+ */
+
+-#include "core.h"
++#include "common.h"
+ #include "hello_impl.h"
+
+ #include <stdio.h>
+Index: Makefile.am.in
+===================================================================
+--- Makefile.am.in (.../tags/arts/1.5.4/arts) (revision 582125)
++++ Makefile.am.in (.../branches/arts/1.5/arts) (revision 582125)
+@@ -21,7 +21,7 @@
+
+ $(top_srcdir)/acinclude.m4: $(top_srcdir)/libltdl/ltdl.m4
+
+-AUTOMAKE_OPTIONS = foreign 1.5
++AUTOMAKE_OPTIONS = foreign 1.6.1
+ COMPILE_FIRST = libltdl mcop mcopidl flow mcop_mt soundserver artsc examples tests doc
+ EXTRA_DIST = admin
+
+
+Property changes on: .
+___________________________________________________________________
+Name: svn:externals
+ + libltdl https://svn.kde.org/home/kde/branches/KDE/3.5/kdelibs/libltdl
+admin https://svn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin
+
+
projects / packages / arts.git / blobdiff