Ignore:
Timestamp:
Mar 9, 2003, 3:52:46 PM (18 years ago)
Author:
ranger
Message:

updated to use new admin dir and esound driver patch

Location:
trunk/dports/audio/arts
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/audio/arts/Portfile

    r2122 r2194  
    1 # $Id: Portfile,v 1.2 2003/03/03 06:10:39 mij Exp $
     1# $Id: Portfile,v 1.3 2003/03/09 15:52:46 ranger Exp $
    22
    33PortSystem 1.0
    44name            arts
    55version         1.1
    6 revision        1
     6revision        2
    77categories      audio
    88maintainers     ranger@befunk.com
     
    2323use_bzip2       yes
    2424distname        arts-${version}
    25 distfiles       ${distname}.tar.bz2 kde-admindir-20030119.tar.bz2:admin
     25distfiles       ${distname}.tar.bz2 kde-admindir-20030209.tar.bz2:admin
    2626patchfiles      patch-arts-${version}.darwin
    2727depends_lib     lib:libaudiofile.0:audiofile lib:libdl.1:dlcompat lib:libglib-2.0.0:glib2 \
     
    3333
    3434checksums       arts-${version}.tar.bz2 md5 c1c34063de7df4ac6cae0984803d34e1 \
    35                 kde-admindir-20030119.tar.bz2 md5 d77e6398b06fefd9e9a7e69c4dceebde
     35                kde-admindir-20030209.tar.bz2 md5 180fee362e27703bd9a062912c8a54cd
    3636
    3737patch {
  • trunk/dports/audio/arts/files/patch-arts-1.1.darwin

    r1900 r2194  
    1 
    2 --- Makefile.am.in      1 Oct 2002 01:47:59 -0000       1.1.1.2
    3 +++ Makefile.am.in      1 Oct 2002 01:54:35 -0000       1.3
     1diff -uNbr Makefile.am.in Makefile.am.in
     2--- Makefile.am.in      Sun Sep 22 07:28:09 2002
     3+++ Makefile.am.in      Mon Mar  3 09:19:29 2003
    44@@ -27,7 +27,7 @@
    55        cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common subdirs
     
    1111 
    1212 dist-hook:
    13 --- configure.in.in     26 Nov 2002 21:22:13 -0000      1.1.1.6
    14 +++ configure.in.in     26 Nov 2002 21:24:05 -0000      1.19
    15 @@ -284,6 +284,19 @@
     13diff -uNbr artsc/Makefile.am artsc/Makefile.am
     14--- artsc/Makefile.am   Sun Sep 22 07:28:10 2002
     15+++ artsc/Makefile.am   Mon Mar  3 09:19:29 2003
     16@@ -9,19 +9,19 @@
     17 bin_SCRIPTS = artsc-config artsdsp
     18 
     19 libartsdsp_la_SOURCES = artsdsp.c
     20-libartsdsp_la_LDFLAGS = -no-undefined -module
     21+libartsdsp_la_LDFLAGS = -no-undefined -module -avoid-version
     22 libartsdsp_la_LIBADD = libartsc.la
     23 
     24 libartsdsp_st_la_SOURCES = artsc.c artsdsp.c
     25-libartsdsp_st_la_LDFLAGS = -no-undefined -module
     26+libartsdsp_st_la_LDFLAGS = -no-undefined -module -avoid-version
     27 libartsdsp_st_la_LIBADD = $(top_builddir)/libltdl/libltdlc.la
     28 
     29 libartsc_la_SOURCES = artsc.c
     30-libartsc_la_LDFLAGS = -no-undefined
     31+libartsc_la_LDFLAGS = -no-undefined -version-info 2:0:1
     32 libartsc_la_LIBADD = $(top_builddir)/libltdl/libltdlc.la $(LIBPTHREAD) $(USE_THREADS)
     33 
     34 libartscbackend_la_SOURCES = artscbackend.cc
     35-libartscbackend_la_LDFLAGS = -no-undefined -module $(KDE_RPATH)
     36+libartscbackend_la_LDFLAGS = -no-undefined -module $(KDE_RPATH) -avoid-version
     37 libartscbackend_la_LIBADD = $(FLOWLIBS) \
     38     $(top_builddir)/soundserver/libsoundserver_idl.la
     39 
     40diff -uNbr artsc/artsc-config.in artsc/artsc-config.in
     41--- artsc/artsc-config.in       Thu Apr  5 04:30:43 2001
     42+++ artsc/artsc-config.in       Mon Mar  3 09:19:29 2003
     43@@ -27,7 +27,7 @@
     44 do
     45   case $1 in
     46     --libs)
     47-         flags="$flags -L$libdir $libdl -lartsc @USE_THREADS@ @LIBPTHREAD@"
     48+         flags="$flags -L$libdir $libdl -lartsc @USE_THREADS@ @LIBPTHREAD@ @FRAMEWORK_COREAUDIO@"
     49          ;;
     50     --cflags)
     51          flags="$flags -I$includedir/artsc"
     52diff -uNbr configure.in.in configure.in.in
     53--- configure.in.in     Sat Nov 23 13:11:10 2002
     54+++ configure.in.in     Mon Mar  3 09:21:58 2003
     55@@ -184,6 +184,35 @@
     56   LDFLAGS="$ac_ldflags_save"
     57 ])
     58 
     59+dnl Check for libesd (for EsounD support)
     60+AC_DEFUN([AC_CHECK_LIBESD],
     61+[
     62+  ac_ldflags_save="$LDFLAGS"
     63+  ac_CPPFLAGS_save="$CPPFLAGS"
     64+  LDFLAGS="$all_libraries $LDFLAGS"
     65+  CPPFLAGS="$CPPFLAGS $all_includes"
     66+
     67+  AC_LANG_SAVE
     68+  AC_LANG_C
     69+  arts_libaudionas_include=no
     70+  AC_CHECK_HEADER(esd.h,
     71+  [
     72+    arts_libesd_include=yes
     73+  ])
     74+  if test "x$arts_libesd_include" = "xyes"; then
     75+    AC_CHECK_LIB(esd,esd_open_sound,[
     76+     dnl LDFLAGS in case it's in KDEDIR/lib
     77+     LIBESD="$LDFLAGS -lesd"
     78+     AC_DEFINE(HAVE_LIBESD, 1,
     79+        [Define if you have libesd (required if you want EsounD support)])
     80+   ])
     81+  fi
     82+  AC_SUBST(LIBESD)
     83+  AC_LANG_RESTORE
     84+  CPPFLAGS="$ac_CPPFLAGS_save"
     85+  LDFLAGS="$ac_ldflags_save"
     86+])
     87+
     88 dnl libaudiofile is used for loading wave files
     89 AC_DEFUN([AC_CHECK_LIBAUDIOFILE],
     90 [
     91@@ -284,6 +313,19 @@
    1692 fi
    1793 ])
     
    33109 dnl not required for Linux vs. FreeBSD (for which this test was written), and
    34110 dnl that only the Linux documentation claims that it has an "int" as second
    35 @@ -434,6 +447,7 @@
     111@@ -431,9 +473,11 @@
     112 dnl call the tests
     113 AC_CHECK_LIBAUDIOIO
     114 AC_CHECK_LIBAUDIONAS
     115+AC_CHECK_LIBESD
    36116 AC_CHECK_LIBAUDIOFILE
    37117 AC_CHECK_SGILIBAUDIO
     
    41121 AC_CHECK_IOCTL_TYPE
    42122 AC_CHECK_X86_FLOAT_INT
    43 @@ -606,6 +620,27 @@
     123@@ -606,6 +650,27 @@
    44124 AC_CHECK_HEADERS(soundcard.h)
    45125 AC_CHECK_LIB(ossaudio, _oss_ioctl, [LIBOSSAUDIO="-lossaudio"])
     
    69149 dnl Don't remove !
    70150 dnl AC_OUTPUT(artsc/artsc-config)
    71 --- artsc/Makefile.am   14 Aug 2002 13:21:23 -0000      1.1.1.3
    72 +++ artsc/Makefile.am   12 Jan 2003 18:00:00 -0000      1.10
    73 @@ -9,19 +9,19 @@
    74  bin_SCRIPTS = artsc-config artsdsp
    75  
    76  libartsdsp_la_SOURCES = artsdsp.c
    77 -libartsdsp_la_LDFLAGS = -no-undefined -module
    78 +libartsdsp_la_LDFLAGS = -no-undefined -module -avoid-version
    79  libartsdsp_la_LIBADD = libartsc.la
    80  
    81  libartsdsp_st_la_SOURCES = artsc.c artsdsp.c
    82 -libartsdsp_st_la_LDFLAGS = -no-undefined -module
    83 +libartsdsp_st_la_LDFLAGS = -no-undefined -module -avoid-version
    84  libartsdsp_st_la_LIBADD = $(top_builddir)/libltdl/libltdlc.la
    85  
    86  libartsc_la_SOURCES = artsc.c
    87 -libartsc_la_LDFLAGS = -no-undefined
    88 +libartsc_la_LDFLAGS = -no-undefined -version-info 2:0:1
    89  libartsc_la_LIBADD = $(top_builddir)/libltdl/libltdlc.la $(LIBPTHREAD) $(USE_THREADS)
    90  
    91  libartscbackend_la_SOURCES = artscbackend.cc
    92 -libartscbackend_la_LDFLAGS = -no-undefined -module $(KDE_RPATH)
    93 +libartscbackend_la_LDFLAGS = -no-undefined -module $(KDE_RPATH) -avoid-version
    94  libartscbackend_la_LIBADD = $(FLOWLIBS) \
    95      $(top_builddir)/soundserver/libsoundserver_idl.la
    96  
    97 --- artsc/artsc-config.in       25 Jun 2002 01:45:58 -0000      1.1.1.1
    98 +++ artsc/artsc-config.in       26 Nov 2002 21:00:47 -0000      1.2
    99 @@ -27,7 +27,7 @@
    100  do
    101    case $1 in
    102      --libs)
    103 -         flags="$flags -L$libdir $libdl -lartsc @USE_THREADS@ @LIBPTHREAD@"
    104 +         flags="$flags -L$libdir $libdl -lartsc @USE_THREADS@ @LIBPTHREAD@ @FRAMEWORK_COREAUDIO@"
    105           ;;
    106      --cflags)
    107           flags="$flags -I$includedir/artsc"
    108 --- flow/Makefile.am    1 Oct 2002 01:48:02 -0000       1.1.1.3
    109 +++ flow/Makefile.am    21 Nov 2002 21:28:34 -0000      1.15
     151diff -uNbr flow/Makefile.am flow/Makefile.am
     152--- flow/Makefile.am    Sun Sep 22 07:28:10 2002
     153+++ flow/Makefile.am    Mon Mar  3 09:22:46 2003
    110154@@ -1,6 +1,8 @@
    111155+AM_CFLAGS = -DGSL_WANT_GLIB_WRAPPER -DGSL_WANT_ARTS_THREADS
     
    125169-  $(top_builddir)/flow/gsl/libgsl.la
    126170-libartsflow_la_LDFLAGS = -no-undefined -version-info 1:0
    127 +libartsflow_la_LIBADD = $(top_builddir)/mcop/libmcop.la libartsflow_idl.la $(top_builddir)/flow/gslpp/libgslpp.la $(LIBAUDIOFILE) $(LIBASOUND) $(LIBAUDIOIO) $(LIBOSSAUDIO) $(LIBOSS_LIBADD) $(LIBAUDIONAS) $(LIBCSL) $(SGILIBAUDIO) -lm \
     171+libartsflow_la_LIBADD = $(top_builddir)/mcop/libmcop.la libartsflow_idl.la $(top_builddir)/flow/gslpp/libgslpp.la $(LIBAUDIOFILE) $(LIBASOUND) $(LIBAUDIOIO) $(LIBOSSAUDIO) $(LIBOSS_LIBADD) $(LIBAUDIONAS) $(LIBCSL) $(SGILIBAUDIO) $(LIBESD) -lm \
    128172+ $(top_builddir)/flow/gsl/libgsl.la $(LIB_POLL)
    129173+libartsflow_la_LDFLAGS = -no-undefined -version-info 1:0 $(LIBOSS_LDFLAGS) $(FRAMEWORK_COREAUDIO)
     
    131175 libartsflow_la_SOURCES =  synth_play_impl.cc \
    132176   synthschedule.cc gslschedule.cc audiosubsys.cc \
    133 @@ -26,7 +28,7 @@
    134    audioionull.cc audioiolibaudioio.cc \
     177@@ -23,10 +25,10 @@
     178   stereoeffectstack_impl.cc fft.c stereofftscope_impl.cc virtualports.cc \
     179   bus.cc audiomanager_impl.cc synth_record_impl.cc resample.cc \
     180   audioio.cc audioiooss.cc audioioalsa.cc audioioalsa9.cc \
     181-  audioionull.cc audioiolibaudioio.cc \
     182+  audioionull.cc audioiolibaudioio.cc audioioesd.cc \
    135183   audioiosun.cc audioioaix.cc audioionas.cc cpuinfo.cc \
    136184   audioioossthreaded.cc audiotobytestream_impl.cc audioiosgi.cc \
     
    140188 artsincludedir = $(includedir)/arts
    141189 artsinclude_HEADERS = artsflow.h audiosubsys.h cache.h \
    142 RCS file: flow/audioiocoreaudio.cc
    143 diff -N flow/audioiocoreaudio.cc
    144 --- /dev/null   1 Jan 1970 00:00:00 -0000
    145 +++ flow/audioiocoreaudio.cc    17 Dec 2002 04:34:10 -0000      1.10
     190diff -uNbr flow/audioiocoreaudio.cc flow/audioiocoreaudio.cc
     191--- flow/audioiocoreaudio.cc    Wed Dec 31 19:00:00 1969
     192+++ flow/audioiocoreaudio.cc    Mon Mar  3 09:19:29 2003
    146193@@ -0,0 +1,690 @@
    147194+    /*
     
    665712+
    666713+               case autoDetect:
    667 +                       return 12; // so we're higher than liboss
     714+                       return 11; // so we're higher than liboss
    668715+                       break;
    669716+                       
     
    835882+
    836883+#endif // HAVE_COREAUDIO
    837 --- flow/audioiooss.cc  29 Oct 2002 02:31:12 -0000      1.1.1.3
    838 +++ flow/audioiooss.cc  7 Nov 2002 00:16:37 -0000       1.6
     884diff -uNbr flow/audioioesd.cc flow/audioioesd.cc
     885--- flow/audioioesd.cc  Wed Dec 31 19:00:00 1969
     886+++ flow/audioioesd.cc  Mon Mar  3 09:19:54 2003
     887@@ -0,0 +1,237 @@
     888+    /*
     889+
     890+    Copyright (C) 2001 Jochen Hoenicke
     891+                       jochen@gnu.org
     892+
     893+    Copyright (C) 2003 Ian Chiew
     894+                       ian@snork.net
     895+
     896+    This library is free software; you can redistribute it and/or
     897+    modify it under the terms of the GNU Library General Public
     898+    License as published by the Free Software Foundation; either
     899+    version 2 of the License, or (at your option) any later version.
     900
     901+    This library is distributed in the hope that it will be useful,
     902+    but WITHOUT ANY WARRANTY; without even the implied warranty of
     903+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     904+    Library General Public License for more details.
     905+   
     906+    You should have received a copy of the GNU Library General Public License
     907+    along with this library; see the file COPYING.LIB.  If not, write to
     908+    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     909+    Boston, MA 02111-1307, USA.
     910+
     911+    */
     912+
     913+#ifdef HAVE_CONFIG_H
     914+#include <config.h>
     915+#endif
     916+
     917+/**
     918+ * only compile esound AudioIO class if libesd was detected during
     919+ * configure
     920+ */
     921+#ifdef HAVE_LIBESD
     922+
     923+#include <sys/types.h>
     924+#include <sys/ioctl.h>
     925+#include <sys/time.h>
     926+#include <sys/stat.h>
     927+
     928+#include <assert.h>
     929+#include <errno.h>
     930+#include <fcntl.h>
     931+#include <stdio.h>
     932+#include <stdlib.h>
     933+#include <unistd.h>
     934+#include <iostream>
     935+
     936+#include "audioio.h"
     937+#include "audiosubsys.h"
     938+#include "iomanager.h"
     939+#include "dispatcher.h"
     940+
     941+#include <esd.h>
     942+
     943+#ifdef __BIG_ENDIAN__
     944+#define _format_bits 17
     945+#else
     946+#define _format_bits 16
     947+#endif
     948+
     949+namespace Arts {
     950+
     951+class AudioIOESD : public AudioIO, public IONotify {
     952+protected:
     953+       int server_fd, read_fd, write_fd;
     954+
     955+public:
     956+       AudioIOESD();
     957+
     958+       void setParam(AudioParam param, int& value);
     959+       int getParam(AudioParam param);
     960+       void notifyIO(int fd, int type);
     961+
     962+       bool open();
     963+       void close();
     964+       void run();
     965+       int read(void *buffer, int size);
     966+       int write(void *buffer, int size);
     967+};
     968+
     969+REGISTER_AUDIO_IO(AudioIOESD,"esd","Enlightened Sound Daemon");
     970+};
     971+
     972+using namespace std;
     973+using namespace Arts;
     974+
     975+AudioIOESD::AudioIOESD()
     976+{
     977+       /*
     978+        * default parameters
     979+        */
     980+       param(samplingRate) = 44100;
     981+       paramStr(deviceName) = "null";
     982+       param(fragmentSize) = 1024;
     983+       param(fragmentCount) = 7;
     984+       param(format) = _format_bits;
     985+       param(channels) = 2;
     986+       param(direction) = 2;
     987+
     988+       server_fd = -1;
     989+       read_fd = -1;
     990+       write_fd = -1;
     991+}
     992+
     993+bool AudioIOESD::open()
     994+{
     995+       int& _channels = param(channels);
     996+       int& _direction = param(direction);
     997+       int& _fragmentSize = param(fragmentSize);
     998+       int& _fragmentCount = param(fragmentCount);
     999+       int& _samplingRate = param(samplingRate);
     1000+       int& _format = param(format);
     1001+       string& _device = paramStr(deviceName);
     1002+       string& _error = paramStr(lastError);
     1003+
     1004+       if ((server_fd = esd_open_sound(NULL)) == -1)
     1005+       {
     1006+               _error = "Couldn't connect to server";
     1007+               return false;
     1008+       }
     1009+
     1010+       esd_server_info_t *server_info = esd_get_server_info(server_fd);
     1011+
     1012+       if (server_info == NULL)
     1013+       {
     1014+               _error = "Unable to query EsounD server";
     1015+               return false;
     1016+       }
     1017+       
     1018+       esd_format_t server_format = server_info->format;
     1019+
     1020+       _samplingRate = server_info->rate;
     1021+       _channels     = (server_format & ESD_STEREO) ? 2            : 1;
     1022+       _format       = (server_format & ESD_BITS16) ? _format_bits : 8;
     1023+
     1024+       esd_free_server_info(server_info);
     1025+       
     1026+       if (_direction & directionRead)
     1027+       {
     1028+               read_fd = esd_record_stream(server_format, _samplingRate,
     1029+                                           NULL, "aRts");
     1030+               if (read_fd == -1)
     1031+               {
     1032+                       _error = "Couldn't create read uflow";
     1033+                       return false;
     1034+               }
     1035+       }
     1036+
     1037+       if (_direction & directionWrite)
     1038+       {
     1039+               write_fd = esd_play_stream(server_format, _samplingRate,
     1040+                                          NULL, "aRts");
     1041+               if (write_fd == -1)
     1042+               {
     1043+                       _error = "Couldn't create write flow";
     1044+                       return false;
     1045+               }
     1046+       }
     1047+
     1048+       return true;
     1049+}
     1050+
     1051+void AudioIOESD::notifyIO(int, int)
     1052+{
     1053+}
     1054+
     1055+void AudioIOESD::close()
     1056+{
     1057+       if (write_fd != -1)
     1058+               esd_close(write_fd);
     1059+
     1060+       if (read_fd != -1)
     1061+               esd_close(read_fd);
     1062+
     1063+       if (server_fd != -1)
     1064+               esd_close(server_fd);
     1065+}
     1066+
     1067+void AudioIOESD::setParam(AudioParam p, int& value)
     1068+{
     1069+       switch(p)
     1070+       {
     1071+       case channels:
     1072+       case format:
     1073+       case direction:
     1074+       case samplingRate:
     1075+               param(p) = value;
     1076+               close();
     1077+               open();
     1078+               return;
     1079+
     1080+       default:
     1081+               param(p) = value;
     1082+               return;
     1083+       }
     1084+}
     1085+
     1086+int AudioIOESD::getParam(AudioParam p)
     1087+{
     1088+       switch(p)
     1089+       {
     1090+       case selectReadFD:
     1091+               return read_fd;
     1092+
     1093+       case selectWriteFD:
     1094+               return write_fd;
     1095+
     1096+       case canRead:
     1097+               return ESD_BUF_SIZE;
     1098+
     1099+       case canWrite:
     1100+               return ESD_BUF_SIZE;
     1101+
     1102+               // ESD handles are actually socket descriptors, and I know not
     1103+               // of any portable way to peek at the socket's send or receive
     1104+               // buffers.
     1105+
     1106+       case autoDetect:
     1107+               return 12;
     1108+
     1109+       default:
     1110+               return param(p);
     1111+       }
     1112+}
     1113+
     1114+int AudioIOESD::read(void *buffer, int size)
     1115+{
     1116+       return ::read(read_fd, buffer, size);
     1117+}
     1118+
     1119+int AudioIOESD::write(void *buffer, int size)
     1120+{
     1121+       return ::write(write_fd, buffer, size);
     1122+}
     1123+
     1124+#endif
     1125diff -uNbr flow/audioiooss.cc flow/audioiooss.cc
     1126--- flow/audioiooss.cc  Sat Oct 26 18:23:32 2002
     1127+++ flow/audioiooss.cc  Mon Mar  3 09:19:29 2003
    8391128@@ -28,10 +28,30 @@
    8401129 
     
    9811270 
    9821271        return result;
    983 --- flow/gsl/Makefile.am        29 Oct 2002 02:31:19 -0000      1.1.1.5
    984 +++ flow/gsl/Makefile.am        21 Nov 2002 21:28:34 -0000      1.11
     1272diff -uNbr flow/gsl/Makefile.am flow/gsl/Makefile.am
     1273--- flow/gsl/Makefile.am        Sat Oct 26 18:23:33 2002
     1274+++ flow/gsl/Makefile.am        Mon Mar  3 09:19:29 2003
    9851275@@ -1,4 +1,3 @@
    9861276-
     
    9971287 $(srcdir)/dummy.cc: gslconfig.h
    9981288 
    999 --- flow/gsl/gsldatahandle-mad.c        14 Aug 2002 13:21:15 -0000      1.1.1.2
    1000 +++ flow/gsl/gsldatahandle-mad.c        14 Aug 2002 13:24:52 -0000      1.3
     1289diff -uNbr flow/gsl/gsldatahandle-mad.c flow/gsl/gsldatahandle-mad.c
     1290--- flow/gsl/gsldatahandle-mad.c        Sun Sep 22 07:28:11 2002
     1291+++ flow/gsl/gsldatahandle-mad.c        Mon Mar  3 09:19:29 2003
    10011292@@ -31,6 +31,10 @@
    10021293 #include <string.h>
     
    10101301 #include <mad.h>
    10111302 
    1012 --- flow/gsl/gsldatahandle-vorbis.c     14 Aug 2002 13:21:17 -0000      1.1.1.3
    1013 +++ flow/gsl/gsldatahandle-vorbis.c     15 Dec 2002 07:26:39 -0000      1.4
    1014 @@ -225,7 +225,8 @@
    1015        if (err || vhandle->pcm_pos < 0)  /* urg, we're completely screwed */
     1303diff -uNbr flow/gsl/gsldatahandle-vorbis.c flow/gsl/gsldatahandle-vorbis.c
     1304--- flow/gsl/gsldatahandle-vorbis.c     Sun Sep 22 07:28:11 2002
     1305+++ flow/gsl/gsldatahandle-vorbis.c     Mon Mar  3 09:19:29 2003
     1306@@ -226,6 +226,7 @@
    10161307        vhandle->pcm_pos = 0;
    10171308       vhandle->pcm_length = 0;
    1018 -    }
    1019 +    } 
     1309     }
    10201310+if (0)
    10211311   g_printerr ("OggS-SEEK: at %lu want %lu got %lu (diff-requested %ld)\n",
    10221312              opos, pos, vhandle->pcm_pos, pos - opos);
    10231313 
    1024 --- libltdl/ltdl.c      10 Jul 2002 02:52:29 -0000      1.1.1.2
    1025 +++ libltdl/ltdl.c      26 Nov 2002 21:00:47 -0000      1.5
     1314diff -uNbr libltdl/ltdl.c libltdl/ltdl.c
     1315--- libltdl/ltdl.c      Mon Jul  1 15:01:37 2002
     1316+++ libltdl/ltdl.c      Mon Mar  3 09:19:29 2003
    10261317@@ -1544,11 +1544,14 @@
    10271318   /* try to open the old library first; if it was dlpreopened,
     
    10401331   if (dlname)
    10411332     {
    1042 --- libltdl/ltdl.m4     10 Jul 2002 02:52:29 -0000      1.1.1.2
    1043 +++ libltdl/ltdl.m4     22 Jan 2003 02:54:19 -0000      1.4
     1333diff -uNbr libltdl/ltdl.m4 libltdl/ltdl.m4
     1334--- libltdl/ltdl.m4     Mon Jul  1 15:01:37 2002
     1335+++ libltdl/ltdl.m4     Mon Mar  3 09:19:29 2003
    10441336@@ -103,6 +103,9 @@
    10451337        osf*)
     
    10691361     [Define if dlsym() requires a leading underscode in symbol names. ])
    10701362 fi
    1071 --- mcopidl/Makefile.am 14 Aug 2002 13:21:26 -0000      1.1.1.3
    1072 +++ mcopidl/Makefile.am 16 Sep 2002 14:31:34 -0000      1.2
     1363diff -uNbr mcopidl/Makefile.am mcopidl/Makefile.am
     1364--- mcopidl/Makefile.am Sun Sep 22 07:28:12 2002
     1365+++ mcopidl/Makefile.am Mon Mar  3 09:19:29 2003
    10731366@@ -1,4 +1,3 @@
    10741367-KDE_CXXFLAGS = $(NOOPT_CXXFLAGS)
     
    10761369 ####### Files
    10771370 
    1078 --- soundserver/Makefile.am     14 Aug 2002 13:21:26 -0000      1.1.1.4
    1079 +++ soundserver/Makefile.am     29 Nov 2002 18:19:36 -0000      1.10
     1371diff -uNbr soundserver/Makefile.am soundserver/Makefile.am
     1372--- soundserver/Makefile.am     Sun Sep 22 07:28:12 2002
     1373+++ soundserver/Makefile.am     Mon Mar  3 09:19:29 2003
    10801374@@ -38,13 +38,13 @@
    10811375 libartswavplayobject_la_SOURCES = wavplayobject_impl.cc
     
    10941388 
    10951389 ###### "real" programs
    1096 --- soundserver/artsd.cc        10 Jul 2002 02:52:33 -0000      1.1.1.2
    1097 +++ soundserver/artsd.cc        20 Oct 2002 19:11:01 -0000      1.4
     1390diff -uNbr soundserver/artsd.cc soundserver/artsd.cc
     1391--- soundserver/artsd.cc        Sun Jul  7 20:33:25 2002
     1392+++ soundserver/artsd.cc        Mon Mar  3 09:19:29 2003
    10981393@@ -35,6 +35,13 @@
    10991394 #include "debug.h"
     
    11611456        /* warn if there was a problem with artswrapper */
    11621457        char *wrapper = getenv("STARTED_THROUGH_ARTSWRAPPER");
    1163 --- soundserver/soundserverv2_impl.cc   25 Jun 2002 01:45:59 -0000      1.1.1.1
    1164 +++ soundserver/soundserverv2_impl.cc   25 Jun 2002 01:46:40 -0000      1.2
     1458diff -uNbr soundserver/soundserverv2_impl.cc soundserver/soundserverv2_impl.cc
     1459--- soundserver/soundserverv2_impl.cc   Sat Mar  9 08:56:13 2002
     1460+++ soundserver/soundserverv2_impl.cc   Mon Mar  3 09:19:29 2003
    11651461@@ -374,9 +374,12 @@
    11661462 
Note: See TracChangeset for help on using the changeset viewer.