summaryrefslogtreecommitdiff
path: root/audio/esound
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
parentAllow use of newer gcc versions. (diff)
Update to 0.2.38.
Notes
Notes: svn path=/head/; revision=192216
Diffstat (limited to 'audio/esound')
-rw-r--r--audio/esound/Makefile4
-rw-r--r--audio/esound/distinfo6
-rw-r--r--audio/esound/files/patch-aa24
-rw-r--r--audio/esound/files/patch-players.c20
4 files changed, 17 insertions, 37 deletions
diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index 7e21222d63fb..eb530963f7fa 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= esound
-PORTVERSION= 0.2.37
-PORTREVISION= 2
+PORTVERSION= 0.2.38
+PORTREVISION= 0
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.2
diff --git a/audio/esound/distinfo b/audio/esound/distinfo
index af1cd44d2cc9..5862cf7ba53e 100644
--- a/audio/esound/distinfo
+++ b/audio/esound/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome/esound-0.2.37.tar.bz2) = 99cc68770176c8940cf346f60208420e
-SHA256 (gnome/esound-0.2.37.tar.bz2) = 3c8525c08cce45557832cb20cc74e7b3d6c9664410f117372391b59fda2d4147
-SIZE (gnome/esound-0.2.37.tar.bz2) = 383831
+MD5 (gnome/esound-0.2.38.tar.bz2) = 1c48c100b450d617b58dacb59837d34f
+SHA256 (gnome/esound-0.2.38.tar.bz2) = 08ea208cb3948650250bb068de5c75b877e78902d679e8af5d0a14062c939b37
+SIZE (gnome/esound-0.2.38.tar.bz2) = 393758
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;