- update for 0.2.26..

Changed files:
    esound-ac25x.patch -> 1.2
    esound-esddsp.in.patch -> 1.4

diff --git a/esound-ac25x.patch b/esound-ac25x.patch
index b57eebdc3e70cd585134aa2805ba17492988f2e8..b194739b46eb3d7e42303ed535e6b1b90b6fc8b3 100644 (file)
--- a/esound-ac25x.patch
+++ b/esound-ac25x.patch
@@ -1,12 +1,47 @@
---- esound-0.2.24/configure.in.orig    Fri Mar  1 23:07:05 2002
-+++ esound-0.2.24/configure.in Thu Apr 25 00:39:56 2002
-@@ -81,8 +81,7 @@
+--- esound-0.2.26/configure.in.orig    Mon May  6 10:27:26 2002
++++ esound-0.2.26/configure.in Thu May  9 08:43:27 2002
+@@ -44,12 +44,12 @@
  
- dnl check for getopt_long, substitute the distributed versions if not
+ AC_FUNC_ALLOCA
+ AC_CHECK_FUNCS(setenv putenv fchown fchmod gethostbyname2)
+-AC_CHECK_FUNC(connect,,[AC_CHECK_LIB(socket,connect)])
+-AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)])
+-AC_CHECK_FUNC(nanosleep,,[
+-  AC_CHECK_LIB(rt,nanosleep,,[AC_CHECK_LIB(posix4,nanosleep)])])
++AC_CHECK_FUNC(connect,[],[AC_CHECK_LIB(socket,connect)])
++AC_CHECK_FUNC(gethostbyname,[],[AC_CHECK_LIB(nsl,gethostbyname)])
++AC_CHECK_FUNC(nanosleep,[],[
++  AC_CHECK_LIB(rt,nanosleep,[],[AC_CHECK_LIB(posix4,nanosleep)])])
+ AC_CHECK_FUNCS(usleep)
+-AC_CHECK_FUNC(inet_aton,,[AC_CHECK_LIB(resolv,inet_aton)])
++AC_CHECK_FUNC(inet_aton,[],[AC_CHECK_LIB(resolv,inet_aton)])
  
--AC_CHECK_FUNC(getopt_long,,[LIBOBJS="$LIBOBJS getopt.o getopt1.o"])
--AC_SUBST(LIBOBJS)
-+AC_CHECK_FUNC(getopt_long,,[AC_LIBOBJ([getopt]); AC_LIBOBJ([getopt1])])
- 
- dnl Needed for FIONBIO on Solaris at least
+ case $ac_cv_func_nanosleep/$ac_cv_lib_rt_nanosleep/$ac_cv_lib_posix4_nanosleep in
+ no/no/no) ;;
+@@ -66,7 +66,7 @@
+ AC_TRY_COMPILE([
+     #include<sys/types.h>
+     #include<netinet/in.h>],
+-    [unsigned long ul = INADDR_LOOPBACK;],,
++    [unsigned long ul = INADDR_LOOPBACK;],[],
+     [AC_DEFINE(INADDR_LOOPBACK, (u_int32_t)0x7f000001)])
+     
  
+@@ -202,12 +202,12 @@
+    echo "---------------------------------------------------------------------"
+    echo "--- Checking to see which audio libraries are required for linking.";
+    echo "--- Most of these checks should also fail. Do not be alarmed.";
+-   AC_CHECK_FUNC(_oss_ioctl,,[AC_CHECK_LIB(ossaudio,_oss_ioctl)])
+-   AC_CHECK_FUNC(ALnewconfig,,[AC_CHECK_LIB(audio,ALnewconfig)])
++   AC_CHECK_FUNC(_oss_ioctl,[],[AC_CHECK_LIB(ossaudio,_oss_ioctl)])
++   AC_CHECK_FUNC(ALnewconfig,[],[AC_CHECK_LIB(audio,ALnewconfig)])
+    if test "x$enable_alsa" = "xyes"; then
+-      AC_CHECK_FUNC(snd_cards,,[AC_CHECK_LIB(sound,snd_cards)])
+-      AC_CHECK_FUNC(snd_cards,,[AC_CHECK_LIB(asound,snd_cards)])
+-      AC_CHECK_FUNC(snd_pcm_pause,,[AC_CHECK_LIB(asound,snd_pcm_pause)])
++      AC_CHECK_FUNC(snd_cards,[],[AC_CHECK_LIB(sound,snd_cards)])
++      AC_CHECK_FUNC(snd_cards,[],[AC_CHECK_LIB(asound,snd_cards)])
++      AC_CHECK_FUNC(snd_pcm_pause,[],[AC_CHECK_LIB(asound,snd_pcm_pause)])
+    fi
+ else
+    AC_DEFINE(DRIVER_NONE)

diff --git a/esound-esddsp.in.patch b/esound-esddsp.in.patch
index 79ebc31ef6d5c300ba906bfb964d14543bb866af..2cb7bd720acbacc579cd3e3766ac960379169260 100644 (file)
--- a/esound-esddsp.in.patch
+++ b/esound-esddsp.in.patch
@@ -1,5 +1,5 @@
---- esound-0.2.23/esddsp.in.orig       Mon Feb  1 15:38:01 1999
-+++ esound-0.2.23/esddsp.in    Tue Sep 11 01:29:51 2001
+--- esound-0.2.26/esddsp.in.orig       Tue Apr 23 11:26:55 2002
++++ esound-0.2.26/esddsp.in    Thu May  9 08:24:56 2002
 @@ -11,89 +11,92 @@
      case "$1" in
  
@@ -132,20 +132,21 @@
 -    echo "server:        $ESPEAKER"
 -    echo "name:          $ESDDSP_NAME"
 -    echo "command line:  $@"
-+      echo "server:        $ESPEAKER"
-+      echo "name:          $ESDDSP_NAME"
-+      echo "command line:  $@"
++      echo "server:           $ESPEAKER"
++      echo "name:             $ESDDSP_NAME"
++      echo "command line:     $@"
  fi
  
  # setup esd to hijack calls made to /dev/dsp
 -prefix=@prefix@
 -exec_prefix=@exec_prefix@
- libdir=@libdir@
+-libdir=@libdir@
 -
 -export LD_PRELOAD_PATH=${libdir}
--export LD_PRELOAD='libesddsp.so libesd.so'
-+LD_PRELOAD="${libdir}/libesddsp.so.0 ${libdir}/libesd.so.0"
-+export LD_PRELOAD
-
+-export LD_PRELOAD='libesddsp.so.@ESD_MAJOR_VERSION@ libesd.so.@ESD_MAJOR_VERSION@'
++LD_PRELOAD_PATH=${libdir}
++LD_PRELOAD='libesddsp.so.@ESD_MAJOR_VERSION@ libesd.so.@ESD_MAJOR_VERSION@'
++export LD_PRELOAD_PATH LD_PRELOAD
+ 
  # invoke the program with the args given
  exec "$@"