diff options
| author | itojun <itojun@pkgsrc.org> | 2000-08-19 07:50:01 +0000 |
|---|---|---|
| committer | itojun <itojun@pkgsrc.org> | 2000-08-19 07:50:01 +0000 |
| commit | c8f24471f5c1007faa63ab0eed370f59100e13d2 (patch) | |
| tree | b8b18f068f3b3188e9ccda7fb33988cd1fa97cba /audio | |
| parent | 402899809af063240e564f105ec22423fefbea61 (diff) | |
| download | pkgsrc-c8f24471f5c1007faa63ab0eed370f59100e13d2.tar.gz | |
for oss driver (ogg123 -d oss), use /dev/audio by default (not /dev/dsp).
repair mp3tovorbis (there's no bash in basesystem, use sh).
more comment in Makefile about master distribution (copied in LOCAL_PORTS).
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/vorbis/Makefile | 5 | ||||
| -rw-r--r-- | audio/vorbis/files/patch-sum | 5 | ||||
| -rw-r--r-- | audio/vorbis/patches/patch-ac | 17 | ||||
| -rw-r--r-- | audio/vorbis/patches/patch-ag | 12 |
4 files changed, 32 insertions, 7 deletions
diff --git a/audio/vorbis/Makefile b/audio/vorbis/Makefile index 2ddfa2aee8c..a35576d8b05 100644 --- a/audio/vorbis/Makefile +++ b/audio/vorbis/Makefile @@ -1,11 +1,12 @@ -# $NetBSD: Makefile,v 1.3 2000/08/18 16:31:24 itojun Exp $ +# $NetBSD: Makefile,v 1.4 2000/08/19 07:50:01 itojun Exp $ # DISTNAME= vorbis_nightly_cvs-20000818 PKGNAME= vorbis-20000818 CATEGORIES= audio +# daily snapshot (vorbis-nightly-cvs.tgz) is copied into "LOCAL_PORTS" +# so that we can get a version of certain date MASTER_SITES= ${MASTER_SITE_LOCAL} -# daily snapshot #MASTER_SITES= http://www.xiph.org/ogg/vorbis/download/ EXTRACT_SUFX= .tgz diff --git a/audio/vorbis/files/patch-sum b/audio/vorbis/files/patch-sum index 69a08167568..d0d5f85e345 100644 --- a/audio/vorbis/files/patch-sum +++ b/audio/vorbis/files/patch-sum @@ -1,7 +1,8 @@ -$NetBSD: patch-sum,v 1.3 2000/08/18 16:31:24 itojun Exp $ +$NetBSD: patch-sum,v 1.4 2000/08/19 07:50:01 itojun Exp $ MD5 (patch-aa) = 5e7630fde5544c3b338f06f1eada4d2b MD5 (patch-ab) = 6aab3996a1f1d4ce5ba98adbd598b006 -MD5 (patch-ac) = 991c84a4ec6f1569f49cde6eda4dc00e +MD5 (patch-ac) = 29233001e06a15c473019089b16a0a86 MD5 (patch-ae) = 9f19ec346c10bbc7918bbbf7caedce18 MD5 (patch-af) = 8629ab5dfe631b255bcd7a0e3dc9bcf9 +MD5 (patch-ag) = 518115aa1615ed810d33f8a27e81a641 diff --git a/audio/vorbis/patches/patch-ac b/audio/vorbis/patches/patch-ac index c222d1c29fb..14a222b6112 100644 --- a/audio/vorbis/patches/patch-ac +++ b/audio/vorbis/patches/patch-ac @@ -1,8 +1,19 @@ -$NetBSD: patch-ac,v 1.1.1.1 2000/08/17 16:56:18 itojun Exp $ ---- vorbis-tools/libao/ao_oss.c- Fri Aug 18 01:34:24 2000 -+++ vorbis-tools/libao/ao_oss.c Fri Aug 18 01:34:32 2000 +$NetBSD: patch-ac,v 1.2 2000/08/19 07:50:02 itojun Exp $ +--- vorbis-tools/libao/ao_oss.c.orig Sat Jul 22 10:57:05 2000 ++++ vorbis-tools/libao/ao_oss.c Sat Aug 19 11:27:04 2000 @@ -32,3 +32,3 @@ #include <math.h> -#if defined(__OpenBSD__) +#if defined(__OpenBSD__) || defined(__NetBSD__) #include <soundcard.h> +@@ -70,4 +70,9 @@ + +- if (state->dev == NULL) ++ if (state->dev == NULL) { ++#ifdef __NetBSD__ ++ state->dev = strdup("/dev/audio"); ++#else + state->dev = strdup("/dev/dsp"); ++#endif ++ } + } diff --git a/audio/vorbis/patches/patch-ag b/audio/vorbis/patches/patch-ag new file mode 100644 index 00000000000..6e8feaf4d95 --- /dev/null +++ b/audio/vorbis/patches/patch-ag @@ -0,0 +1,12 @@ +$NetBSD: patch-ag,v 1.1 2000/08/19 07:50:02 itojun Exp $ +--- vorbis-tools/mp3tovorbis.orig Thu Jun 15 08:07:47 2000 ++++ vorbis-tools/mp3tovorbis Sat Aug 19 11:28:06 2000 +@@ -1,2 +1,2 @@ +-#!/bin/bash ++#! /bin/sh + +@@ -42,3 +42,3 @@ + echo "Encoding Ogg Vorbis stream using Vorbize..." +-$VORBIZE -w "$2" --artist "$ARTIST" --album "$ALBUM" --track "$TRACK" "$TEMPFILE" ++$VORBIZE -w "$2" --artist "$ARTIST" --album "$ALBUM" --title "$TRACK" "$TEMPFILE" + |