diff options
Diffstat (limited to 'audio/vorbis-tools')
| -rw-r--r-- | audio/vorbis-tools/DESCR | 2 | ||||
| -rw-r--r-- | audio/vorbis-tools/Makefile | 24 | ||||
| -rw-r--r-- | audio/vorbis-tools/distinfo | 8 | ||||
| -rw-r--r-- | audio/vorbis-tools/patches/patch-aa | 30 | ||||
| -rw-r--r-- | audio/vorbis-tools/patches/patch-ab | 28 |
5 files changed, 14 insertions, 78 deletions
diff --git a/audio/vorbis-tools/DESCR b/audio/vorbis-tools/DESCR index cf40d1f554a..7459e309793 100644 --- a/audio/vorbis-tools/DESCR +++ b/audio/vorbis-tools/DESCR @@ -7,4 +7,4 @@ systems. * ogg123 plays Ogg Vorbis files or URLs streamed via HTTP * vorbiscomment can list or set comments in an .ogg file -This package is vorbis-tools 1.0 rc3 +This package is vorbis-tools 1.0 diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile index f950b95ca72..86fcfa0d3dc 100644 --- a/audio/vorbis-tools/Makefile +++ b/audio/vorbis-tools/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.13.2.2 2002/06/21 23:04:59 jlam Exp $ +# $NetBSD: Makefile,v 1.13.2.3 2002/08/25 21:19:49 jlam Exp $ -DISTNAME= vorbis-tools-1.0rc3 -PKGNAME= vorbis-tools-1.0.0.7 -PKGREVISION= 1 +DISTNAME= vorbis-tools-1.0 +PKGNAME= vorbis-tools-1.0.0.8 CATEGORIES= audio -MASTER_SITES= http://www.vorbis.com/files/rc3/unix/ +MASTER_SITES= http://www.vorbis.com/files/1.0/unix/ MAINTAINER= lukem@netbsd.org HOMEPAGE= http://www.vorbis.com/ @@ -20,21 +19,18 @@ CONFLICTS= vorbis-[0-9]* USE_BUILDLINK2= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -#CONFIGURE_ARGS+= --with-ogg-prefix=${BUILDLINK_DIR} \ -# --with-vorbis-prefix=${BUILDLINK_DIR} \ -# --with-ao-prefix=${BUILDLINK_DIR} +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +CONFIGURE_ARGS+= --with-ogg-prefix=${BUILDLINK_PREFIX.libogg} \ + --with-vorbis-prefix=${BUILDLINK_PREFIX.libvorbis} \ + --with-ao-prefix=${BUILDLINK_PREFIX.libao} PLIST_SUBST+= DISTNAME="${DISTNAME}" -# vorbis-tools needs a working pthreads implementation, and pth is proven -# to work. -# -USE_PTHREAD= native pth +PTHREAD_OPTS+= require .include "../../audio/libao/buildlink2.mk" .include "../../audio/libogg/buildlink2.mk" .include "../../audio/libvorbis/buildlink2.mk" - .include "../../mk/pthread.buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/audio/vorbis-tools/distinfo b/audio/vorbis-tools/distinfo index c6d0e68bc10..6f0b9bcff7b 100644 --- a/audio/vorbis-tools/distinfo +++ b/audio/vorbis-tools/distinfo @@ -1,6 +1,4 @@ -$NetBSD: distinfo,v 1.6 2002/03/19 07:48:43 lukem Exp $ +$NetBSD: distinfo,v 1.6.2.1 2002/08/25 21:19:50 jlam Exp $ -SHA1 (vorbis-tools-1.0rc3.tar.gz) = e5c08f24eb143f0790b37b4cf49a4905a37c6e44 -Size (vorbis-tools-1.0rc3.tar.gz) = 259239 bytes -SHA1 (patch-aa) = 065dc2c262d0dcab0f97f3c56b018be0a3966db2 -SHA1 (patch-ab) = d22ceee8f01a4c7748adab69acb95575dbe4940a +SHA1 (vorbis-tools-1.0.tar.gz) = 5c2508786cf6a2a270c697d3debe66ee83df376d +Size (vorbis-tools-1.0.tar.gz) = 425404 bytes diff --git a/audio/vorbis-tools/patches/patch-aa b/audio/vorbis-tools/patches/patch-aa deleted file mode 100644 index 142541b93c4..00000000000 --- a/audio/vorbis-tools/patches/patch-aa +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2002/03/19 07:48:44 lukem Exp $ - ---- ogg123/buffer.c.orig Thu Dec 20 11:24:53 2001 -+++ ogg123/buffer.c -@@ -85,12 +85,6 @@ - buf_t *buf = (buf_t *)arg; - - DEBUG("Enter buffer_thread_cleanup"); -- -- /* Cleanup thread data structures */ -- pthread_mutex_unlock(&buf->mutex); -- pthread_mutex_destroy(&buf->mutex); -- pthread_cond_destroy(&buf->playback_cond); -- pthread_cond_destroy(&buf->write_cond); - } - - -@@ -430,6 +424,12 @@ - void buffer_destroy (buf_t *buf) - { - DEBUG("buffer_destroy"); -+ -+ /* Cleanup pthread variables */ -+ pthread_mutex_destroy(&buf->mutex); -+ pthread_cond_destroy(&buf->write_cond); -+ pthread_cond_destroy(&buf->playback_cond); -+ - free(buf); - } - diff --git a/audio/vorbis-tools/patches/patch-ab b/audio/vorbis-tools/patches/patch-ab deleted file mode 100644 index 8d497ea1875..00000000000 --- a/audio/vorbis-tools/patches/patch-ab +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2002/03/19 07:48:45 lukem Exp $ - ---- ogg123/buffer.c.orig Tue Mar 19 18:02:36 2002 -+++ ogg123/buffer.c -@@ -232,7 +232,7 @@ - /* No need to lock mutex here because the other thread will - NEVER reduce the number of bytes stored in the buffer */ - DEBUG("Sending %d bytes to the audio device", write_amount); -- buf->write_func(buf->buffer + buf->start, write_amount, -+ write_amount = buf->write_func(buf->buffer + buf->start, write_amount, - /* Only set EOS if this is the last chunk */ - write_amount == buf->curfill ? buf->eos : 0, - buf->write_arg); - ---- ogg123/callbacks.c.orig Thu Dec 27 01:22:26 2001 -+++ ogg123/callbacks.c -@@ -30,7 +30,11 @@ - audio_play_arg_t *play_arg = (audio_play_arg_t *) arg; - int ret; - -+ pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL); -+ - ret = audio_devices_write(play_arg->devices, ptr, nbytes); -+ -+ pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL); - - return ret ? nbytes : 0; - } |