aboutsummaryrefslogtreecommitdiff
path: root/audio/esound/files
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2007-05-28 19:28:53 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2007-05-28 19:28:53 +0000
commit8b8cb1e2ecc4c055933ae1035fada20b42c53e72 (patch)
tree343bce1f24ad0171297845747a44dd34bd759b5b /audio/esound/files
parentb0f0a04fa7f6530596e74c9233e234a5f1a7a201 (diff)
downloadports-8b8cb1e2ecc4c055933ae1035fada20b42c53e72.tar.gz
ports-8b8cb1e2ecc4c055933ae1035fada20b42c53e72.zip
Notes
Diffstat (limited to 'audio/esound/files')
-rw-r--r--audio/esound/files/patch-aa24
-rw-r--r--audio/esound/files/patch-players.c20
2 files changed, 12 insertions, 32 deletions
diff --git a/audio/esound/files/patch-aa b/audio/esound/files/patch-aa
index 3bb4aa828175..099765584c1f 100644
--- a/audio/esound/files/patch-aa
+++ b/audio/esound/files/patch-aa
@@ -1,20 +1,20 @@
---- Makefile.in.orig Mon Mar 1 16:37:33 2004
-+++ Makefile.in Mon Mar 1 16:38:38 2004
-@@ -119,7 +119,7 @@
- lib_LTLIBRARIES = libesd.la $(libesddsp_la)
+--- Makefile.in.orig Mon May 28 15:23:55 2007
++++ Makefile.in Mon May 28 15:24:56 2007
+@@ -341,7 +341,7 @@ bin_SCRIPTS = \
+ lib_LTLIBRARIES = libesd.la $(libesddsp_la)
libesd_la_CFLAGS = $(AM_CFLAGS)
-libesd_la_LDFLAGS = -version-info $(ESD_VERSION_INFO) -no-undefined
+libesd_la_LDFLAGS = -version-info 2:0:0 -no-undefined
libesd_la_LIBADD = $(AUDIOFILE_LIBS) $(SOUND_LIBS)
-
- libesd_la_SOURCES = esdlib.c esdmgr.c esdfile.c esd-config.h esd_config.c audio.c genrand.c genrand.h util.c
-@@ -129,7 +129,7 @@
- AUDIO_BACKENDS = audio_aix.c audio_alsa.c audio_alsa09.c audio_coreaudio.c audio_dart.c audio_hpux.c audio_mklinux.c audio_irix.c audio_none.c audio_osf.c audio_oss.c audio_solaris.c audio_win32.c
-
+ libesd_la_SOURCES = \
+ esdlib.c \
+@@ -372,7 +372,7 @@ AUDIO_BACKENDS = \
+ audio_solaris.c \
+ audio_win32.c
-libesddsp_la_LDFLAGS = -version-info $(ESD_VERSION_INFO)
+libesddsp_la_LDFLAGS = -version-info 2:0:0
- libesddsp_la_LIBADD = $(DL_LIB) -lm
-
- libesddsp_la_SOURCES = esddsp.c
+ libesddsp_la_LIBADD = $(DL_LIB) -lm libesd.la
+ libesddsp_la_SOURCES = \
+ esddsp.c
diff --git a/audio/esound/files/patch-players.c b/audio/esound/files/patch-players.c
deleted file mode 100644
index 6a140b32b1b7..000000000000
--- a/audio/esound/files/patch-players.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- players.c.orig Tue Feb 27 02:16:05 2007
-+++ players.c Tue Feb 27 02:16:37 2007
-@@ -310,13 +310,14 @@ int read_player( esd_player_t *player )
- 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;