[arch-commits] CVS update of arch/build/daemons/esd (bgo419642.patch esd-r487.patch)

Jan de Groot jgc at archlinux.org
Sat May 5 12:17:16 UTC 2007


    Date: Saturday, May 5, 2007 @ 08:17:16
  Author: jgc
    Path: /home/cvs-arch/arch/build/daemons/esd

 Removed: bgo419642.patch (1.1) esd-r487.patch (1.1)

Remove upstream-applied patches


-----------------+
 bgo419642.patch |   23 ------
 esd-r487.patch  |  205 ------------------------------------------------------
 2 files changed, 228 deletions(-)


Index: arch/build/daemons/esd/bgo419642.patch
diff -u arch/build/daemons/esd/bgo419642.patch:1.1 arch/build/daemons/esd/bgo419642.patch:removed
--- arch/build/daemons/esd/bgo419642.patch:1.1	Wed Apr 11 11:39:17 2007
+++ arch/build/daemons/esd/bgo419642.patch	Sat May  5 08:17:16 2007
@@ -1,23 +0,0 @@
---- trunk/players.c	2007/03/01 02:27:37	485
-+++ trunk/players.c	2007/03/19 22:20:51	488
-@@ -303,10 +303,9 @@
- 			   &rd_fds, NULL, NULL, &timeout ) ;
- 	if ( can_read > 0 )
- 	{
--	    int bytes_read;
- 	    player->actual_length = 0;
- 	    do {
--		bytes_read = ESD_READ_BIN( player->source_id,
-+		ESD_READ_BIN( player->source_id,
- 			      player->data_buffer + player->actual_length, 
- 			      player->buffer_length - player->actual_length,
- 			      actual, "str rd" );
-@@ -315,7 +314,7 @@
- 		     || ( actual < 0 && errno != EAGAIN && errno != EINTR ) )
- 		    return -1;
- 
--		if (bytes_read < player->buffer_length - player->actual_length)
-+		if (actual < player->buffer_length - player->actual_length)
- 			break;
- 		
- 		/* more data, save how much we got */
Index: arch/build/daemons/esd/esd-r487.patch
diff -u arch/build/daemons/esd/esd-r487.patch:1.1 arch/build/daemons/esd/esd-r487.patch:removed
--- arch/build/daemons/esd/esd-r487.patch:1.1	Wed Mar  7 17:50:15 2007
+++ arch/build/daemons/esd/esd-r487.patch	Sat May  5 08:17:16 2007
@@ -1,205 +0,0 @@
-Index: esddsp.c
-===================================================================
---- esddsp.c	(revision 481)
-+++ esddsp.c	(working copy)
-@@ -336,10 +336,11 @@
- 	  mixfd = fileno(ret);
- 	  return ret;
- 	}
-+      else
-+        return NULL;
-     }
-   else
-     return (*func) (pathname, mode);
--  /* FIXME: warning */
- }
- 
- FILE *
-@@ -520,6 +521,8 @@
- 
- 	  DPRINTF ("panning %d - %d %d\n", player, left, right);
- 	  esd_set_stream_pan (esd, player, left, right);
-+
-+	  esd_close(esd);
- 	}
-     }
- 
-@@ -551,6 +554,9 @@
- 	  esd_info_t *all_info;
- 
- 	  all_info  = esd_get_all_info (esd);
-+
-+	  esd_close(esd);
-+
- 	  if (all_info)
- 	    {
- 	      esd_player_info_t *player_info;
-@@ -571,6 +577,7 @@
-       else
- 	{
-           get_volume (&left, &right);
-+          esd_close(esd);
- 	  *arg = ESD_VOL_TO_OSS (left, right);
- 	}
- 
-@@ -590,6 +597,8 @@
- 	  esd_set_stream_pan (esd, player, left, right);
- 	}
- 
-+      esd_close(esd);
-+
-       break;
- 
-     default:
-Index: configure.ac
-===================================================================
---- configure.ac	(revision 481)
-+++ configure.ac	(working copy)
-@@ -1,9 +1,9 @@
- AC_PREREQ([2.58])
--AC_INIT(esound, 0.2.37)
-+AC_INIT(esound, 0.2.38)
- 
- ESD_MAJOR_VERSION=0
- ESD_MINOR_VERSION=2
--ESD_MICRO_VERSION=37
-+ESD_MICRO_VERSION=38
- ESD_VERSION=$ESD_MAJOR_VERSION.$ESD_MINOR_VERSION.$ESD_MICRO_VERSION
- 
- AC_CANONICAL_TARGET([])
-@@ -176,6 +176,26 @@
-   [enable_arts=${enableval}],
-   [enable_arts=no])
- 
-+dnl build the esddsp wrapper for systems, 
-+dnl that support LD_PRELOAD and RTLD_NEXT only
-+dsp_ok=no DL_LIB=
-+
-+AC_MSG_CHECKING([if your platform supports esddsp])
-+case "$host_os" in
-+  linux* | freebsd* | kfreebsd*-gnu | bsdi4* )
-+    dsp_ok=yes
-+    ;;
-+esac
-+AC_MSG_RESULT($dsp_ok)
-+
-+if test "x$dsp_ok" = xyes; then
-+   AC_CHECK_FUNC(dlopen, DL_LIB=,
-+      AC_CHECK_LIB(dl, dlopen, DL_LIB=-ldl))
-+   ESDDSP=esddsp
-+   LIBESDDSP=libesddsp.la
-+fi
-+AM_CONDITIONAL(BUILD_ESDDSP, test "x$dsp_ok" = xyes)
-+
- if test "x$enable_local_sound" = "xyes"; then
-    found_sound=no
- 
-@@ -398,26 +418,6 @@
-    LIBS="$esound_save_LIBS"
- fi
- 
--dnl build the esddsp wrapper for systems, 
--dnl that support LD_PRELOAD and RTLD_NEXT only
--dsp_ok=no DL_LIB=
--
--AC_MSG_CHECKING([if your platform supports esddsp])
--case "$host_os" in
--  linux* | freebsd* | kfreebsd*-gnu | bsdi4* )
--    dsp_ok=yes
--    ;;
--esac
--AC_MSG_RESULT($dsp_ok)
--
--if test "x$dsp_ok" = xyes; then
--   AC_CHECK_FUNC(dlopen, dsp_ok=yes,
--      AC_CHECK_LIB(dl, dlopen, dsp_ok=yes DL_LIB=-ldl))
--   ESDDSP=esddsp
--   LIBESDDSP=libesddsp.la
--fi
--AM_CONDITIONAL(BUILD_ESDDSP, test "x$dsp_ok" = xyes)
--
- AS_COMPILER_FLAG(-Wall, CFLAGS="$CFLAGS -Wall")
- 
- # set | sort; # just for double checking the script...
-Index: ChangeLog
-===================================================================
---- ChangeLog	(revision 481)
-+++ ChangeLog	(working copy)
-@@ -1,3 +1,27 @@
-+2007-03-02  David Schleef  <ds at schleef.org>
-+
-+	* esddsp.c:
-+	  Fix leaking of file descriptors.  Patch from Pierre Ossman.
-+	  Fixes bug #362826.  (Also fix an important warning.)
-+
-+2007-03-02  David Schleef  <ds at schleef.org>
-+
-+	* Makefile.am:
-+	* configure.ac:
-+	  Fix detection for linking against libdl.
-+	  Patch from Loïc Minier.  Fixes bug #409269.
-+
-+2007-03-01  Kjartan Maraas  <kmaraas at gnome.org>
-+
-+	* players.c: (read_player): Fix 100% CPU problem introduced
-+	in 0.2.37. Patch from Joe Marcus Clarke. Closes bug #412951.
-+
-+2007-03-01  Kjartan Maraas  <kmaraas at gnome.org>
-+
-+	* docs/Makefile.am: Only install the esddsp man page if
-+	we build the binary. Closes bug #412918. Patch from
-+	Cygwin Ports Maintainer.
-+
- ============================== 0.2.37 ===========================
- 
- 2007-01-31  Kjartan Maraas  <kmaraas at gnome.org>
-Index: players.c
-===================================================================
---- players.c	(revision 481)
-+++ players.c	(working copy)
-@@ -310,13 +310,14 @@
- 			      player->data_buffer + player->actual_length, 
- 			      player->buffer_length - player->actual_length,
- 			      actual, "str rd" );
--		if (bytes_read < player->buffer_length - player->actual_length)
--			break;
--		
- 		/* check for end of stream */
- 		if ( actual == 0 
- 		     || ( actual < 0 && errno != EAGAIN && errno != EINTR ) )
- 		    return -1;
-+
-+		if (bytes_read < player->buffer_length - player->actual_length)
-+			break;
-+		
- 		/* more data, save how much we got */
- 		if ( actual > 0 )
- 		   player->actual_length += actual;
-Index: docs/Makefile.am
-===================================================================
---- docs/Makefile.am	(revision 481)
-+++ docs/Makefile.am	(working copy)
-@@ -1,5 +1,9 @@
-+if BUILD_ESDDSP
-+ESDDSP_MAN = esddsp.1
-+endif
-+
- man_MANS = \
--	esd.1 esdcat.1 esd-config.1 esdctl.1 esddsp.1 \
-+	esd.1 esdcat.1 esd-config.1 esdctl.1 $(ESDDSP_MAN) \
- 	esdfilt.1 esdloop.1 esdmon.1 esdplay.1 esdrec.1 esdsample.1 
- 
- EXTRA_DIST = \
-Index: Makefile.am
-===================================================================
---- Makefile.am	(revision 481)
-+++ Makefile.am	(working copy)
-@@ -61,7 +61,7 @@
- 	audio_win32.c
- 
- libesddsp_la_LDFLAGS = -version-info $(ESD_VERSION_INFO)
--libesddsp_la_LIBADD = $(DL_LIB) -lm
-+libesddsp_la_LIBADD = $(DL_LIB) -lm libesd.la
- 
- libesddsp_la_SOURCES = \
- 	esddsp.c




More information about the arch-commits mailing list