summaryrefslogtreecommitdiff
path: root/audio/xwave
diff options
context:
space:
mode:
Diffstat (limited to 'audio/xwave')
-rw-r--r--audio/xwave/DESCR20
-rw-r--r--audio/xwave/Makefile31
-rw-r--r--audio/xwave/PLIST9
-rw-r--r--audio/xwave/distinfo25
-rw-r--r--audio/xwave/patches/patch-aa13
-rw-r--r--audio/xwave/patches/patch-ab81
-rw-r--r--audio/xwave/patches/patch-ac37
-rw-r--r--audio/xwave/patches/patch-ad189
-rw-r--r--audio/xwave/patches/patch-ae13
-rw-r--r--audio/xwave/patches/patch-af22
-rw-r--r--audio/xwave/patches/patch-ag24
-rw-r--r--audio/xwave/patches/patch-ah32
-rw-r--r--audio/xwave/patches/patch-ai13
-rw-r--r--audio/xwave/patches/patch-aj90
-rw-r--r--audio/xwave/patches/patch-ak72
-rw-r--r--audio/xwave/patches/patch-al14
-rw-r--r--audio/xwave/patches/patch-am13
-rw-r--r--audio/xwave/patches/patch-an24
-rw-r--r--audio/xwave/patches/patch-ao11
-rw-r--r--audio/xwave/patches/patch-ap33
-rw-r--r--audio/xwave/patches/patch-aq36
-rw-r--r--audio/xwave/patches/patch-ar12
-rw-r--r--audio/xwave/patches/patch-as13
-rw-r--r--audio/xwave/patches/patch-at21
24 files changed, 0 insertions, 848 deletions
diff --git a/audio/xwave/DESCR b/audio/xwave/DESCR
deleted file mode 100644
index 5c2819c67a7..00000000000
--- a/audio/xwave/DESCR
+++ /dev/null
@@ -1,20 +0,0 @@
-xwave is an audio player, recorder and editor for the X Window System.
-
-This is an alpha release of xwave.
-
-The user interface of xwave is based on the Athena Widget Set and some
-Widgets from FWF. The application defaults are optimized to work with
-Xaw3d (replaces the Xaw for 3d look), so if you don't use Xaw3d you will
-probably need to modify the resources.
-
-Features:
- - multiple files
- - overview window
- - zoom window
- - mark, cut, copy, paste, merge
- - echo, reverse, swap, resample, volume (absolute, dynamic
- compressor)
- - stop record on demand
- - raw, wav, au, aiff, aifc (PCM,ALAW,ULAW,ADPCM <- not all
- implementations)
- - files of every length
diff --git a/audio/xwave/Makefile b/audio/xwave/Makefile
deleted file mode 100644
index b92faf2d485..00000000000
--- a/audio/xwave/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.22 2006/12/27 13:37:36 joerg Exp $
-#
-
-DISTNAME= xwave2
-PKGNAME= xwave-2.0
-PKGREVISION= 1
-CATEGORIES= audio x11
-MASTER_SITES= # empty
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= Audio player/recorder/editor for the X Window System
-
-USE_IMAKE= YES
-INSTALLATION_DIRS= bin lib/X11/app-defaults
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/src/xwave ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/src/XWave ${PREFIX}/lib/X11/app-defaults
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xwave2
- ${INSTALL_DATA} ${WRKSRC}/README \
- ${WRKSRC}/README-XWAVE2 \
- ${WRKSRC}/README.v06 \
- ${WRKSRC}/COPYING \
- ${WRKSRC}/INSTALL \
- ${PREFIX}/share/doc/xwave2
-
-.include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xwave/PLIST b/audio/xwave/PLIST
deleted file mode 100644
index 46ec9eb8e63..00000000000
--- a/audio/xwave/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:18:42 zuntum Exp $
-bin/xwave
-lib/X11/app-defaults/XWave
-share/doc/xwave2/README
-share/doc/xwave2/README-XWAVE2
-share/doc/xwave2/README.v06
-share/doc/xwave2/COPYING
-share/doc/xwave2/INSTALL
-@dirrm share/doc/xwave2
diff --git a/audio/xwave/distinfo b/audio/xwave/distinfo
deleted file mode 100644
index 266afc7475f..00000000000
--- a/audio/xwave/distinfo
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: distinfo,v 1.9 2005/10/09 15:04:14 joerg Exp $
-
-SHA1 (xwave2.tar.gz) = 7ace9911c9425eab4907a34694cd208d21a6dac2
-RMD160 (xwave2.tar.gz) = 71df0bc4640be385c33ea3a2525bc7287741d9ab
-Size (xwave2.tar.gz) = 269942 bytes
-SHA1 (patch-aa) = 934f1818bc09fb8b6ccea1ec921fac95a460098f
-SHA1 (patch-ab) = 28801c1e4722275b599e9035e65136b9cc25215d
-SHA1 (patch-ac) = ae802fc9d4f882089496f41cc7b06412ae9ddf62
-SHA1 (patch-ad) = 87638e7555fe3d855f0972bef0942a9dcc90f535
-SHA1 (patch-ae) = 9b4fed9bb232334f2fcaaf59db152d1b078f3702
-SHA1 (patch-af) = 01d5fdad2c7056252ab64c49d9ebb06c7b5fbf6c
-SHA1 (patch-ag) = f06b4eecf0eafc985077fa2c356cd4c0e88cfe15
-SHA1 (patch-ah) = 61449264babde8d304f93084dbfa194d9a8b07c8
-SHA1 (patch-ai) = 34cd50fc75d5dd604349d5f694a993f23d87a24a
-SHA1 (patch-aj) = 6fbd9f8643d9557b3b4ae1df5db45235a531584b
-SHA1 (patch-ak) = cab81a7ad665ecabf09cae3908b13cef17f3ca17
-SHA1 (patch-al) = 8b0decd012d84f425805e577ff02ef56faa9ee17
-SHA1 (patch-am) = 401677317560d7e0bbacee977d02c23871dd550f
-SHA1 (patch-an) = 10ffb81b79da56bb2087924b645eefb56a1d1fc3
-SHA1 (patch-ao) = 3cf9f51939be5f02ad423d79103e7faeab13a3fd
-SHA1 (patch-ap) = 7a06de821da92a2d388939fdcaf7618a0a7f96ba
-SHA1 (patch-aq) = 62164a6a788190b5cce231bfadf5d7e0a22ee0d1
-SHA1 (patch-ar) = 22874069ef6de212d3f13302e649be06d03760a9
-SHA1 (patch-as) = 71bfcb6ebf047e01d08ba9d9b091e506943aa944
-SHA1 (patch-at) = 49e89a952862f47f00c37e6dd6879b5f3fea49b8
diff --git a/audio/xwave/patches/patch-aa b/audio/xwave/patches/patch-aa
deleted file mode 100644
index 79195f69c30..00000000000
--- a/audio/xwave/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 1999/02/10 14:56:42 frueauf Exp $
-
---- src/XWave.orig Thu Aug 13 01:27:09 1998
-+++ src/XWave Mon Feb 8 16:41:18 1999
-@@ -2,7 +2,7 @@
-
- XWave*wdir: /usr/share/data/sounds/prosonus
- XWave*tdir: /mnt/d/tmp
--XWave*device: /dev/dsp
-+XWave*device: /dev/audio
- XWave*maxmem: 1000
- XWave*doubleplay: False
- XWave*raisecanvas: False
diff --git a/audio/xwave/patches/patch-ab b/audio/xwave/patches/patch-ab
deleted file mode 100644
index 6c2d54e8117..00000000000
--- a/audio/xwave/patches/patch-ab
+++ /dev/null
@@ -1,81 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2001/11/18 15:03:39 itohy Exp $
-
---- src/aifc.c.orig Thu Aug 13 08:27:09 1998
-+++ src/aifc.c Sun Nov 18 22:28:26 2001
-@@ -9,7 +9,7 @@
-
- #ifdef linux
- #include <endian.h>
--#elif defined (FreeBSD)
-+#elif defined (FreeBSD) || defined(__NetBSD__)
- #include <machine/endian.h>
- #elif defined (sgi)
- #include <sys/endian.h>
-@@ -21,8 +21,8 @@
- #include "types.h"
- #include "audio_file.h"
- #include "ieee/ieee.h"
--#include "aifc.h"
- #include "endian.h"
-+#include "aifc.h"
-
- static int aifc_new(Audio_File *af);
-
-@@ -49,8 +49,8 @@
- int i,count;
- Aif_Form form;
- Aif_Chunk chunk;
-- ulong frames,stamp,block_size,offset;
-- short channels,bps;
-+ u_int32_t frames,stamp,block_size,offset;
-+ int16_t channels,bps;
- ID comp_typ;
- unsigned char freq[10],plength,*pstring;
- bool com_found=False;
-@@ -177,7 +177,7 @@
- Com_Chunk com;
- int headoffs=0;
- char freq[10];
-- ulong stamp,offset,block_size;
-+ u_int32_t stamp,offset,block_size;
- int i;
-
- com.channels=af->channels;
-@@ -291,7 +291,7 @@
- M_32_SWAP(form.type);
- #endif
-
-- if (aifc_seek(*af,0,SEEK_SET)==AF_ERROR) {
-+ if (lseek(af->fd,0,SEEK_SET)==-1) {
- if (com.pstring!=NULL) free(com.pstring);
- return(AF_ERROR);
- }
-@@ -301,7 +301,7 @@
- return(AF_ERROR);
- }
-
-- if (aifc_seek(*af,headoffs,SEEK_SET)==AF_ERROR) {
-+ if (lseek(af->fd,headoffs,SEEK_SET)==-1) {
- if (com.pstring!=NULL) free(com.pstring);
- return(AF_ERROR);
- }
-@@ -348,14 +348,16 @@
- {
- switch (af.comp) {
- case AF_PCM:
-- return(lseek(af.fd,pos,mode));
-+ break;
-+ default:
-+ return(AF_ERROR);
- }
-- return(AF_ERROR);
-+ return(lseek(af.fd, mode == SEEK_SET ? pos + af.headoffs : pos, mode));
- }
-
- int aifc_close(Audio_File af)
- {
-- if (aifc_seek(af,0,SEEK_SET)==AF_ERROR) return(AF_ERROR);
-+ if (lseek(af.fd,0,SEEK_SET)==-1) return(AF_ERROR);
- if (aifc_new (&af)==AF_ERROR) return(AF_ERROR);
- return(close(af.fd));
- }
diff --git a/audio/xwave/patches/patch-ac b/audio/xwave/patches/patch-ac
deleted file mode 100644
index e18822a1b58..00000000000
--- a/audio/xwave/patches/patch-ac
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2001/11/18 15:03:39 itohy Exp $
-
---- src/au.c.orig Thu Aug 13 08:27:09 1998
-+++ src/au.c Sun Nov 18 22:22:37 2001
-@@ -32,7 +32,7 @@
-
- #ifdef linux
- #include <endian.h>
--#elif defined (FreeBSD)
-+#elif defined (FreeBSD) || defined(__NetBSD__)
- #include <machine/endian.h>
- #elif defined (sgi)
- #include <sys/endian.h>
-@@ -212,16 +212,19 @@
- {
- switch (af.comp) {
- case AF_PCM:
-- return(lseek(af.fd,pos,mode));
-+ break;
- case AF_MULAW:
-- return(lseek(af.fd,pos/2,mode));
-+ pos /= 2;
-+ break;
-+ default:
-+ return(AF_ERROR);
- }
-- return(AF_ERROR);
-+ return(lseek(af.fd, mode == SEEK_SET ? pos + af.headoffs : pos, mode));
- }
-
- int au_close(Audio_File af)
- {
-- if (au_seek(af,0,SEEK_SET)==AF_ERROR) return(AF_ERROR);
-+ if (lseek(af.fd,0,SEEK_SET)==-1) return(AF_ERROR);
- if (au_new (&af)==AF_ERROR) return(AF_ERROR);
- return(close(af.fd));
- }
diff --git a/audio/xwave/patches/patch-ad b/audio/xwave/patches/patch-ad
deleted file mode 100644
index 963284a2158..00000000000
--- a/audio/xwave/patches/patch-ad
+++ /dev/null
@@ -1,189 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2005/10/03 13:30:20 joerg Exp $
-
---- orig/xwave/src/audio.c Tue Nov 26 11:13:44 1996
-+++ src/audio.c Fri Feb 20 23:46:06 1998
-@@ -37,9 +37,12 @@
- #ifdef linux
- #include <linux/soundcard.h>
-
--#elif defined(FreeBSD)
-+#elif defined(FreeBSD) || defined(__DragonFly__)
- #include <machine/soundcard.h>
-
-+#elif defined(__NetBSD__)
-+#include <soundcard.h>
-+
- #elif defined(sgi)
- #include <dmedia/audio.h>
-
-@@ -55,7 +58,7 @@
- #include "sample_settings.h"
- #include "audio.h"
-
--#if defined(linux) || defined (FreeBSD) || defined(sun)
-+#if defined(linux) || defined (FreeBSD) || defined(sun) || defined(__NetBSD__) || defined(__DragonFly__)
- static int set_dsp(int o_mode,int res,int channels,int freq,int *buf_size);
- #endif
-
-@@ -67,7 +70,7 @@ extern AppResources app_resources;
- static Audio_File af;
- static int stop_record;
-
--#if defined (linux) || defined (FreeBSD)
-+#if defined (linux) || defined (FreeBSD) || defined(__NetBSD__) || defined(__DragonFly__)
- int set_dsp(int o_mode,int res, int channels, int freq, int *buf_size)
- {
- int check;
-@@ -274,7 +277,7 @@ int get_samples(byte* audio_buffer,int m
- }
- #endif
-
--#ifdef sun
-+#if defined(sun)
- void check_audio(Main_Bool *mb)
- /* test if there is a play device, and how fast we can play */
- {
-@@ -307,7 +310,7 @@ void check_audio(Main_Bool *mb)
- case AUDIO_ENCODING_LINEAR:
- printf("ULAW\n");break;
- default:
-- printf("unknown encoding\n");
-+ printf("unknown encoding: %d\n",au_info.play.encoding);
- }
- close(audio);
- } else {
-@@ -370,7 +373,7 @@ int get_samples(byte* audio_buffer,int m
-
- void play_file(char *fname,Main_Bool *mb)
- {
--#if defined (linux) || defined (FreeBSD) || defined (sun)
-+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
- int audio;
- #elif defined(sgi)
- ALport port;
-@@ -384,7 +387,7 @@ void play_file(char *fname,Main_Bool *mb
- return;
- }
-
--#if defined (linux) || defined (FreeBSD) || defined (sun)
-+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__)
- if ((audio=set_dsp(O_WRONLY,af.bps,af.channels,af.freq,&buf_size))==-1) {
- fprintf(stderr,"XWave: Error ! Cannot set dsp !\n");
- close(af.fd);
-@@ -404,7 +407,7 @@ void play_file(char *fname,Main_Bool *mb
- if ((buffer=malloc(buf_size))==NULL) {
- fprintf(stderr,"XWave: Error ! Cannot alloc mem !\n");
- close(af.fd);
--#if defined (linux) || defined (FreeBSD) || defined (sun)
-+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
- close(audio);
- #elif defined(sgi)
- ALcloseport(port);
-@@ -413,7 +416,7 @@ void play_file(char *fname,Main_Bool *mb
- return;
- }
-
--#if defined (linux) || defined (FreeBSD) || defined (sun)
-+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
- while ((length=af_read(af,buffer,buf_size))>0) {
- if (write(audio, buffer, length)==-1) break;
- }
-@@ -440,7 +443,7 @@ void play_buffer(Main_Data *md)
- int offset=0,playlength,length;
- #ifdef sgi
- ALport port;
--#elif defined(linux) || defined (FreeBSD) || defined (sun)
-+#elif defined(linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
- int audio;
-
- if ((audio=set_dsp(O_WRONLY,wd->res,wd->channels,wd->freq,&buf_size))==-1) {
-@@ -473,7 +476,7 @@ void play_buffer(Main_Data *md)
- buffer=wd->buffer+offset;
- while (playlength>0) {
- if (playlength<buf_size) buf_size=playlength;
--#if defined (linux) || defined (FreeBSD) || defined (sun)
-+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
- if (write(audio, buffer, buf_size)==-1) {
- close(audio);
- kill((pid_t) getppid(),SIGUSR1);
-@@ -497,7 +500,7 @@ void play_buffer(Main_Data *md)
- wd2af(wd,&af);
- af_rewind(af);
- if (af_seek(af,offset,SEEK_CUR)==AF_ERROR) {
--#if defined (linux) || defined (FreeBSD) || defined (sun)
-+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
- close(audio);
- #elif defined(sgi)
- ALcloseport(port);
-@@ -510,7 +513,7 @@ void play_buffer(Main_Data *md)
- while (playlength>0) {
- if (playlength<buf_size) buf_size=playlength;
- if ((length=af_read(af,(char*) md->mg->fbuf,buf_size))==-1) {
--#if defined (linux) || defined (FreeBSD) || defined (sun)
-+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
- close(audio);
- #elif defined(sgi)
- ALcloseport(port);
-@@ -518,7 +521,7 @@ void play_buffer(Main_Data *md)
- kill((pid_t) getppid(),SIGUSR1);
- return;
- }
--#if defined (linux) || defined (FreeBSD) || defined (sun)
-+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
- if (write(audio,(char*) md->mg->fbuf,length)==-1) {
- close(audio);
- kill((pid_t) getppid(),SIGUSR1);
-@@ -536,7 +539,7 @@ void play_buffer(Main_Data *md)
- }
- }
-
--#if defined (linux) || defined (FreeBSD) || defined (sun)
-+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
- close(audio);
- #elif defined(sgi)
- while (ALgetfilled(port)) sginap(2);
-@@ -556,7 +559,7 @@ void rec_file(byte res,byte mode,int fre
- void write_length();
- byte *data=NULL;
- int abuf_size,count;
--#if defined (linux) || defined (FreeBSD) || defined (sun)
-+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
- int audio;
-
- if ((audio=set_dsp(O_RDONLY,res,mode,freq,&abuf_size))==-1) {
-@@ -577,7 +580,7 @@ void rec_file(byte res,byte mode,int fre
-
- if ((data = (byte *) malloc(abuf_size)) == NULL) {
- fprintf(stderr,"XWave: Error while alloc mem for audio_buffer !\n");
--#if defined (linux) || defined (FreeBSD) || defined (sun)
-+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
- close(audio);
- #elif defined(sgi)
- ALcloseport(port);
-@@ -595,7 +598,7 @@ void rec_file(byte res,byte mode,int fre
-
- if (af_open(fname,&af,AF_NEW)==AF_ERROR) {
- free(data);
--#if defined (linux) || defined (FreeBSD) || defined (sun)
-+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
- close(audio);
- #elif defined(sgi)
- ALcloseport(port);
-@@ -608,7 +611,7 @@ void rec_file(byte res,byte mode,int fre
- signal(SIGUSR1,write_length);
-
- while(1) {
--#if defined (linux) || defined (FreeBSD) || defined (sun)
-+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
- if ((count=read(audio, data, abuf_size))==-1) {
- close(audio);
- af_close(af);
-@@ -632,7 +635,7 @@ void rec_file(byte res,byte mode,int fre
- return;
- }
- if ((count=af_write(af,(char*)data,count))==AF_ERROR) {
--#if defined (linux) || defined (FreeBSD) || defined (sun)
-+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
- close(audio);
- #elif defined(sgi)
- ALcloseport(port);
diff --git a/audio/xwave/patches/patch-ae b/audio/xwave/patches/patch-ae
deleted file mode 100644
index 3ad38950fce..00000000000
--- a/audio/xwave/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 1998/08/07 10:36:23 agc Exp $
-
---- orig/xwave/src/button.c Tue Nov 19 13:27:11 1996
-+++ src/button.c Sat Sep 13 04:19:49 1997
-@@ -521,7 +521,7 @@
- now_clock=clock();
- sample_time=(float)md->wd->tlength/(float)md->wd->freq;
-
--#if defined(linux) || defined (FreeBSD) || defined(sun)
-+#if defined(linux) || defined (FreeBSD) || defined(sun) || defined(__NetBSD__)
- gone_time=(float)(now_clock-start_clock)/(float)CLOCKS_PER_SEC;
- #elif defined(sgi)
- gone_time=(float)(now_clock-start_clock)/(float)750000;
diff --git a/audio/xwave/patches/patch-af b/audio/xwave/patches/patch-af
deleted file mode 100644
index 06418773f98..00000000000
--- a/audio/xwave/patches/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.2 1998/08/07 10:36:23 agc Exp $
-
---- orig/xwave/src/effects.c Tue Nov 19 15:57:27 1996
-+++ src/effects.c Sat Sep 13 04:21:24 1997
-@@ -350,7 +350,7 @@
- case 8: {
- #if defined (linux) || defined (FreeBSD)
- for (i=0;i<newlength;i++) newbuf[i]=obuf[(i<<1)+1]+128;
--#elif defined (sgi) || defined (sun)
-+#elif defined (sgi) || defined (sun) || defined(__NetBSD__)
- for (i=0;i<newlength;i++) newbuf[i]=obuf[(i<<1)]+128;
- #endif
- break;
-@@ -358,7 +358,7 @@
- case 16: {
- #if defined (linux) || defined (FreeBSD)
- for (i=0;i<wd->length;i++) newbuf[(i<<1)+1]=obuf[i]-128;
--#elif defined (sgi) || defined (sun)
-+#elif defined (sgi) || defined (sun) || defined(__NetBSD__)
- for (i=0;i<wd->length;i++) newbuf[(i<<1)]=obuf[i]-128;
- #endif
- break;
diff --git a/audio/xwave/patches/patch-ag b/audio/xwave/patches/patch-ag
deleted file mode 100644
index 2fe0dd65d37..00000000000
--- a/audio/xwave/patches/patch-ag
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2001/11/18 15:03:39 itohy Exp $
-
---- src/endian.h.orig Thu Aug 13 08:27:09 1998
-+++ src/endian.h Sun Nov 18 21:10:10 2001
-@@ -8,7 +8,9 @@
-
- #ifdef sun
-
--typedef unsigned long u_int32_t;
-+typedef int int32_t;
-+typedef unsigned int u_int32_t;
-+typedef short int16_t;
- typedef unsigned short u_int16_t;
- #if defined (_LITTLE_ENDIAN)
- #define little_endian 1
-@@ -16,7 +18,7 @@
- #define big_endian 1
- #endif
-
--#elif defined (linux) || defined (sun) || defined (FreeBSD)
-+#elif defined (linux) || defined (sun) || defined (FreeBSD) || defined(__NetBSD__)
-
- #if BYTE_ORDER==LITTLE_ENDIAN
- #define little_endian 1
diff --git a/audio/xwave/patches/patch-ah b/audio/xwave/patches/patch-ah
deleted file mode 100644
index 6ae55cd8351..00000000000
--- a/audio/xwave/patches/patch-ah
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ah,v 1.4 2001/11/18 05:37:44 itohy Exp $
-
---- src/graphics.c.orig Thu Aug 13 08:27:09 1998
-+++ src/graphics.c Sun Nov 18 13:32:53 2001
-@@ -30,7 +30,7 @@
-
- #ifdef linux
- #include <endian.h>
--#elif defined (FreeBSD)
-+#elif defined (FreeBSD) || defined(__NetBSD__)
- #include <machine/endian.h>
- #elif defined (sgi)
- #include <sys/endian.h>
-@@ -1758,6 +1758,8 @@
- md->wd->markbeg=ceil(event->x*md->mg->step);
- md->wd->marklength=ceil((firstmark-event->x)*md->mg->step);
- }
-+ if (md->wd->markbeg + md->wd->marklength > md->wd->tlength)
-+ md->wd->marklength = md->wd->tlength - md->wd->markbeg;
- md->wd->ismark=True;
- md->wd->isplay=False;
- md->cg->pos=(md->wd->markbeg+md->wd->marklength)*md->wd->bpspl;
-@@ -2064,6 +2066,9 @@
- if (XPending(dpy)) {
- XPeekEvent(dpy,&pev);
- switch (pev.type) {
-+ default:
-+ XNextEvent(dpy,&pev);
-+ break;
- case MotionNotify: {
- XMotionEvent *ev;
-
diff --git a/audio/xwave/patches/patch-ai b/audio/xwave/patches/patch-ai
deleted file mode 100644
index 041159c154c..00000000000
--- a/audio/xwave/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.3 1999/11/15 13:15:12 rh Exp $
-
---- src/record_dialog.c.orig Mon Nov 15 14:11:49 1999
-+++ src/record_dialog.c Mon Nov 15 14:11:50 1999
-@@ -524,7 +524,7 @@
- sprintf(MD->mw->messages,"%.2lf kbytes (%.2lfs)",
- (double)playsize/1024,recordtime);
- XtVaSetValues(label5,XtNlabel, MD->mw->messages, NULL);
--#if defined(linux)||defined(FreeBSD)||defined(sun)
-+#if defined(linux)||defined(FreeBSD)||defined(sun) || defined(__NetBSD__)
- usleep(80000);
- #elif defined(sgi)
- sginap(CLK_TCK/(ONE_SECOND/80000));
diff --git a/audio/xwave/patches/patch-aj b/audio/xwave/patches/patch-aj
deleted file mode 100644
index 9a80c96e0c9..00000000000
--- a/audio/xwave/patches/patch-aj
+++ /dev/null
@@ -1,90 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2001/11/18 15:03:39 itohy Exp $
-
---- src/riff.c.orig Thu Aug 13 08:27:10 1998
-+++ src/riff.c Sun Nov 18 22:19:23 2001
-@@ -33,7 +33,7 @@
-
- #ifdef linux
- #include <endian.h>
--#elif defined (FreeBSD)
-+#elif defined (FreeBSD) || defined(__NetBSD__)
- #include <machine/endian.h>
- #elif defined (sgi)
- #include <sys/endian.h>
-@@ -45,12 +45,12 @@
-
- #include "types.h"
- #include "audio_file.h"
-+#include "endian.h"
- #include "riff.h"
- #include "xwave.h"
- #include "ccitt/g711.h"
- #include "ccitt/g72x.h"
- #include "adpcm2pcm/adpcm.h"
--#include "endian.h"
-
-
- extern Main_Data *MD;
-@@ -79,9 +79,10 @@
- {
- RiffHeader rh;
- FmtHeader fh;
-- long chunk;
-+ int32_t chunk;
- int headoffs,i;
-- ulong length,slength;
-+ u_int32_t length;
-+ off_t slength;
-
- if (mode==AF_NEW) return(riff_new(af));
-
-@@ -112,7 +113,7 @@
- if ((i=read (af->fd,&chunk,sizeof(chunk)))!=sizeof(chunk))
- return(AF_ERROR);
- headoffs+=i;
-- if ((i=read (af->fd,&length,sizeof(ulong)))!=sizeof(ulong))
-+ if ((i=read (af->fd,&length,sizeof(length)))!=sizeof(length))
- return(AF_ERROR);
- headoffs+=i;
-
-@@ -172,8 +173,9 @@
- {
- RiffHeader rh;
- FmtHeader fh;
-- long chunk;
-- ulong length,count;
-+ int32_t chunk;
-+ u_int32_t length;
-+ int count;
-
- length=af->length;
-
-@@ -344,19 +346,26 @@
- {
- switch (af.comp) {
- case AF_PCM:
-+ break;
- return(lseek(af.fd,pos,mode));
- case AF_ALAW:
- case AF_MULAW:
-+ pos /= 2;
-+ break;
- return(lseek(af.fd,pos/2,mode));
- case AF_ADPCM:
-+ pos /= 4;
-+ break;
- return(lseek(af.fd,pos/4,mode));
-+ default:
-+ return(AF_ERROR);
- }
-- return(AF_ERROR);
-+ return(lseek(af.fd, mode == SEEK_SET ? pos + af.headoffs : pos, mode));
- }
-
- int riff_close(Audio_File af)
- {
-- if (riff_seek(af,0,SEEK_SET)==AF_ERROR) return(AF_ERROR);
-+ if (lseek(af.fd,0,SEEK_SET)) return(AF_ERROR);
-
- if (riff_new (&af)==AF_ERROR) return(AF_ERROR);
- return(close(af.fd));
diff --git a/audio/xwave/patches/patch-ak b/audio/xwave/patches/patch-ak
deleted file mode 100644
index 965a517de12..00000000000
--- a/audio/xwave/patches/patch-ak
+++ /dev/null
@@ -1,72 +0,0 @@
-$NetBSD: patch-ak,v 1.4 1999/12/25 23:58:59 wiz Exp $
---- FWF/FWF.rules.orig Thu Aug 13 01:27:07 1998
-+++ FWF/FWF.rules Fri Oct 22 15:13:20 1999
-@@ -23,13 +23,11 @@
- libdir/libname:: objlist @@\
- -@(if [ ! -f libdir/libname ]; then \ @@\
- $(MKDIRHIER) libdir ; \ @@\
-- echo Creating Library libdir/libname ; \ @@\
-- $(AR) libdir/libname ; \ @@\
-- RanLibrary(libdir/libname) ; \ @@\
- fi; exit 0) @@\
- @echo Adding objlist To Library libdir/libname @@\
- $(ARMERGE) libdir/libname objlist @@\
-- RanLibrary(libdir/libname)
-+ RanLibrary(libdir/libname) @@\
-+ sleep 1
- #endif /* AddToLibraryTarget */
-
- /*
-@@ -44,16 +42,6 @@
- #endif /* FileCopyWhenNeeded */
-
- /*
-- * RequireThisFileForDepend(file)
-- *
-- */
--#ifndef RequireThisFileForDepend
--#define RequireThisFileForDepend(file) @@\
--depend:: file @@\
--
--#endif /* RequireThisFileForDepend */
--
--/*
- * RequireThisFileForInit(file)
- *
- */
-@@ -146,7 +134,8 @@
- #define InstallLibraryFile(srcdir,lib,destdir) @@\
- install:: srcdir/lib @@\
- $(INSTALL) -c $(INSTLIBFLAGS) srcdir/lib destdir @@\
-- RanLibrary($(RANLIBINSTFLAGS) destdir/lib)
-+ RanLibrary($(RANLIBINSTFLAGS) destdir/lib) @@\
-+ sleep 1
- #endif /* InstallLibraryFile */
-
- /*
-@@ -244,18 +233,6 @@
- #endif /* ObjectRuleWithFlags */
-
- /*
-- * DependTargetWithFlags(flags,sources)
-- *
-- */
--#ifndef DependTargetWithFlags
--#define DependTargetWithFlags(flags,sources) @@\
--DependDependency() @@\
-- @@\
--depend:: @@\
-- $(DEPEND) -s "# DO NOT DELETE" -- flags -- sources
--#endif /* DependTargetWithFlags */
--
--/*
- * SqueakyCleanTarget()
- *
- */
-@@ -282,3 +259,6 @@
- #define SqueakyCleanSubdirs(dirs) @@\
- NamedSqueakyCleanSubdirs(squeakyclean,dirs)
- #endif
-+
-+DependSubdirs($(SUBDIRS))
-+
diff --git a/audio/xwave/patches/patch-al b/audio/xwave/patches/patch-al
deleted file mode 100644
index 41ffaed9e24..00000000000
--- a/audio/xwave/patches/patch-al
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-al,v 1.3 2002/09/25 06:37:20 jlam Exp $
-
---- config.site.BAK Sat Feb 21 19:55:25 1998
-+++ config.site Sat Feb 21 19:55:55 1998
-@@ -1,5 +1,8 @@
-
--EXTRA_INCLUDES=-I../ -I../include
-+EXTRA_INCLUDES=-I../ -I../include -I${X11BASE}/include
-
- XCOMM On sgi we need libaudio
- XCOMM OSLIBS=-laudio
-+
-+XCOMM On NetBSD we use OSS audio
-+OSLIBS=$(LIBOSSAUDIO)
diff --git a/audio/xwave/patches/patch-am b/audio/xwave/patches/patch-am
deleted file mode 100644
index d9dc4e7748d..00000000000
--- a/audio/xwave/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.2 1998/08/07 10:36:25 agc Exp $
-
---- src/Imakefile.distrib.BAK Sat Feb 21 20:59:35 1998
-+++ src/Imakefile.distrib Sat Feb 21 20:59:43 1998
-@@ -17,6 +17,8 @@
- LIBS= $(OSLIBS) $(XLIBS) $(AUDIOLIBS) -lm -lc
-
- NormalProgramTarget(xwave,$(OBJS),,$(LIBS),)
-+ComplexProgramTarget(xwave)
-+InstallAppDefaults(XWave)
-
- all:: $(PROGRAMS)
-
diff --git a/audio/xwave/patches/patch-an b/audio/xwave/patches/patch-an
deleted file mode 100644
index 9e14c48cbea..00000000000
--- a/audio/xwave/patches/patch-an
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-an,v 1.2 1998/08/07 10:36:25 agc Exp $
-
---- Imakefile.BAK Sat Feb 21 21:53:52 1998
-+++ Imakefile Sat Feb 21 21:56:04 1998
-@@ -2,13 +2,14 @@
- #define IHaveSubDirs
- #define PassCDebugFlags CDEBUGFLAGS='$(CDEBUGFLAGS)'
-
--SUBDIRS = ccitt adpcm2pcm ieee FWF src
-+SUBDIRS = ccitt adpcm2pcm ieee src
-+ALLSUBDIRS= FWF ${SUBDIRS}
-
--MakeSubdirs($(SUBDIRS))
-+MakeSubdirs($(ALLSUBDIRS))
- InstallSubdirs($(SUBDIRS))
--DependSubdirs($(SUBDIRS))
--CleanSubdirs($(SUBDIRS))
--MakefileSubdirs($(SUBDIRS))
-+DependSubdirs($(ALLSUBDIRS))
-+CleanSubdirs($(ALLSUBDIRS))
-+MakefileSubdirs($(ALLSUBDIRS))
-
- clean::
- @rm -rf lib include man
diff --git a/audio/xwave/patches/patch-ao b/audio/xwave/patches/patch-ao
deleted file mode 100644
index d02aabd7db4..00000000000
--- a/audio/xwave/patches/patch-ao
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ao,v 1.2 1998/08/07 10:36:25 agc Exp $
-
---- FWF/FWF.tmpl.orig Thu Jul 23 02:11:50 1998
-+++ FWF/FWF.tmpl Thu Jul 23 02:16:13 1998
-@@ -54,4 +54,4 @@
-
--XPM_LIBDIR =
--XPM_INCDIR =
-+XPM_LIBDIR = $(PREFIX)/lib
-+XPM_INCDIR = $(PREFIX)/include
- XPM_LIB = -lXpm
diff --git a/audio/xwave/patches/patch-ap b/audio/xwave/patches/patch-ap
deleted file mode 100644
index 15aea8dcf66..00000000000
--- a/audio/xwave/patches/patch-ap
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2001/11/18 15:03:39 itohy Exp $
-
---- src/aifc.h.orig Thu Aug 13 08:27:09 1998
-+++ src/aifc.h Sun Nov 18 21:05:29 2001
-@@ -1,5 +1,5 @@
-
--#define ID int
-+#define ID int32_t
- #define FORM 0x464F524D
- #define AIFF 0x41494646
- #define AIFC 0x41494643
-@@ -13,18 +13,18 @@
-
- typedef struct {
- ID form;
-- long length;
-+ int32_t length;
- ID type;
- } Aif_Form;
-
- typedef struct {
- ID type;
-- long length;
-+ int32_t length;
- } Aif_Chunk;
-
- typedef struct {
- short channels;
-- unsigned long s_frames;
-+ u_int32_t s_frames;
- short bps;
- double freq;
- ID comp_typ;
diff --git a/audio/xwave/patches/patch-aq b/audio/xwave/patches/patch-aq
deleted file mode 100644
index a2ab74e5c81..00000000000
--- a/audio/xwave/patches/patch-aq
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2001/11/18 15:03:39 itohy Exp $
-
---- src/riff.h.orig Thu Aug 13 08:27:10 1998
-+++ src/riff.h Sun Nov 18 21:10:34 2001
-@@ -17,20 +17,20 @@
- #define RIFF_IDVI_ADPCM 1024
-
- typedef struct {
-- long riff;
-- ulong length;
-- long wave;
-+ int32_t riff;
-+ u_int32_t length;
-+ int32_t wave;
- } RiffHeader;
-
- typedef struct {
-- long fmt;
-- ulong chunk_length;
-- short format;
-- short modus;
-- ulong freq;
-- ulong bpsec;
-- short bpspl;
-- short res;
-+ int32_t fmt;
-+ u_int32_t chunk_length;
-+ int16_t format;
-+ int16_t modus;
-+ u_int32_t freq;
-+ u_int32_t bpsec;
-+ int16_t bpspl;
-+ int16_t res;
- } FmtHeader;
-
- bool is_riff(int fd);
diff --git a/audio/xwave/patches/patch-ar b/audio/xwave/patches/patch-ar
deleted file mode 100644
index f204a61a497..00000000000
--- a/audio/xwave/patches/patch-ar
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2001/11/18 15:03:40 itohy Exp $
-
---- src/audio_file.c.orig Thu Aug 13 08:27:09 1998
-+++ src/audio_file.c Sun Nov 18 21:21:01 2001
-@@ -16,6 +16,7 @@
- #include "xwave.h"
- #include "xwave_widget.h"
- #include "audio_file.h"
-+#include "endian.h"
- #include "riff.h"
- #include "aifc.h"
- #include "au.h"
diff --git a/audio/xwave/patches/patch-as b/audio/xwave/patches/patch-as
deleted file mode 100644
index 57845942c8d..00000000000
--- a/audio/xwave/patches/patch-as
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-as,v 1.1 2005/10/03 13:30:20 joerg Exp $
-
---- src/types.h.orig 2005-07-22 18:54:48.000000000 +0000
-+++ src/types.h
-@@ -27,7 +27,7 @@
- typedef unsigned char byte;
- typedef byte bool;
-
--#ifdef FreeBSD
-+#if defined(FreeBSD) || defined(__DragonFly__)
- typedef unsigned long ulong;
- #endif
-
diff --git a/audio/xwave/patches/patch-at b/audio/xwave/patches/patch-at
deleted file mode 100644
index 42c2a513071..00000000000
--- a/audio/xwave/patches/patch-at
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-at,v 1.2 2005/10/09 15:04:14 joerg Exp $
-
---- src/misc.c.orig 2005-07-22 18:59:34.000000000 +0000
-+++ src/misc.c
-@@ -27,7 +27,7 @@
- #include <stdio.h>
- #include <dirent.h>
- #include <sys/stat.h>
--#include <sys/errno.h>
-+#include <errno.h>
- #include <X11/Intrinsic.h> /* Intrinsics Definitions */
- #include <X11/StringDefs.h> /* Standard Name-String definitions */
- #include <X11/Shell.h> /* Shell Definitions */
-@@ -294,7 +294,6 @@ char *get_wd(void)
- {
- static char *name;
- int i=MAX_NAMELENGTH;
-- extern int errno;
-
- while(True) {
- if ((name=calloc(i,1))==NULL) return(NULL);
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-28 10:08:00 +0000