pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio Remove csound-bath to make way for csound4.
details: https://anonhg.NetBSD.org/pkgsrc/rev/c1fb6a6ae60c
branches: trunk
changeset: 484637:c1fb6a6ae60c
user: ben <ben%pkgsrc.org@localhost>
date: Sun Nov 28 17:09:13 2004 +0000
description:
Remove csound-bath to make way for csound4.
diffstat:
audio/Makefile | 3 +-
audio/csound-bath/DESCR | 8 -
audio/csound-bath/Makefile | 49 -----
audio/csound-bath/PLIST | 21 --
audio/csound-bath/distinfo | 23 --
audio/csound-bath/files/rtNetBSD.c | 328 -------------------------------------
audio/csound-bath/files/rtNetBSD.h | 15 -
audio/csound-bath/patches/patch-aa | 89 ----------
audio/csound-bath/patches/patch-ab | 15 -
audio/csound-bath/patches/patch-ac | 15 -
audio/csound-bath/patches/patch-ae | 29 ---
audio/csound-bath/patches/patch-af | 15 -
audio/csound-bath/patches/patch-ag | 54 ------
audio/csound-bath/patches/patch-ai | 13 -
audio/csound-bath/patches/patch-ap | 43 ----
audio/csound-bath/patches/patch-aq | 14 -
audio/csound-bath/patches/patch-ar | 13 -
audio/csound-bath/patches/patch-as | 9 -
audio/csound-bath/patches/patch-at | 25 --
audio/csound-bath/patches/patch-au | 56 ------
audio/csound-bath/patches/patch-av | 13 -
audio/csound-bath/patches/patch-aw | 13 -
audio/csound-bath/patches/patch-ax | 13 -
audio/csound-bath/patches/patch-ay | 14 -
audio/csound-bath/patches/patch-az | 14 -
audio/csound-bath/patches/patch-ba | 14 -
26 files changed, 1 insertions(+), 917 deletions(-)
diffs (truncated from 1032 to 300 lines):
diff -r a2116797846e -r c1fb6a6ae60c audio/Makefile
--- a/audio/Makefile Sun Nov 28 16:50:44 2004 +0000
+++ b/audio/Makefile Sun Nov 28 17:09:13 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.263 2004/11/06 23:15:42 dillo Exp $
+# $NetBSD: Makefile,v 1.264 2004/11/28 17:09:13 ben Exp $
#
COMMENT= Audio tools
@@ -25,7 +25,6 @@
SUBDIR+= cdparanoia
SUBDIR+= cmp3
SUBDIR+= cs4235
-SUBDIR+= csound-bath
SUBDIR+= csound-dev
SUBDIR+= csound-manual
SUBDIR+= daapd
diff -r a2116797846e -r c1fb6a6ae60c audio/csound-bath/DESCR
--- a/audio/csound-bath/DESCR Sun Nov 28 16:50:44 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-Csound is a software synthesis package in the tradition of so-called
-music-N languages, among which the best-known is Music V. It consists
-of an orchestra- and score-driven executable, written in C for
-portability. Since Csound is a computational language, it is highly
-flexible and efficient; complexity is gained only at the expense of
-computation time. Basically Csound reads some files and creates the
-result as a file on disk or, on faster machines, through a DAC in real
-time.
diff -r a2116797846e -r c1fb6a6ae60c audio/csound-bath/Makefile
--- a/audio/csound-bath/Makefile Sun Nov 28 16:50:44 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2004/04/11 21:49:10 ben Exp $
-#
-
-DISTNAME= Csound4.23
-PKGNAME= csound-bath-4.23
-CATEGORIES= audio
-MASTER_SITES= ftp://ftp.cs.bath.ac.uk/pub/dream/newest/
-
-MAINTAINER= ben%NetBSD.org@localhost
-HOMEPAGE= http://www.csounds.com/
-COMMENT= Software synthesizer and sequencer
-
-LICENSE= csound-license
-RESTRICTED= "no for-fee-redistribution"
-NO_SRC_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_CDROM= ${RESTRICTED}
-
-WRKSRC= ${WRKDIR}
-DIST_SUBDIR= csound
-CONFLICTS= csound-dev-4*
-USE_GNU_TOOLS+= make
-
-.include "../../mk/bsd.prefs.mk"
-
-pre-patch:
- ${CP} ${FILESDIR}/rtNetBSD.c ${FILESDIR}/rtNetBSD.h ${WRKSRC}
-
-.if ${OPSYS} == "NetBSD"
-SUBST_CLASSES+= rtaudio
-SUBST_MESSAGE.rtaudio= "Configuring to use NetBSD real-time audio driver."
-SUBST_STAGE.rtaudio= post-patch
-SUBST_FILES.rtaudio= Makefile
-SUBST_SED.rtaudio= -e 's,^AUDSRC.*,AUDSRC = rtNetBSD.c,' \
- -e 's,^AUDOBJ.*,AUDOBJ = rtNetBSD.o,' \
- -e 's,^\(DEFINES.*\),\1 -DRTAUDIO -DNETBSDAUDIO,'
-.endif
-
-.if ${OPSYS} == "Linux"
-SUBST_CLASSES+= rtaudio
-SUBST_MESSAGE.rtaudio= "Configuring to use Linux real-time audio driver."
-SUBST_STAGE.rtaudio= post-patch
-SUBST_FILES.rtaudio= Makefile
-SUBST_SED.rtaudio= -e 's,^AUDSRC.*,AUDSRC = rtlinux.c LINUXaudio.c,' \
- -e 's,^AUDOBJ.*,AUDOBJ = rtlinux.o LINUXaudio.o,' \
- -e 's,^\(DEFINES.*\),\1 -DRTAUDIO,' \
- -e 's,^\(LIBS.*\),\1 -ldl,'
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff -r a2116797846e -r c1fb6a6ae60c audio/csound-bath/PLIST
--- a/audio/csound-bath/PLIST Sun Nov 28 16:50:44 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2003/01/19 21:31:08 hubertf Exp $
-bin/csound
-bin/hetro
-bin/lpanal
-bin/pvanal
-bin/cvanal
-bin/scot
-bin/extract
-bin/scsort
-bin/sndinfo
-bin/scale
-bin/mixer
-bin/extractor
-bin/envext
-bin/pvlook
-bin/srconv
-bin/dnoise
-bin/sdif2ad
-include/cscore.h
-lib/libcsound.a
-lib/libcscore.a
diff -r a2116797846e -r c1fb6a6ae60c audio/csound-bath/distinfo
--- a/audio/csound-bath/distinfo Sun Nov 28 16:50:44 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: distinfo,v 1.7 2004/04/11 21:49:10 ben Exp $
-
-SHA1 (csound/Csound4.23.tar.gz) = 15b18ee60b4690aa48593dc3b5d44a9473d0cb16
-Size (csound/Csound4.23.tar.gz) = 1172388 bytes
-SHA1 (patch-aa) = 6eeb263df9add94a79de7d6a67cb189e1dde3e5a
-SHA1 (patch-ab) = 3301b22ea79b0b87a4323835050f88eb3975c40e
-SHA1 (patch-ac) = 7b4838120b3337277732075fa4253090c6a892a4
-SHA1 (patch-ae) = 7a0840abf9bd6630205934fab8dd4a7b42d04e1a
-SHA1 (patch-af) = 59c0726958844315255f360f3ab6dfe2ed538d3d
-SHA1 (patch-ag) = 613350099e4890efa79de07c820325423fa8e13b
-SHA1 (patch-ai) = a66207be90ff96c975d906aa716b9ced63d021f2
-SHA1 (patch-ap) = 8547105765c6c0afa179869b87ce9db68a3afbab
-SHA1 (patch-aq) = ba44c4a8fb1ccb3bde72d1a28a7943b08e418bc2
-SHA1 (patch-ar) = 3219f640f11654b1502a4a9aebfadd4661efbcac
-SHA1 (patch-as) = a3c0097b29188c82432a07de9e5ef8ca7492feaf
-SHA1 (patch-at) = 1841be062be33ea5f1cdad561bb106e28d69ffab
-SHA1 (patch-au) = 8779283f3c375ee036af442dc28168f69e71e86e
-SHA1 (patch-av) = 8ab462bcd3ad550013d3b6e939f8fbe960b65b5c
-SHA1 (patch-aw) = a23249d81ebea09fa2bead35f39041e0e643d9a7
-SHA1 (patch-ax) = 84479915449e6dfddcd0c31f38418238bacbd013
-SHA1 (patch-ay) = 510334f831598ea5d423f798faeb6b991cb4c880
-SHA1 (patch-az) = a7a90801511f5142e797537cf9d62ff4f322e273
-SHA1 (patch-ba) = 5fba504106a30258308ef01b6900854251087e4b
diff -r a2116797846e -r c1fb6a6ae60c audio/csound-bath/files/rtNetBSD.c
--- a/audio/csound-bath/files/rtNetBSD.c Sun Nov 28 16:50:44 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,328 +0,0 @@
-/*
- --- rtNetBSD.c ---
-
- Native NetBSD audio support.
-
- Ben Collver, collver%linuxfreemail.com@localhost
-*/
-
-#include <sys/types.h>
-#include <sys/audioio.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <unistd.h>
-
-#include "cs.h"
-#include "soundio.h"
-#include "rtNetBSD.h"
-
-static int dspfd_in = -1, dspfd_out = -1;
-
-static int ishift = 0, oshift = 0, oMaxLag;
-extern OPARMS O;
-#ifdef PIPES
-# define _pclose pclose
-#endif
-
-static int getshift(int dsize) /* turn sample- or frame-size into shiftsize */
-{
- switch(dsize) {
- case 1: return(0);
- case 2: return(1);
- case 4: return(2);
- case 8: return(3);
- default: die("rtaudio: illegal dsize");
- return(-1); /* Not reached */
- }
-}
-
-
-void display_audio_info(
- int dspfd,
- const char *message,
- audio_info_t *info)
-{
- audio_encoding_t encoding;
- char *encoding_name;
-
- encoding.index = info->play.encoding;
- if (ioctl(dspfd, AUDIO_GETENC, &encoding) == -1) {
- asprintf(&encoding_name, "%d", info->play.encoding);
- } else {
- encoding_name = strdup(encoding.name);
- }
- printf("%-9s\n", message);
- printf(" info.play.precision = %d\n", info->play.precision);
- printf(" info.play.encoding = %s\n", encoding_name);
- printf(" info.play.channels = %d\n", info->play.channels);
- printf(" info.play.sample_rate = %d\n", info->play.sample_rate);
- printf(" info.blocksize = %d\n\n", info->blocksize);
- free(encoding_name);
-}
-
-void setsndparms(
- int dspfd,
- int format,
- int nchanls,
- float sr,
- unsigned bufsiz)
-{
- audio_info_t info;
- int count;
- int frag_size;
-
- AUDIO_INITINFO(&info);
-
- switch (format) {
- case AE_UNCH:
- info.play.precision = 8;
- info.play.encoding = AUDIO_ENCODING_ULINEAR;
- break;
- case AE_CHAR:
- info.play.precision = 8;
- info.play.encoding = AUDIO_ENCODING_SLINEAR;
- break;
- case AE_ULAW:
- info.play.precision = 8;
- info.play.encoding = AUDIO_ENCODING_ULAW;
- break;
- case AE_ALAW:
- info.play.precision = 8;
- info.play.encoding = AUDIO_ENCODING_ALAW;
- break;
- case AE_SHORT:
- /* audio(4) says AUDIO_ENCODING_SLINEAR uses platform's
- byte order, so the below will automatically be BE on
- a BE system, and LE on a LE system. Good/Bad/Ok? */
-
- info.play.precision = 16;
- info.play.encoding = AUDIO_ENCODING_SLINEAR;
- break;
- case AE_LONG:
- info.play.precision = 32;
- info.play.encoding = AUDIO_ENCODING_SLINEAR;
- break;
- case AE_FLOAT:
- die("NetBSD audio does not support floating-point samples");
- default:
- die("unknown sample format");
- }
-
- info.play.channels = nchanls;
- info.play.sample_rate = (unsigned int) sr;
-
- /* set DMA buffer fragment size to Csound's output buffer size */
- /*
- * The or'ing is ABSOLUTELY crucial to obtaining quick response
- * of csound to MIDI input - Please don't touch this line unless
- * you know you can do better (in terms of MIDI response)
- * [nicb%axnet.it@localhost]
- */
- frag_size = 16;
- count = 4;
- while (frag_size < bufsiz && count < 18) {
- frag_size <<= 1;
- count++;
- }
- count |= 0x0020000; /* Larry Troxler's Idea */
- info.blocksize = frag_size;
-
- /* from ossaudio.c ioctl SNDCTL_DSP_SETFRAGMENT */
- info.hiwat = ((unsigned)count >> 16) & 0x7fff;
- if (info.hiwat == 0)
- info.hiwat = 65536;
-
- if (ioctl(dspfd, AUDIO_SETINFO, &info) == -1) {
- display_audio_info(dspfd, "requested", &info);
- if (ioctl(dspfd, AUDIO_GETINFO, &info) != -1)
- display_audio_info(dspfd, "got", &info);
- die("unable to configure soundcard");
- }
-}
-
-int find_mixer_label(int dspfd, int class, const char *name)
-{
- int i;
- int mclass;
- int retval = -1;
- mixer_devinfo_t info;
-
- for (i = 0; ; i++) {
- info.index = i;
- if (ioctl(dspfd, AUDIO_MIXER_DEVINFO, &info) < 0)
- break;
- mclass = info.mixer_class;
- if ((info.index == mclass || class == mclass) &&
- !strcmp(info.label.name, name))
- {
- retval = i;
- }
- }
- return retval;
Home |
Main Index |
Thread Index |
Old Index