Update of /cvsroot/fink/experimental/gnome/2.6/main/finkinfo/sound
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31319/main/finkinfo/sound
Modified Files:
esound.info esound.patch
Log Message:
Updates
Index: esound.patch
===================================================================
RCS file: /cvsroot/fink/experimental/gnome/2.6/main/finkinfo/sound/esound.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- esound.patch 3 Apr 2004 19:50:02 -0000 1.1
+++ esound.patch 3 Sep 2004 14:50:04 -0000 1.2
@@ -1,7 +1,7 @@
-diff -Naur esound-0.2.32.old/Makefile.in esound-0.2.32.new/Makefile.in
---- esound-0.2.32.old/Makefile.in Thu Sep 4 01:26:10 2003
-+++ esound-0.2.32.new/Makefile.in Mon Nov 10 02:10:01 2003
-@@ -171,7 +171,7 @@
+diff -Naur esound-0.2.35-old/Makefile.in esound-0.2.35/Makefile.in
+--- esound-0.2.35-old/Makefile.in Thu Aug 12 10:23:07 2004
++++ esound-0.2.35/Makefile.in Tue Aug 24 11:10:33 2004
+@@ -281,7 +281,7 @@
LDADD = libesd.la $(AUDIOFILE_LIBS)
@@ -10,24 +10,9 @@
m4datadir = $(datadir)/aclocal
m4data_DATA = esd.m4
-@@ -248,11 +248,12 @@
- esdplay_LDFLAGS =
- @[EMAIL PROTECTED] = esd.$(OBJEXT) clients.$(OBJEXT) \
- @[EMAIL PROTECTED](OBJEXT) mix.$(OBJEXT) players.$(OBJEXT) \
[EMAIL PROTECTED]@proto.$(OBJEXT) samples.$(OBJEXT) util.$(OBJEXT)
[EMAIL PROTECTED]@proto.$(OBJEXT) samples.$(OBJEXT) util.$(OBJEXT) \
[EMAIL PROTECTED]@esd_audio.$(OBJEXT)
- @[EMAIL PROTECTED] = esd.$(OBJEXT) clients.$(OBJEXT) \
- @[EMAIL PROTECTED](OBJEXT) mix.$(OBJEXT) players.$(OBJEXT) \
- @[EMAIL PROTECTED](OBJEXT) samples.$(OBJEXT) getopt.$(OBJEXT) \
[EMAIL PROTECTED]@getopt1.$(OBJEXT) util.$(OBJEXT)
[EMAIL PROTECTED]@getopt1.$(OBJEXT) util.$(OBJEXT) esd_audio.$(OBJEXT)
- esd_DEPENDENCIES = libesd.la
- esd_LDFLAGS =
- SCRIPTS = $(bin_SCRIPTS)
-diff -Naur esound-0.2.32.old/audio.c esound-0.2.32.new/audio.c
---- esound-0.2.32.old/audio.c Wed Jun 18 21:12:23 2003
-+++ esound-0.2.32.new/audio.c Sat Nov 8 11:49:03 2003
+diff -Naur esound-0.2.35-old/audio.c esound-0.2.35/audio.c
+--- esound-0.2.35-old/audio.c Thu Jan 15 09:12:46 2004
++++ esound-0.2.35/audio.c Tue Aug 24 11:10:33 2004
@@ -20,6 +20,8 @@
/*******************************************************************/
/* returns audio_fd for use by main prog - platform dependent */
@@ -49,10 +34,10 @@
/*******************************************************************/
/* display available devices */
-diff -Naur esound-0.2.32.old/configure esound-0.2.32.new/configure
---- esound-0.2.32.old/configure Thu Sep 4 01:25:37 2003
-+++ esound-0.2.32.new/configure Mon Nov 10 01:50:47 2003
-@@ -5472,7 +5472,7 @@
+diff -Naur esound-0.2.35-old/configure esound-0.2.35/configure
+--- esound-0.2.35-old/configure Thu Aug 12 10:23:05 2004
++++ esound-0.2.35/configure Tue Aug 24 11:10:34 2004
+@@ -5916,7 +5916,7 @@
allow_undefined_flag='-undefined suppress'
;;
*) # Darwin 1.3 on
@@ -61,10 +46,10 @@
;;
esac
# FIXME: Relying on posixy $() will cause problems for
-diff -Naur esound-0.2.32.old/esd.c esound-0.2.32.new/esd.c
---- esound-0.2.32.old/esd.c Thu Sep 4 01:21:35 2003
-+++ esound-0.2.32.new/esd.c Sat Nov 8 02:47:01 2003
-@@ -25,6 +25,13 @@
+diff -Naur esound-0.2.35-old/esd.c esound-0.2.35/esd.c
+--- esound-0.2.35-old/esd.c Thu Aug 12 09:09:34 2004
++++ esound-0.2.35/esd.c Tue Aug 24 11:10:34 2004
+@@ -30,6 +30,13 @@
/* max arguments (argc + tokenized esd.conf) can't be more than this */
#define MAX_OPTS 128
@@ -78,7 +63,7 @@
/*******************************************************************/
/* esd.c - prototypes */
void set_audio_buffer( void *buf, esd_format_t format, int magl, int magr,
-@@ -599,6 +606,29 @@
+@@ -607,6 +614,29 @@
int default_format = ESD_BITS16 | ESD_STEREO;
/* end test scaffolding parameters */
@@ -108,27 +93,29 @@
programname = *argv;
-diff -Naur esound-0.2.32.old/esd.conf esound-0.2.32.new/esd.conf
---- esound-0.2.32.old/esd.conf Sat Jun 19 11:52:01 1999
-+++ esound-0.2.32.new/esd.conf Sat Nov 8 02:47:01 2003
-@@ -1,4 +1,4 @@
+diff -Naur esound-0.2.35-old/esd.conf esound-0.2.35/esd.conf
+--- esound-0.2.35-old/esd.conf Thu Aug 12 08:49:46 2004
++++ esound-0.2.35/esd.conf Tue Aug 24 11:12:01 2004
+@@ -1,6 +1,6 @@
[esd]
auto_spawn=1
spawn_options=-terminate -nobeeps -as 2
-spawn_wait_ms=100
+spawn_wait_ms=999
-diff -Naur esound-0.2.32.old/esd_audio.c esound-0.2.32.new/esd_audio.c
---- esound-0.2.32.old/esd_audio.c Thu Jan 1 09:00:00 1970
-+++ esound-0.2.32.new/esd_audio.c Mon Nov 10 02:10:01 2003
+ # default options are used in spawned and non-spawned mode
+ default_options=
+diff -Naur esound-0.2.35-old/esd_audio.c esound-0.2.35/esd_audio.c
+--- esound-0.2.35-old/esd_audio.c Wed Dec 31 19:00:00 1969
++++ esound-0.2.35/esd_audio.c Tue Aug 24 11:10:34 2004
@@ -0,0 +1,5 @@
+/* dirty trickery to reduce shared library dependencies */
+
+#define INSIDE_ESD
+#include "audio.c"
+
-diff -Naur esound-0.2.32.old/esd_config.c esound-0.2.32.new/esd_config.c
---- esound-0.2.32.old/esd_config.c Fri Aug 1 22:44:12 2003
-+++ esound-0.2.32.new/esd_config.c Sat Nov 8 02:47:01 2003
+diff -Naur esound-0.2.35-old/esd_config.c esound-0.2.35/esd_config.c
+--- esound-0.2.35-old/esd_config.c Thu Aug 12 05:14:54 2004
++++ esound-0.2.35/esd_config.c Tue Aug 24 11:10:34 2004
@@ -9,7 +9,7 @@
int esd_no_spawn=1; /* If we can't even find the system config file,
things are screwed up - don't try to make things
Index: esound.info
===================================================================
RCS file: /cvsroot/fink/experimental/gnome/2.6/main/finkinfo/sound/esound.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- esound.info 3 Apr 2004 19:50:02 -0000 1.1
+++ esound.info 3 Sep 2004 14:50:04 -0000 1.2
@@ -1,6 +1,6 @@
Package: esound
-Version: 0.2.34
-Revision: 4
+Version: 0.2.35
+Revision: 5
Depends: %N-bin (>= %v-%r)
BuildDepends: audiofile (>= 0.2.4-1), fink (>= 0.9.9)
DescPackaging: <<
@@ -10,7 +10,7 @@
<<
Replaces: %N (<< 0.2.23-2)
Source: mirror:gnome:sources/%n/0.2/%n-%v.tar.bz2
-Source-MD5: 406514a52fe5daea32ec00cc2caedb25
+Source-MD5: 1566344f80a8909b5e6e4d6b6520c2c1
Patch: %n.patch
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=5047&alloc_id=10808&op=click
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits