diff options
author | hubertf <hubertf@pkgsrc.org> | 1998-02-22 23:20:20 +0000 |
---|---|---|
committer | hubertf <hubertf@pkgsrc.org> | 1998-02-22 23:20:20 +0000 |
commit | 10f9e71d0a618db2347ebd7af6e0d0e8a1d1fdfa (patch) | |
tree | ca546551dc88806ae8826701694d44083b9d7bed /audio/snd/patches | |
parent | aa179a5ba46f2f1e79f83ee2c3d2492d0c963f13 (diff) | |
download | pkgsrc-10f9e71d0a618db2347ebd7af6e0d0e8a1d1fdfa.tar.gz |
X based sound editor.
Diffstat (limited to 'audio/snd/patches')
-rw-r--r-- | audio/snd/patches/patch-aa | 26 | ||||
-rw-r--r-- | audio/snd/patches/patch-ab | 11 | ||||
-rw-r--r-- | audio/snd/patches/patch-ac | 20 | ||||
-rw-r--r-- | audio/snd/patches/patch-ad | 11 | ||||
-rw-r--r-- | audio/snd/patches/patch-ae | 33 | ||||
-rw-r--r-- | audio/snd/patches/patch-af | 14 | ||||
-rw-r--r-- | audio/snd/patches/patch-ag | 15 | ||||
-rw-r--r-- | audio/snd/patches/patch-ah | 23 | ||||
-rw-r--r-- | audio/snd/patches/patch-ai | 11 | ||||
-rw-r--r-- | audio/snd/patches/patch-aj | 28 | ||||
-rw-r--r-- | audio/snd/patches/patch-ak | 11 | ||||
-rw-r--r-- | audio/snd/patches/patch-al | 11 | ||||
-rw-r--r-- | audio/snd/patches/patch-am | 11 | ||||
-rw-r--r-- | audio/snd/patches/patch-an | 29 |
14 files changed, 254 insertions, 0 deletions
diff --git a/audio/snd/patches/patch-aa b/audio/snd/patches/patch-aa new file mode 100644 index 00000000000..42788ca977f --- /dev/null +++ b/audio/snd/patches/patch-aa @@ -0,0 +1,26 @@ +--- snd.orig/snd.h Thu Feb 12 15:36:40 1998 ++++ snd.h Sun Feb 22 02:19:27 1998 +@@ -21,17 +21,21 @@ + #include "sound_types.h" + #include "cmus_prototypes.h" + +-#if defined(SGI) || defined(LINUX) || defined(NEXT) || defined(SCO5) || defined(UW2) || defined(SOLARIS) ++#ifndef HAVE_MOTIF ++#if defined(SGI) || defined(LINUX) || defined(NEXT) || defined(SCO5) || defined(UW2) || defined(SOLARIS) || defined(__NetBSD__) + #define HAVE_MOTIF 1 + #else + #define HAVE_MOTIF 0 + #endif ++#endif /* HAVE_MOTIF */ + +-#if defined(LINUX) || defined(SCO5) || defined(UW2) ++#ifndef HAVE_OSS ++#if defined(LINUX) || defined(SCO5) || defined(UW2) || defined(__NetBSD__) + #define HAVE_OSS 1 + #else + #define HAVE_OSS 0 + #endif ++#endif /* HAVE_OSS */ + + #include "snd-0.h" + diff --git a/audio/snd/patches/patch-ab b/audio/snd/patches/patch-ab new file mode 100644 index 00000000000..e5fe217a6d0 --- /dev/null +++ b/audio/snd/patches/patch-ab @@ -0,0 +1,11 @@ +--- snd.orig/cmus.h Thu Jan 22 15:08:02 1998 ++++ cmus.h Sun Feb 22 02:04:51 1998 +@@ -17,7 +17,7 @@ + + /* due to project builder stupidity, we can't always depend on -D flags here (maybe we need a CLM_SND_OS macro?) */ + +-#if (!(defined(SGI))) && (!(defined(NEXT))) && (!(defined(LINUX))) && (!(defined(MACOS))) && (!(defined(BEOS))) && (!(defined(SUN))) && (!(defined(UW2))) && (!(defined(SCO5))) ++#if (!(defined(SGI))) && (!(defined(NEXT))) && (!(defined(LINUX))) && (!(defined(MACOS))) && (!(defined(BEOS))) && (!(defined(SUN))) && (!(defined(UW2))) && (!(defined(SCO5))) && (!(defined(__NetBSD__))) + #if defined(__dest_os) + /* we're in Metrowerks Land */ + #if (__dest_os == __be_os) diff --git a/audio/snd/patches/patch-ac b/audio/snd/patches/patch-ac new file mode 100644 index 00000000000..fdddc18ae22 --- /dev/null +++ b/audio/snd/patches/patch-ac @@ -0,0 +1,20 @@ +--- snd.orig/cmus_prototypes.h Thu Feb 12 15:36:33 1998 ++++ cmus_prototypes.h Sun Feb 22 02:05:30 1998 +@@ -208,7 +208,7 @@ + #endif + + /* pipe.c */ +-#if defined(SGI) || defined(LINUX) ++#if defined(SGI) || defined(LINUX) || defined(__NetBSD__) + int write_snd_fifo(char *buf, int len); + #endif + +@@ -229,7 +229,7 @@ + void set_rt_record_p (int rt); + int clm_read_any(int tfd, int beg, int chans, int nints, int **bufs, int *cm); + +-#if defined(SGI) || defined(LINUX) ++#if defined(SGI) || defined(LINUX) || defined(__NetBSD__) + float c_control (int n); + float c_set_control (int n, float val); + int c_open_controls (int size); diff --git a/audio/snd/patches/patch-ad b/audio/snd/patches/patch-ad new file mode 100644 index 00000000000..9d14198798f --- /dev/null +++ b/audio/snd/patches/patch-ad @@ -0,0 +1,11 @@ +--- snd.orig/io.c Mon Feb 2 14:59:54 1998 ++++ io.c Sun Feb 22 02:06:44 1998 +@@ -399,7 +399,7 @@ + * many cases -- the output buffer can collect many notes before flushing, etc. + */ + +-#if defined(SGI) || defined(LINUX) || defined(UW2) || defined(SCO5) ++#if defined(SGI) || defined(LINUX) || defined(UW2) || defined(SCO5) || defined(__NetBSD__) + #define FILE_DESCRIPTORS 256 + #define BASE_FILE_DESCRIPTORS 200 + #else diff --git a/audio/snd/patches/patch-ae b/audio/snd/patches/patch-ae new file mode 100644 index 00000000000..01a79356f4f --- /dev/null +++ b/audio/snd/patches/patch-ae @@ -0,0 +1,33 @@ +--- snd.orig/makefile.netbsd Thu Jan 1 01:00:00 1970 ++++ makefile.netbsd Sun Feb 22 02:32:49 1998 +@@ -0,0 +1,30 @@ ++# Snd make file for NetBSD, assuming Motif is available (audio currently stubbed out) ++ ++CC = gcc ++#CFLAGS = -O2 -DXPM -DHAVE_OSS -I/usr/X11R6/include -I/usr/pkg/include ++CFLAGS = -DXPM -DHAVE_OSS -I/usr/X11R6/include -I/usr/pkg/include ++CFLAGS += -g ++ ++LIBS = -L/usr/X11R6/lib -lMrm -lXm -lXpm -lXmu -lXt -lXext -lX11 -lm -lossaudio ++CLM_HEADERS = cmus_prototypes.h cmus.h sound_types.h ++SND_HEADERS = snd.h snd-0.h snd-1.h snd-ufun.h snd-strings.h sndclm.h ++SND_X_HEADERS = snd-x0.h snd-x1.h ++ ++CLM_O_FILES = io.o headers.o ++ ++O_FILES = snd-io.o snd-utils.o snd-parser.o snd-axis.o snd-data.o snd-fft.o snd-marks.o snd-file.o snd-edits.o snd-chn.o snd-dac.o snd-clip.o snd-find.o snd-snd.o snd-help.o snd-clm.o snd-main.o snd-print.o snd-ufun.o snd-ufunex.o snd-apply.o snd-trans.o snd-mix.o snd.o snd-env.o ++ ++X_O_FILES = snd-xutils.o snd-xdata.o snd-xmenu.o snd-xchn.o snd-xsnd.o snd-xdac.o snd-xclip.o snd-xmain.o snd-xclm.o snd-xmix.o snd-xrec.o snd-xenv.o ++ ++snd: $(CLM_HEADERS) $(SND_HEADERS) $(SND_X_HEADERS) $(CLM_O_FILES) $(O_FILES) $(X_O_FILES) ++ $(CC) $(CLM_O_FILES) $(O_FILES) $(X_O_FILES) -o snd $(LIBS) ++ ++$(CLM_O_FILES): $(CLM_HEADERS) ++$(O_FILES): $(SND_HEADERS) $(SND_X_HEADERS) ++$(X_O_FILES): $(SND_HEADERS) $(SND_X_HEADERS) ++ ++clean: ++ rm -f $(CLM_O_FILES) ++ rm -f $(O_FILES) ++ rm -f $(X_O_FILES) ++ diff --git a/audio/snd/patches/patch-af b/audio/snd/patches/patch-af new file mode 100644 index 00000000000..c7dd578fa92 --- /dev/null +++ b/audio/snd/patches/patch-af @@ -0,0 +1,14 @@ +--- snd.orig/snd-clm.c Thu Feb 12 15:37:13 1998 ++++ snd-clm.c Sun Feb 22 02:20:40 1998 +@@ -753,7 +753,11 @@ + { + /* turn off inputs (they create an unbelievable amount of noise) and maximize outputs */ + int fd,amp,devmask; ++#ifdef __NetBSD__ ++ fd = open("/dev/audio",O_WRONLY,0); ++#else /* !__NetBSD__ */ + fd = open("/dev/dsp",O_WRONLY,0); ++#endif /* __NetBSD__ */ + if (fd == -1) return; + amp = 0; + ioctl(fd,SOUND_MIXER_READ_DEVMASK,&devmask); diff --git a/audio/snd/patches/patch-ag b/audio/snd/patches/patch-ag new file mode 100644 index 00000000000..5ce90e5421f --- /dev/null +++ b/audio/snd/patches/patch-ag @@ -0,0 +1,15 @@ +--- snd.orig/snd-dac.c Mon Dec 22 17:22:48 1997 ++++ snd-dac.c Sun Feb 22 02:25:39 1998 +@@ -200,7 +200,11 @@ + #include <soundcard.h> + #endif + +-#define DAC_NAME "/dev/dsp" ++#ifdef LINUX ++# define DAC_NAME "/dev/dsp" ++#else /* !LINUX */ ++# define DAC_NAME "/dev/audio" /* /dev/sound? - HF */ ++#endif /* LINUX */ + #define FRAGMENTS 2 + #define FRAGMENT_SIZE 10 + diff --git a/audio/snd/patches/patch-ah b/audio/snd/patches/patch-ah new file mode 100644 index 00000000000..7e815ba7ff5 --- /dev/null +++ b/audio/snd/patches/patch-ah @@ -0,0 +1,23 @@ +--- snd.orig/snd-file.c Tue Feb 10 15:42:41 1998 ++++ snd-file.c Sun Feb 22 02:11:57 1998 +@@ -15,6 +15,11 @@ + #include <sys/vfs.h> + #endif + ++#if defined (__NetBSD__) ++ #include <sys/param.h> ++ #include <sys/mount.h> ++#endif ++ + #ifdef BEOS + int disk_kspace (int fd) {return(1234567);} + time_t file_write_date(char *filename) {return(1234567);} +@@ -26,7 +31,7 @@ + #if defined(SGI) || defined(SCO5) || defined(UW2) || defined(SOLARIS) + err = fstatfs(fd,&buf,sizeof(buf),0); + #endif +-#if defined(LINUX) || defined(NEXT) ++#if defined(LINUX) || defined(NEXT) || defined(__NetBSD__) + err = fstatfs(fd,&buf); + #endif + /* in 32 bit land, the number of bytes can easily go over 2^32, so we'll look at kbytes here */ diff --git a/audio/snd/patches/patch-ai b/audio/snd/patches/patch-ai new file mode 100644 index 00000000000..bfb15fc94ff --- /dev/null +++ b/audio/snd/patches/patch-ai @@ -0,0 +1,11 @@ +--- snd.orig/snd-ufun.c Mon Dec 22 17:24:11 1997 ++++ snd-ufun.c Sun Feb 22 02:12:45 1998 +@@ -2,7 +2,7 @@ + + #ifndef NEXT + +-#if defined(SGI) || defined(SCO5) || defined(UW2) ++#if defined(SGI) || defined(SCO5) || defined(UW2) || defined(__NetBSD__) + #include <dlfcn.h> + #endif + diff --git a/audio/snd/patches/patch-aj b/audio/snd/patches/patch-aj new file mode 100644 index 00000000000..3f5b88baeff --- /dev/null +++ b/audio/snd/patches/patch-aj @@ -0,0 +1,28 @@ +--- snd.orig/snd-x0.h Wed Dec 17 19:12:04 1997 ++++ snd-x0.h Sun Feb 22 02:14:17 1998 +@@ -14,14 +14,14 @@ + * All the documentation says this is dangerous, so it's on this switch + */ + +-#if defined(LINUX) || defined(SCO5) || defined(UW2) || defined(SOLARIS) ++#if defined(LINUX) || defined(SCO5) || defined(UW2) || defined(SOLARIS) || defined(__NetBSD__) + #define RESIZE_DIALOG 1 + /* these versions of Motif need to be told to allow a dialog to include resize controls */ + #else + #define RESIZE_DIALOG 0 + #endif + +-#if defined(LINUX) || defined(SCO5) || defined(UW2) || defined(SOLARIS) ++#if defined(LINUX) || defined(SCO5) || defined(UW2) || defined(SOLARIS) || defined(__NetBSD__) + #define MANAGE_DIALOG 1 + /* these versions of Motif need to "manage" a dialog before dealing with its children */ + #else +@@ -67,7 +67,7 @@ + #define CONTROLS_MARGIN 0 + #endif + +-#if defined(LINUX) || defined(SCO5) || defined(UW2) || defined(SOLARIS) ++#if defined(LINUX) || defined(SCO5) || defined(UW2) || defined(SOLARIS) || defined(__NetBSD__) + #define LINE_MARGIN 4 + #define CONTROLS_MARGIN 1 + #define TOGGLE_SIZE 13 diff --git a/audio/snd/patches/patch-ak b/audio/snd/patches/patch-ak new file mode 100644 index 00000000000..df97ae64b2e --- /dev/null +++ b/audio/snd/patches/patch-ak @@ -0,0 +1,11 @@ +--- snd.orig/snd-x1.h Thu Jan 22 15:08:49 1998 ++++ snd-x1.h Sun Feb 22 02:14:34 1998 +@@ -328,7 +328,7 @@ + void reflect_group_speed_change(snd_state *ss, grp_info *g, float speed); + void reflect_group_tempo_change(grp_info *g, float speed); + +-#ifdef LINUX ++#if defined(LINUX) || defined(__NetBSD__) + void override_toggle_translation(Widget w); + #endif + diff --git a/audio/snd/patches/patch-al b/audio/snd/patches/patch-al new file mode 100644 index 00000000000..4fd1d4fe15a --- /dev/null +++ b/audio/snd/patches/patch-al @@ -0,0 +1,11 @@ +--- snd.orig/snd-xmain.c Mon Feb 2 15:00:56 1998 ++++ snd-xmain.c Sun Feb 22 02:14:56 1998 +@@ -42,7 +42,7 @@ + #define OPEN_CTRLS_HEIGHT 185 + #define ICON_TYPE 1 + #endif +-#if defined(LINUX) || defined(SCO5) || defined(UW2) || defined(SOLARIS) ++#if defined(LINUX) || defined(SCO5) || defined(UW2) || defined(SOLARIS) || defined(__NetBSD__) + #define BUTTON_FONT "-*-times-medium-r-*-*-12-*-*-*-*-*-iso8859-1" + #define BOLD_BUTTON_FONT "-*-times-bold-r-*-*-12-*-*-*-*-*-iso8859-1" + #define AXIS_LABEL_FONT "-*-times-medium-r-normal-*-16-*-*-*-*-*-iso8859-1" diff --git a/audio/snd/patches/patch-am b/audio/snd/patches/patch-am new file mode 100644 index 00000000000..9e49dfe3878 --- /dev/null +++ b/audio/snd/patches/patch-am @@ -0,0 +1,11 @@ +--- snd.orig/snd-xmenu.c Thu Feb 5 15:01:39 1998 ++++ snd-xmenu.c Sun Feb 22 02:15:33 1998 +@@ -2900,7 +2900,7 @@ + XtSetArg(args[n],XmNtopAttachment,(last_row) ? XmATTACH_WIDGET : XmATTACH_FORM); n++; + if (last_row) {XtSetArg(args[n],XmNtopWidget,last_row); n++;} + XtSetArg(args[n],XmNbottomAttachment,XmATTACH_NONE); n++; +-#if defined(LINUX) || defined(SCO5) || defined(UW2) || defined(SUN) ++#if defined(LINUX) || defined(SCO5) || defined(UW2) || defined(SUN) || defined(__NetBSD__) + XtSetArg(args[n],XmNheight,17); n++; + #else + XtSetArg(args[n],XmNheight,20); n++; diff --git a/audio/snd/patches/patch-an b/audio/snd/patches/patch-an new file mode 100644 index 00000000000..afdf6ca0a93 --- /dev/null +++ b/audio/snd/patches/patch-an @@ -0,0 +1,29 @@ +--- snd.orig/snd-xrec.c Mon Feb 2 15:01:06 1998 ++++ snd-xrec.c Sun Feb 22 02:23:01 1998 +@@ -1314,7 +1314,11 @@ + #include <soundcard.h> + #endif + +-#define DAC_NAME "/dev/dsp" ++#ifdef LINUX ++# define DAC_NAME "/dev/dsp" ++#else /* !LINUX */ ++# define DAC_NAME "/dev/audio" ++#endif /* LINUX */ + #define FRAGMENTS 2 + #define FRAGMENT_SIZE 10 + +@@ -1415,8 +1419,11 @@ + if ((audio_fd = open(DAC_NAME,O_RDONLY,0)) == -1) + { + record_report(rec,"can't open any inputs!"); +- if ((errno == EACCES) || (errno == ENOENT)) +- record_report(rec,"(to get input in Linux, we need read permission on /dev/dsp)"); ++ if ((errno == EACCES) || (errno == ENOENT)){ ++ char buf[256]; ++ snprintf(buf,256,"(to get input in Linux, we need read permission on %s)",DAC_NAME); ++ record_report(rec,buf); ++ } + return(-1); + } + } |