- Update to version 2v2

PR:		19759
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>
This commit is contained in:
Maxim Sobolev 2000-07-13 13:32:27 +00:00
parent 0f2cc20578
commit 47aaab6ded
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=30577
19 changed files with 286 additions and 109 deletions

View file

@ -1,35 +1,34 @@
# New ports collection makefile for: xwave
# Date created: 11 June 2000
# Whom: Trevor Johnson <trevor@jpj.net>
# based on the NetBSD port
#
# $NetBSD: Makefile,v 1.8 2000/04/24 14:52:33 hubertf Exp $
# $FreeBSD$
#
PORTNAME= xwave
PORTVERSION= 2
PORTVERSION= 2.2
CATEGORIES= audio
MASTER_SITES= ftp://ftp.vex.net/pub/software/
DISTNAME= xwave2
MASTER_SITES= http://www.funet.fi/~kouhia/waves/
DISTNAME= ${PORTNAME}${PORTVERSION:S/./v/}
MAINTAINER= martin.kraft@fal.de
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
WRKSRC= ${WRKDIR}/${PORTNAME}2-981109
USE_IMAKE= yes
DOC_FILES= README README-XWAVE2 README.v06 COPYING INSTALL
DOC_FILES= README README-XWAVE2 README.v06 INSTALL
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/xwave ${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/src/XWave ${PREFIX}/lib/X11/app-defaults/
${INSTALL_DATA} ${WRKSRC}/src/XWave ${PREFIX}/lib/X11/app-defaults
.if !defined(NOPORTDOCS)
${MKDIR} ${PREFIX}/share/doc/xwave2
@${MKDIR} ${PREFIX}/share/doc/xwave
.for i in ${DOC_FILES}
${INSTALL_MAN} ${WRKSRC}/${i} ${PREFIX}/share/doc/xwave2
${INSTALL_MAN} ${WRKSRC}/${i} ${PREFIX}/share/doc/xwave
.endfor
.endif
@${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>

View file

@ -1,3 +1 @@
$NetBSD: md5,v 1.3 1999/02/08 21:27:11 hubertf Exp $
MD5 (xwave2.tar.gz) = fddc9ac33e3c7ec5272212abe8c8e606
MD5 (xwave2v2.tar.gz) = b472c76e6ee67a734aacc22c499e8633

View file

@ -0,0 +1,11 @@
--- src/Imakefile.orig Mon Nov 9 08:22:55 1998
+++ src/Imakefile Fri Jun 30 20:10:38 2000
@@ -14,7 +14,7 @@
AUDIOLIBS=-L../ccitt -lccitt -L../adpcm2pcm -ladpcm -L../ieee -lieee
XLIBS= -L../lib -lfwf -lXaw -lXpm -lXmu -lXt -lX11
-LIBS= $(OSLIBS) $(XLIBS) $(AUDIOLIBS) -lm -lc
+LIBS= $(OSLIBS) $(XLIBS) $(AUDIOLIBS) -lm
NormalProgramTarget(xwave,$(OBJS),,$(LIBS),)

View file

@ -0,0 +1,11 @@
--- src/aifc.c.orig Mon Nov 9 08:22:55 1998
+++ src/aifc.c Fri Jun 30 19:49:15 2000
@@ -9,7 +9,7 @@
#ifdef linux
#include <endian.h>
-#elif defined (FreeBSD)
+#elif defined (__FreeBSD__)
#include <machine/endian.h>
#elif defined (sgi)
#include <sys/endian.h>

View file

@ -0,0 +1,11 @@
--- src/au.c.orig Mon Nov 9 08:22:55 1998
+++ src/au.c Fri Jun 30 19:49:15 2000
@@ -32,7 +32,7 @@
#ifdef linux
#include <endian.h>
-#elif defined (FreeBSD)
+#elif defined (__FreeBSD__)
#include <machine/endian.h>
#elif defined (sgi)
#include <sys/endian.h>

View file

@ -1,7 +1,5 @@
$NetBSD: patch-ad,v 1.2 1998/08/07 10:36:23 agc Exp $
--- xwave/src/audio.c.orig Wed Aug 12 23:27:09 1998
+++ src/audio.c Sun Jun 11 13:35:54 2000
--- src/audio.c.orig Mon Nov 9 08:22:55 1998
+++ src/audio.c Fri Jun 30 19:49:15 2000
@@ -37,7 +37,7 @@
#ifdef linux
#include <linux/soundcard.h>
@ -29,25 +27,7 @@ $NetBSD: patch-ad,v 1.2 1998/08/07 10:36:23 agc Exp $
int set_dsp(int o_mode,int res, int channels, int freq, int *buf_size)
{
int check;
@@ -274,7 +274,7 @@
}
#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 +307,7 @@
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 +370,7 @@
@@ -369,7 +369,7 @@
void play_file(char *fname,Main_Bool *mb)
{
@ -56,7 +36,7 @@ $NetBSD: patch-ad,v 1.2 1998/08/07 10:36:23 agc Exp $
int audio;
#elif defined(sgi)
ALport port;
@@ -384,7 +384,7 @@
@@ -383,7 +383,7 @@
return;
}
@ -65,7 +45,7 @@ $NetBSD: patch-ad,v 1.2 1998/08/07 10:36:23 agc Exp $
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 +404,7 @@
@@ -403,7 +403,7 @@
if ((buffer=malloc(buf_size))==NULL) {
fprintf(stderr,"XWave: Error ! Cannot alloc mem !\n");
close(af.fd);
@ -74,7 +54,7 @@ $NetBSD: patch-ad,v 1.2 1998/08/07 10:36:23 agc Exp $
close(audio);
#elif defined(sgi)
ALcloseport(port);
@@ -413,7 +413,7 @@
@@ -412,7 +412,7 @@
return;
}
@ -83,7 +63,7 @@ $NetBSD: patch-ad,v 1.2 1998/08/07 10:36:23 agc Exp $
while ((length=af_read(af,buffer,buf_size))>0) {
if (write(audio, buffer, length)==-1) break;
}
@@ -440,7 +440,7 @@
@@ -439,7 +439,7 @@
int offset=0,playlength,length;
#ifdef sgi
ALport port;
@ -92,7 +72,7 @@ $NetBSD: patch-ad,v 1.2 1998/08/07 10:36:23 agc Exp $
int audio;
if ((audio=set_dsp(O_WRONLY,wd->res,wd->channels,wd->freq,&buf_size))==-1) {
@@ -473,7 +473,7 @@
@@ -472,7 +472,7 @@
buffer=wd->buffer+offset;
while (playlength>0) {
if (playlength<buf_size) buf_size=playlength;
@ -128,7 +108,7 @@ $NetBSD: patch-ad,v 1.2 1998/08/07 10:36:23 agc Exp $
if (write(audio,(char*) md->mg->fbuf,length)==-1) {
close(audio);
kill((pid_t) getppid(),SIGUSR1);
@@ -536,7 +536,7 @@
@@ -537,7 +537,7 @@
}
}
@ -137,7 +117,61 @@ $NetBSD: patch-ad,v 1.2 1998/08/07 10:36:23 agc Exp $
close(audio);
#elif defined(sgi)
while (ALgetfilled(port)) sginap(2);
@@ -556,7 +556,7 @@
@@ -558,7 +558,7 @@
int offset=0,playlength,length;
#ifdef sgi
ALport port;
-#elif defined(linux) || defined (FreeBSD) || defined (sun)
+#elif defined(linux) || defined (__FreeBSD__) || defined (sun)
int audio;
if ((audio=set_dsp(O_WRONLY,wd->res,wd->channels,wd->freq,&buf_size))==-1) {
@@ -593,7 +593,7 @@
((int *)shared_playpos)[0] = wd->playbeg*wd->bpspl;
while (playlength>0) {
if (playlength<buf_size) buf_size=playlength;
-#if defined (linux) || defined (FreeBSD) || defined (sun)
+#if defined (linux) || defined (__FreeBSD__) || defined (sun)
if (write(audio, buffer, buf_size)==-1) {
((int *)shared_playpos)[0] = -1;
close(audio);
@@ -621,7 +621,7 @@
af_rewind(af);
if (af_seek(af,offset,SEEK_CUR)==AF_ERROR) {
((int *)shared_playpos)[0] = -1;
-#if defined (linux) || defined (FreeBSD) || defined (sun)
+#if defined (linux) || defined (__FreeBSD__) || defined (sun)
close(audio);
#elif defined(sgi)
ALcloseport(port);
@@ -636,7 +636,7 @@
if (playlength<buf_size) buf_size=playlength;
if ((length=af_read(af,(char*) md->mg->fbuf,buf_size))==-1) {
((int *)shared_playpos)[0] = -1;
-#if defined (linux) || defined (FreeBSD) || defined (sun)
+#if defined (linux) || defined (__FreeBSD__) || defined (sun)
close(audio);
#elif defined(sgi)
ALcloseport(port);
@@ -644,7 +644,7 @@
kill((pid_t) getppid(),SIGUSR1);
return;
}
-#if defined (linux) || defined (FreeBSD) || defined (sun)
+#if defined (linux) || defined (__FreeBSD__) || defined (sun)
if (write(audio,(char*) md->mg->fbuf,length)==-1) {
((int *)shared_playpos)[0] = -1;
close(audio);
@@ -666,7 +666,7 @@
}
((int *)shared_playpos)[0] = -1;
-#if defined (linux) || defined (FreeBSD) || defined (sun)
+#if defined (linux) || defined (__FreeBSD__) || defined (sun)
close(audio);
#elif defined(sgi)
while (ALgetfilled(port)) sginap(2);
@@ -686,7 +686,7 @@
void write_length();
byte *data=NULL;
int abuf_size,count;
@ -146,7 +180,7 @@ $NetBSD: patch-ad,v 1.2 1998/08/07 10:36:23 agc Exp $
int audio;
if ((audio=set_dsp(O_RDONLY,res,mode,freq,&abuf_size))==-1) {
@@ -577,7 +577,7 @@
@@ -707,7 +707,7 @@
if ((data = (byte *) malloc(abuf_size)) == NULL) {
fprintf(stderr,"XWave: Error while alloc mem for audio_buffer !\n");
@ -155,7 +189,7 @@ $NetBSD: patch-ad,v 1.2 1998/08/07 10:36:23 agc Exp $
close(audio);
#elif defined(sgi)
ALcloseport(port);
@@ -595,7 +595,7 @@
@@ -725,7 +725,7 @@
if (af_open(fname,&af,AF_NEW)==AF_ERROR) {
free(data);
@ -164,7 +198,7 @@ $NetBSD: patch-ad,v 1.2 1998/08/07 10:36:23 agc Exp $
close(audio);
#elif defined(sgi)
ALcloseport(port);
@@ -608,7 +608,7 @@
@@ -738,7 +738,7 @@
signal(SIGUSR1,write_length);
while(1) {
@ -173,7 +207,7 @@ $NetBSD: patch-ad,v 1.2 1998/08/07 10:36:23 agc Exp $
if ((count=read(audio, data, abuf_size))==-1) {
close(audio);
af_close(af);
@@ -632,7 +632,7 @@
@@ -762,7 +762,7 @@
return;
}
if ((count=af_write(af,(char*)data,count))==AF_ERROR) {

View file

@ -0,0 +1,11 @@
--- src/button.c.orig Mon Nov 9 08:22:55 1998
+++ src/button.c Fri Jun 30 19:49:16 2000
@@ -679,7 +679,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)
gone_time=(float)(now_clock-start_clock)/(float)CLOCKS_PER_SEC;
#elif defined(sgi)
gone_time=(float)(now_clock-start_clock)/(float)750000;

View file

@ -0,0 +1,20 @@
--- src/effects.c.orig Mon Nov 9 08:22:55 1998
+++ src/effects.c Fri Jun 30 19:49:16 2000
@@ -348,7 +348,7 @@
switch (sr->res) {
case 8: {
-#if defined (linux) || defined (FreeBSD)
+#if defined (linux) || defined (__FreeBSD__)
for (i=0;i<newlength;i++) newbuf[i]=obuf[(i<<1)+1]+128;
#elif defined (sgi) || defined (sun)
for (i=0;i<newlength;i++) newbuf[i]=obuf[(i<<1)]+128;
@@ -356,7 +356,7 @@
break;
}
case 16: {
-#if defined (linux) || defined (FreeBSD)
+#if defined (linux) || defined (__FreeBSD__)
for (i=0;i<wd->length;i++) newbuf[(i<<1)+1]=obuf[i]-128;
#elif defined (sgi) || defined (sun)
for (i=0;i<wd->length;i++) newbuf[(i<<1)]=obuf[i]-128;

View file

@ -0,0 +1,11 @@
--- src/endian.h.orig Mon Nov 9 08:22:55 1998
+++ src/endian.h Fri Jun 30 19:49:16 2000
@@ -16,7 +16,7 @@
#define big_endian 1
#endif
-#elif defined (linux) || defined (sun) || defined (FreeBSD)
+#elif defined (linux) || defined (sun) || defined (__FreeBSD__)
#if BYTE_ORDER==LITTLE_ENDIAN
#define little_endian 1

View file

@ -0,0 +1,29 @@
--- src/graphics.c.orig Mon Nov 9 08:22:55 1998
+++ src/graphics.c Fri Jun 30 19:49:18 2000
@@ -30,7 +30,7 @@
#ifdef linux
#include <endian.h>
-#elif defined (FreeBSD)
+#elif defined (__FreeBSD__)
#include <machine/endian.h>
#elif defined (sgi)
#include <sys/endian.h>
@@ -1476,7 +1476,7 @@
if (md->mb->exposing) return;
*/
-#if defined (linux) || defined (FreeBSD)
+#if defined (linux) || defined (__FreeBSD__)
if (resizing) {
resizing=FALSE;
return;
@@ -1532,7 +1532,7 @@
void expose_canvas (Widget w, Main_Data *md, XExposeEvent *event, Boolean *flg)
{
-#if defined (linux) || defined (FreeBSD)
+#if defined (linux) || defined (__FreeBSD__)
if (resizing) {
if (!event->count) resizing=FALSE;
return;

View file

@ -0,0 +1,11 @@
--- src/record_dialog.c.orig Mon Nov 9 08:22:55 1998
+++ src/record_dialog.c Fri Jun 30 19:49:18 2000
@@ -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)
usleep(80000);
#elif defined(sgi)
sginap(CLK_TCK/(ONE_SECOND/80000));

View file

@ -0,0 +1,11 @@
--- src/riff.c.orig Mon Nov 9 08:22:55 1998
+++ src/riff.c Fri Jun 30 19:49:19 2000
@@ -33,7 +33,7 @@
#ifdef linux
#include <endian.h>
-#elif defined (FreeBSD)
+#elif defined (__FreeBSD__)
#include <machine/endian.h>
#elif defined (sgi)
#include <sys/endian.h>

View file

@ -1,11 +1,9 @@
$NetBSD: patch-al,v 1.2 1998/08/07 10:36:24 agc Exp $
--- config.site.BAK Sat Feb 21 19:55:25 1998
+++ config.site Sat Feb 21 19:55:55 1998
--- config.site.orig Mon Nov 9 08:22:55 1998
+++ config.site Fri Jun 30 19:52:45 2000
@@ -1,5 +1,5 @@
-EXTRA_INCLUDES=-I../ -I../include
+EXTRA_INCLUDES=-I../ -I../include -I${X11BASE}/include
+EXTRA_INCLUDES=-I$(TOP) -I$(TOP)/include -I$(INCROOT)
XCOMM On sgi we need libaudio
XCOMM OSLIBS=-laudio

View file

@ -1,26 +1,10 @@
--- src/record_dialog.c.orig Wed Aug 12 23:27:10 1998
+++ src/record_dialog.c Sun Jun 11 13:36:13 2000
@@ -33,8 +33,6 @@
#include <sys/wait.h>
#include <signal.h>
--- FWF/Imakefile.orig Mon Nov 9 08:22:54 1998
+++ FWF/Imakefile Fri Jun 30 19:53:17 2000
@@ -9,6 +9,7 @@
MakeDirectories(all,$(ALLDIRS))
-
-
#include <X11/Intrinsic.h> /* Intrinsics Definitions */
#include <X11/StringDefs.h> /* Standard Name-String definitions */
#include <X11/Shell.h> /* Shell Definitions */
@@ -52,12 +50,13 @@
#include "button.h"
#include "xwave_widget.h"
#include "sample_settings.h"
-#include "audio.h"
+//#include "audio.h"
#include "audio_file.h"
#include "filebrowse.h"
#include "graphics.h"
#include "fileop.h"
#include "record_dialog.h"
+#include "audio.h"
extern Main_Data *MD;
extern AppResources app_resources;
InitSubdirs($(SUBDIRS))
+DependSubdirs($(SUBDIRS))
MakeObjectsSubdirs($(SUBDIRS))
MakeExecsSubdirs($(SUBDIRS))
GatherDescriptionSubdirs($(SUBDIRS))

View file

@ -1,5 +1,5 @@
--- src/types.h.orig Wed Aug 12 23:27:10 1998
+++ src/types.h Sun Jun 11 13:17:49 2000
--- src/types.h.orig Mon Nov 9 08:22:55 1998
+++ src/types.h Fri Jun 30 19:49:19 2000
@@ -27,7 +27,7 @@
typedef unsigned char byte;
typedef byte bool;

View file

@ -0,0 +1,11 @@
--- src/XWave.orig Mon Nov 9 08:22:55 1998
+++ src/XWave Fri Jun 30 20:08:56 2000
@@ -1,7 +1,7 @@
! My self defined Resources
XWave*wdir: /usr/share/data/sounds/prosonus
-XWave*tdir: /mnt/d/tmp
+XWave*tdir: /tmp
XWave*device: /dev/dsp
XWave*maxmem: 1000
XWave*doubleplay: False

View file

@ -0,0 +1,19 @@
--- src/edit.c.orig Mon Nov 9 08:22:55 1998
+++ src/edit.c Fri Jun 30 20:48:28 2000
@@ -54,6 +54,7 @@
extern bool button_2;
/* these conversion routines are also in graphics.c */
+/* Commented out. M. Kraft 2000-06-28
int mg_sel_leftsample(float step,int x)
{
return(ceil(step*x-0.5));
@@ -73,7 +74,7 @@
{
return((int)(((float)x+0.5)/step));
}
-
+*/
void begin_up(Widget w, XtPointer client_data, XtPointer call_data)
{

View file

@ -0,0 +1,10 @@
--- FWF/src/Imakefile.orig Mon Nov 9 08:22:54 1998
+++ FWF/src/Imakefile Fri Jun 30 19:53:43 2000
@@ -34,6 +34,7 @@
InitSubdirs($(SUBDIRS))
+DependSubdirs($(SUBDIRS))
MakeObjectsSubdirs($(SUBDIRS))
MakeExecsSubdirs($(SUBDIRS))
GatherDescriptionSubdirs($(SUBDIRS))

View file

@ -1,9 +1,7 @@
@comment $NetBSD: PLIST,v 1.2 1999/02/08 21:27:12 hubertf 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
share/doc/xwave/README
share/doc/xwave/README-XWAVE2
share/doc/xwave/README.v06
share/doc/xwave/INSTALL
@dirrm share/doc/xwave