import audacity-0.95, an audio editor

19 files changed, 360 insertions, 0 deletions

diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
new file mode 100644
index 00000000000..185da7a947c
--- /dev/null
+++ b/audio/audacity/Makefile
@@ -0,0 +1,30 @@
+# $NetBSD: Makefile,v 1.1.1.1 2001/06/17 19:13:52 drochner Exp $
+#
+
+DISTNAME=	audacity-src-0.95
+PKGNAME=	audacity-0.95
+CATEGORIES=	audio
+MASTER_SITES=	http://prdownloads.sourceforge.net/audacity/
+EXTRACT_SUFX=	.tgz
+
+MAINTAINER=	packages@netbsd.org
+HOMEPAGE=	http://www.cs.cmu.edu/~music/audacity/
+COMMENT=	audio editor
+
+DEPENDS+=	wxGTK-*:../../x11/wxGTK
+BUILD_DEPENDS+=	zip-*:../../archivers/zip
+
+GNU_CONFIGURE=	YES
+CONFIGURE_ARGS+=	--without-xaudio --with-libmpeg3
+USE_GMAKE=	yes
+
+post-patch:
+	${SED} "s|XXXHELPDIRXXX|${PREFIX}/share|" \
+		<${WRKSRC}/Help.cpp >${WRKSRC}/Help.cpp.tmp \
+	&& ${MV} ${WRKSRC}/Help.cpp.tmp ${WRKSRC}/Help.cpp
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/audacity ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/audacity-help.htb ${PREFIX}/share
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/audacity/distinfo b/audio/audacity/distinfo
new file mode 100644
index 00000000000..179bdbfb0f8
--- /dev/null
+++ b/audio/audacity/distinfo
@@ -0,0 +1,19 @@
+$NetBSD: distinfo,v 1.1.1.1 2001/06/17 19:13:52 drochner Exp $
+
+SHA1 (audacity-src-0.95.tgz) = 4ce8105137dde4ee0a68680e4a1af18aebf1b77c
+Size (audacity-src-0.95.tgz) = 1202110 bytes
+SHA1 (patch-aa) = 4aee75c1e52e961209aecde6b6c670b69c69a45c
+SHA1 (patch-ab) = e506c4b4732653f80a745123dbb65ac7bb023516
+SHA1 (patch-ac) = 13d3a0f3733d5a155657f4137c1361c07d2f5f54
+SHA1 (patch-ad) = 73f5d6df3d990de5aefd6ee00ac1af371573e783
+SHA1 (patch-ae) = 34a14a0b75c9574b2da05d2875d2c5d9823a59f7
+SHA1 (patch-af) = bee0d29ef3e420cc3e55d61589d1f43939c57e6c
+SHA1 (patch-ag) = ceaea04349a2ec8be1091f85fa4e63cd4bd23ee3
+SHA1 (patch-ah) = ebe113f695dc2ccdcf388c96392aa43e7473e2df
+SHA1 (patch-ai) = c37fffd4eaf88d586d4fcc55a26044392bcd9b31
+SHA1 (patch-aj) = 90d5194db878eb6c4490dcbb96d5c4994629e3f0
+SHA1 (patch-ak) = 72893f3a7dd381d5f3b561af431add9be15c8752
+SHA1 (patch-al) = ad82a199df4a184ab134e2660b0b30accfaad866
+SHA1 (patch-am) = e43ae5603085943bcb847a4d9e1e51f0eb021756
+SHA1 (patch-an) = 1f5155e47a3dab416552b8c6c902ef4e315d4031
+SHA1 (patch-ao) = a5e2cd13cf1f4fae5ed6f92200cf3abc4507ae28
diff --git a/audio/audacity/patches/patch-aa b/audio/audacity/patches/patch-aa
new file mode 100644
index 00000000000..d9aa2e21b0e
--- /dev/null
+++ b/audio/audacity/patches/patch-aa
@@ -0,0 +1,27 @@
+$NetBSD: patch-aa,v 1.1.1.1 2001/06/17 19:13:52 drochner Exp $
+
+--- WaveTrack.cpp.orig	Fri Jun 15 13:36:03 2001
++++ WaveTrack.cpp	Fri Jun 15 13:37:40 2001
+@@ -848,7 +848,9 @@
+   	  numSamples = 0;
+   	  block->Clear();
+ 
+-  	  blockMutex->Unlock();	  
++#if wxUSE_THREADS
++  	  blockMutex->Unlock();
++#endif
+ 
+   	  wxString msg;
+   	  msg.Printf("The file named \"%s\" is missing from the project.",
+@@ -861,8 +863,10 @@
+   	block->Add(w);
+   }
+ 
++#if wxUSE_THREADS
+   blockMutex->Unlock();
+-  
++#endif
++
+   return true;
+ 
+ readWaveTrackError:
diff --git a/audio/audacity/patches/patch-ab b/audio/audacity/patches/patch-ab
new file mode 100644
index 00000000000..532021c406e
--- /dev/null
+++ b/audio/audacity/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.1.1.1 2001/06/17 19:13:52 drochner Exp $
+
+--- snd/audiooss.c.orig	Mon Apr 30 01:07:29 2001
++++ snd/audiooss.c	Sun Jun 17 09:18:04 2001
+@@ -9,7 +9,7 @@
+ #include <fcntl.h>
+ 
+ #include <sys/ioctl.h>
+-#include <sys/soundcard.h>
++#include <soundcard.h>
+ #include <sys/time.h>
+ 
+ /* snd includes */
+@@ -70,7 +70,7 @@
+   int channels;
+   int rate;
+   oss_info dp;
+-  const char *device = "/dev/dsp";
++  const char *device = "/dev/sound";
+ 
+   snd->u.audio.descriptor = (oss_info) malloc(sizeof(oss_info_struct));
+   dp = get_oss_info(snd);
diff --git a/audio/audacity/patches/patch-ac b/audio/audacity/patches/patch-ac
new file mode 100644
index 00000000000..6da0c412658
--- /dev/null
+++ b/audio/audacity/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1.1.1 2001/06/17 19:13:52 drochner Exp $
+
+--- snd/sndconfig.h.orig	Fri Jun 15 13:48:58 2001
++++ snd/sndconfig.h	Fri Jun 15 13:49:22 2001
+@@ -59,7 +59,7 @@
+ #elif defined(IRIX)
+   #include "sndirix.h"
+ 
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__)
+   #include "sndfreebsd.h"
+ 
+ #elif defined(_WIN32)
diff --git a/audio/audacity/patches/patch-ad b/audio/audacity/patches/patch-ad
new file mode 100644
index 00000000000..eb4d2c5373e
--- /dev/null
+++ b/audio/audacity/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1.1.1 2001/06/17 19:13:52 drochner Exp $
+
+--- snd/sndio.c.orig	Fri Jun 15 13:50:37 2001
++++ snd/sndio.c	Fri Jun 15 13:51:00 2001
+@@ -20,7 +20,7 @@
+ #ifdef WIN32
+ #include <sys/stat.h>
+ #include "io.h"
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__)
+ #include <sys/stat.h>
+ #else
+ #include <stat.h>
diff --git a/audio/audacity/patches/patch-ae b/audio/audacity/patches/patch-ae
new file mode 100644
index 00000000000..9a0db940a9f
--- /dev/null
+++ b/audio/audacity/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1.1.1 2001/06/17 19:13:52 drochner Exp $
+
+--- Makefile.in.orig	Mon Apr 30 01:07:29 2001
++++ Makefile.in	Fri Jun 15 14:44:55 2001
+@@ -8,7 +8,7 @@
+ # from Makefile.in
+ #
+ 
+-LIBS = @LIBS@
++LIBS = @LIBS@ -lossaudio
+ CFLAGS = @CFLAGS@ @CPPFLAGS@ -Iallegro
+ CCC = @CXX@
+ CC = @CC@
+@@ -101,7 +101,7 @@
+ # rule for building libmpeg3 -- however, it's only built if selected in
+ # the configure script
+ mpeg3/libmpeg3.a:
+-	make -C mpeg3
++	$(MAKE) -C mpeg3
+ 
+ #
+ # You can optionally "make dep" to make dependencies.
diff --git a/audio/audacity/patches/patch-af b/audio/audacity/patches/patch-af
new file mode 100644
index 00000000000..a7764cf0881
--- /dev/null
+++ b/audio/audacity/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1.1.1 2001/06/17 19:13:52 drochner Exp $
+
+--- snd/sndcvt.c.orig	Fri Jun 15 14:42:55 2001
++++ snd/sndcvt.c	Fri Jun 15 14:43:29 2001
+@@ -16,7 +16,7 @@
+ #ifdef WIN32
+ #include <sys/stat.h>
+ #include "io.h"
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__)
+ #include <sys/stat.h>
+ #else
+ #include <stat.h>
diff --git a/audio/audacity/patches/patch-ag b/audio/audacity/patches/patch-ag
new file mode 100644
index 00000000000..b04210dc085
--- /dev/null
+++ b/audio/audacity/patches/patch-ag
@@ -0,0 +1,19 @@
+$NetBSD: patch-ag,v 1.1.1.1 2001/06/17 19:13:52 drochner Exp $
+
+--- mpeg3/mpeg3ifo.c.orig	Sat Jun 16 14:39:15 2001
++++ mpeg3/mpeg3ifo.c	Sat Jun 16 15:02:27 2001
+@@ -1,9 +1,13 @@
+-#include <byteswap.h>
+ #include <dirent.h>
+ #include <fcntl.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/types.h>
++
++#include <sys/endian.h>
++#include <machine/bswap.h>
++#define bswap_16(x) bswap16(x)
++#define bswap_32(x) bswap32(x)
+ 
+ #include "ifo.h"
+ #include "mpeg3private.h"
diff --git a/audio/audacity/patches/patch-ah b/audio/audacity/patches/patch-ah
new file mode 100644
index 00000000000..57d62c8dd9a
--- /dev/null
+++ b/audio/audacity/patches/patch-ah
@@ -0,0 +1,22 @@
+$NetBSD: patch-ah,v 1.1.1.1 2001/06/17 19:13:52 drochner Exp $
+
+--- mpeg3/ifo.h.orig	Sat Jun 16 14:41:28 2001
++++ mpeg3/ifo.h	Sat Jun 16 14:42:10 2001
+@@ -206,7 +206,7 @@
+ 	u_char *data[10];
+ 	
+ 	int fd;		// file descriptor
+-	__off64_t pos;	// offset of ifo file on device 
++	off_t pos;	// offset of ifo file on device 
+ } ifo_t;
+ 
+ 
+@@ -234,7 +234,7 @@
+  * Prototypes
+  */
+ 
+-ifo_t *ifoOpen (int fd, __off64_t pos);
++ifo_t *ifoOpen (int fd, off_t pos);
+ int ifoClose (ifo_t *ifo);
+ 
+ u_int ifoGetVOBStart	(ifo_t *ifo);
diff --git a/audio/audacity/patches/patch-ai b/audio/audacity/patches/patch-ai
new file mode 100644
index 00000000000..0f56170cfe3
--- /dev/null
+++ b/audio/audacity/patches/patch-ai
@@ -0,0 +1,29 @@
+$NetBSD: patch-ai,v 1.1.1.1 2001/06/17 19:13:52 drochner Exp $
+
+--- mpeg3/mpeg3io.c.orig	Mon Apr 30 01:07:29 2001
++++ mpeg3/mpeg3io.c	Sat Jun 16 14:53:37 2001
+@@ -1,7 +1,7 @@
+ #include "mpeg3private.h"
+ #include "mpeg3protos.h"
+ 
+-#include <mntent.h>
++/*#include <mntent.h>*/
+ #include <sys/stat.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -86,6 +86,7 @@
+ 	return (result && bytes);
+ }
+ 
++#if 0
+ int mpeg3io_device(char *path, char *device)
+ {
+ 	struct stat file_st, device_st;
+@@ -112,6 +113,7 @@
+ 
+ 	return 0;
+ }
++#endif
+ 
+ int mpeg3io_seek(mpeg3_fs_t *fs, long byte)
+ {
diff --git a/audio/audacity/patches/patch-aj b/audio/audacity/patches/patch-aj
new file mode 100644
index 00000000000..8bcc4f24bf0
--- /dev/null
+++ b/audio/audacity/patches/patch-aj
@@ -0,0 +1,22 @@
+$NetBSD: patch-aj,v 1.1.1.1 2001/06/17 19:13:52 drochner Exp $
+
+--- mpeg3/video/reconstruct.c.orig	Mon Apr 30 01:07:29 2001
++++ mpeg3/video/reconstruct.c	Sat Jun 16 14:57:22 2001
+@@ -572,7 +572,7 @@
+ 	}
+ }
+ 
+-static inline void recv(unsigned char *s, unsigned char *d, int lx, int lx2, int h)
++static inline void xxrecv(unsigned char *s, unsigned char *d, int lx, int lx2, int h)
+ {
+ 	unsigned char *dp,*sp,*sp2;
+ 	int j;
+@@ -971,7 +971,7 @@
+ 			case 0x0:	recc(s, d, lx2, h);       break;
+ 			case 0x7:   recva(s, d, lx, lx2, h);  break;
+ 			case 0x6:   recvac(s, d, lx, lx2, h); break;
+-			case 0x5:	recv(s, d, lx, lx2, h);   break;
++			case 0x5:	xxrecv(s, d, lx, lx2, h);   break;
+ 			case 0x4:	recvc(s, d, lx, lx2, h);  break;
+ 			case 0x9:	rech(s, d, lx2, h);       break;
+ 			case 0x8:   rechc(s, d, lx2, h);      break;
diff --git a/audio/audacity/patches/patch-ak b/audio/audacity/patches/patch-ak
new file mode 100644
index 00000000000..4b6eda3c5da
--- /dev/null
+++ b/audio/audacity/patches/patch-ak
@@ -0,0 +1,11 @@
+$NetBSD: patch-ak,v 1.1.1.1 2001/06/17 19:13:52 drochner Exp $
+
+--- mpeg3/global_config.orig	Mon Apr 30 01:07:29 2001
++++ mpeg3/global_config	Sat Jun 16 18:00:39 2001
+@@ -1,5 +1,3 @@
+ # DO NOT EDIT.  EDIT ./configure INSTEAD AND RERUN IT.
+-CFLAGS = -O2 -D_FILE_OFFSET_BITS=64 -funroll-loops -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2 -march=i486 -I/usr/local/include
+-CC = gcc
+-NASM = nasm
++CFLAGS += -D_FILE_OFFSET_BITS=64
+ CFLAGS += -DHAVE_CSS
diff --git a/audio/audacity/patches/patch-al b/audio/audacity/patches/patch-al
new file mode 100644
index 00000000000..060c0964218
--- /dev/null
+++ b/audio/audacity/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1.1.1 2001/06/17 19:13:52 drochner Exp $
+
+--- mpeg3/Makefile.orig	Sat Jun 16 17:58:23 2001
++++ mpeg3/Makefile	Sat Jun 16 17:59:26 2001
+@@ -44,7 +44,7 @@
+ 
+ OUTPUT = libmpeg3.a
+ UTILS = dump mpeg3cat mpeg3toc mpeg3split
+-LIBS = -lm -lpthread
++LIBS = -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lm -lpthread
+ 
+ all: $(OUTPUT) util
+ 
diff --git a/audio/audacity/patches/patch-am b/audio/audacity/patches/patch-am
new file mode 100644
index 00000000000..2fc870e4b29
--- /dev/null
+++ b/audio/audacity/patches/patch-am
@@ -0,0 +1,31 @@
+$NetBSD: patch-am,v 1.1.1.1 2001/06/17 19:13:52 drochner Exp $
+
+--- AudioIO.cpp.orig	Mon Apr 30 01:07:29 2001
++++ AudioIO.cpp	Sat Jun 16 21:29:10 2001
+@@ -33,7 +33,7 @@
+ 
+ #ifdef __WXGTK__
+ bool gLinuxFirstTime = true;
+-char gLinuxDevice[256] = "/dev/dsp";
++char gLinuxDevice[256] = "/dev/sound";
+ #endif
+ 
+ #ifdef BOUNCE
+@@ -71,7 +71,7 @@
+   mPlayNode.format.bits = 16;
+   mPlayNode.format.srate = project->GetRate();
+ #ifdef __WXGTK__
+-  wxString linuxDevice = gPrefs->Read("/AudioIO/PlaybackDevice", "/dev/dsp");
++  wxString linuxDevice = gPrefs->Read("/AudioIO/PlaybackDevice", "/dev/sound");
+   strcpy(mPlayNode.u.audio.devicename,linuxDevice.c_str());
+ #else
+   strcpy(mPlayNode.u.audio.devicename,"");
+@@ -202,7 +202,7 @@
+   mRecordNode.format.bits = 16;
+   mRecordNode.format.srate = project->GetRate();
+ #ifdef __WXGTK__
+-  wxString linuxDevice = gPrefs->Read("/AudioIO/RecordingDevice", "/dev/dsp");
++  wxString linuxDevice = gPrefs->Read("/AudioIO/RecordingDevice", "/dev/sound");
+   strcpy(mRecordNode.u.audio.devicename,linuxDevice.c_str());
+ #else
+   strcpy(mRecordNode.u.audio.devicename,"");
diff --git a/audio/audacity/patches/patch-an b/audio/audacity/patches/patch-an
new file mode 100644
index 00000000000..73c7d3910ff
--- /dev/null
+++ b/audio/audacity/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1.1.1 2001/06/17 19:13:52 drochner Exp $
+
+--- Help.cpp.orig	Mon Apr 30 01:07:29 2001
++++ Help.cpp	Sat Jun 16 21:06:53 2001
+@@ -49,7 +49,7 @@
+ void InitHelp(wxWindow *parent)
+ {
+   if (!gHelp) {
+-	wxString defaultLoc = wxGetCwd() + "/audacity-help.htb";
++	wxString defaultLoc = "XXXHELPDIRXXX/audacity-help.htb";
+ 
+ 	wxString helpFilePath = gPrefs->Read("/Help/HelpFilePath", defaultLoc);
+ 
diff --git a/audio/audacity/patches/patch-ao b/audio/audacity/patches/patch-ao
new file mode 100644
index 00000000000..c89c15c0a78
--- /dev/null
+++ b/audio/audacity/patches/patch-ao
@@ -0,0 +1,33 @@
+$NetBSD: patch-ao,v 1.1.1.1 2001/06/17 19:13:52 drochner Exp $
+
+--- prefs/AudioIOPrefs.cpp.orig	Sun Jun 17 09:15:01 2001
++++ prefs/AudioIOPrefs.cpp	Sun Jun 17 09:15:47 2001
+@@ -45,8 +45,8 @@
+ 									GetSize());
+ 
+ 	gPrefs->SetPath("/AudioIO");
+-	wxString playDevice = gPrefs->Read("PlaybackDevice", "/dev/dsp");
+-	wxString recDevice  = gPrefs->Read("RecordingDevice", "/dev/dsp");
++	wxString playDevice = gPrefs->Read("PlaybackDevice", "/dev/sound");
++	wxString recDevice  = gPrefs->Read("RecordingDevice", "/dev/sound");
+ 	bool recordStereo;
+ 	gPrefs->Read("RecordStereo", &recordStereo, false);
+ 	bool duplex;
+@@ -173,7 +173,7 @@
+ {
+ 	/* TODO: attempt autodetection? */
+ #ifdef __WXGTK__
+-	mPlaybackDeviceCtrl->SetValue("/dev/dsp");
++	mPlaybackDeviceCtrl->SetValue("/dev/sound");
+ #endif // __WXGTK__
+ }
+ 
+@@ -184,7 +184,7 @@
+ void AudioIOPrefs::SetRecordingDeviceDefault(wxCommandEvent& event)
+ {
+ #ifdef __WXGTK__
+-	mRecordingDeviceCtrl->SetValue("/dev/dsp");
++	mRecordingDeviceCtrl->SetValue("/dev/sound");
+ #endif // __WXGTK__
+ }
+ 
diff --git a/audio/audacity/pkg/DESCR b/audio/audacity/pkg/DESCR
new file mode 100644
index 00000000000..b54ae64812b
--- /dev/null
+++ b/audio/audacity/pkg/DESCR
@@ -0,0 +1,5 @@
+Audacity is a program that manipulates digital audio waveforms. It supports all
+common editing operations such as Cut, Copy, and Paste, plus it will mix tracks
+and apply plug-in effects to any part of a sound. It also has a built-in
+amplitude envelope editor, a customizable spectrogram mode and a frequency
+analysis window for audio analysis applications.
diff --git a/audio/audacity/pkg/PLIST b/audio/audacity/pkg/PLIST
new file mode 100644
index 00000000000..5a70004bb07
--- /dev/null
+++ b/audio/audacity/pkg/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2001/06/17 19:13:52 drochner Exp $
+bin/audacity
+share/audacity-help.htb