Date: Fri, 2 Jun 2000 17:00:01 -0700 (PDT) From: "KATO Tsuguru" <tkato@prontomail.ne.jp> To: freebsd-ports@FreeBSD.org Subject: Re: ports/18879: New port audio/xwave Message-ID: <200006030000.RAA30332@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/18879; it has been noted by GNATS.
From: "KATO Tsuguru" <tkato@prontomail.ne.jp>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc: andrews@technologist.com, martin.kraft@fal.de
Subject: Re: ports/18879: New port audio/xwave
Date: Sat, 3 Jun 2000 08:59:37 +0900
> Any ideas?
You probably made some mistakes during unpacking archive. It can be
built with no modification on my system.
However, initial port surely has some minor problems. I tried to fix
as follows. Please review it.
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# xwave
# xwave/Makefile
# xwave/files
# xwave/files/md5
# xwave/patches
# xwave/patches/patch-aa
# xwave/patches/patch-ab
# xwave/patches/patch-ac
# xwave/patches/patch-ad
# xwave/patches/patch-ae
# xwave/patches/patch-af
# xwave/patches/patch-ag
# xwave/patches/patch-ah
# xwave/patches/patch-ai
# xwave/patches/patch-aj
# xwave/patches/patch-ak
# xwave/patches/patch-al
# xwave/patches/patch-am
# xwave/pkg
# xwave/pkg/COMMENT
# xwave/pkg/DESCR
# xwave/pkg/PLIST
#
echo c - xwave
mkdir -p xwave > /dev/null 2>&1
echo x - xwave/Makefile
sed 's/^X//' >xwave/Makefile << 'END-of-xwave/Makefile'
X# New ports collection makefile for: xwave
X# Date created: 17 May 2000
X# Whom: Martin Kraft <martin.kraft@fal.de>
X#
X# $FreeBSD$
X#
X
XPORTNAME= xwave
XPORTVERSION= 0.6
XCATEGORIES= audio
XMASTER_SITES= ${MASTER_SITE_SUNSITE}
XMASTER_SITE_SUBDIR= apps/sound/editors
X
XMAINTAINER= ports@FreeBSD.org
X
XWRKSRC= ${WRKDIR}/${PORTNAME}
XUSE_IMAKE= yes
X
X# Sorry, no man page or other types of docs yet.
X
Xdo-install:
X ${INSTALL_PROGRAM} ${WRKSRC}/src/xwave ${PREFIX}/bin
X ${INSTALL_DATA} ${WRKSRC}/src/XWave ${PREFIX}/lib/X11/app-defaults
X
X.include <bsd.port.mk>
END-of-xwave/Makefile
echo c - xwave/files
mkdir -p xwave/files > /dev/null 2>&1
echo x - xwave/files/md5
sed 's/^X//' >xwave/files/md5 << 'END-of-xwave/files/md5'
XMD5 (xwave-0.6.tar.gz) = c0b062bfc444dc437aedeaa699a381e7
END-of-xwave/files/md5
echo c - xwave/patches
mkdir -p xwave/patches > /dev/null 2>&1
echo x - xwave/patches/patch-aa
sed 's/^X//' >xwave/patches/patch-aa << 'END-of-xwave/patches/patch-aa'
X--- src/Imakefile.orig Wed Nov 20 03:51:58 1996
X+++ src/Imakefile Sat Jun 3 00:00:00 2000
X@@ -21,6 +21,6 @@
X all:: $(PROGRAMS)
X
X depend::
X- $(DEPEND) $(EXTRA_INCLUDES) $(SRCS) >>Makefile
X+ $(DEPEND) $(EXTRA_INCLUDES) -I$(INCROOT) $(SRCS) >>Makefile
X
X
END-of-xwave/patches/patch-aa
echo x - xwave/patches/patch-ab
sed 's/^X//' >xwave/patches/patch-ab << 'END-of-xwave/patches/patch-ab'
X--- src/aifc.c.orig Mon Nov 9 08:22:55 1998
X+++ src/aifc.c Sat Jun 3 00:00:00 2000
X@@ -9,7 +9,7 @@
X
X #ifdef linux
X #include <endian.h>
X-#elif defined (FreeBSD)
X+#elif defined (__FreeBSD__)
X #include <machine/endian.h>
X #elif defined (sgi)
X #include <sys/endian.h>
END-of-xwave/patches/patch-ab
echo x - xwave/patches/patch-ac
sed 's/^X//' >xwave/patches/patch-ac << 'END-of-xwave/patches/patch-ac'
X--- src/au.c.orig Mon Nov 9 08:22:55 1998
X+++ src/au.c Sat Jun 3 00:00:00 2000
X@@ -32,7 +32,7 @@
X
X #ifdef linux
X #include <endian.h>
X-#elif defined (FreeBSD)
X+#elif defined (__FreeBSD__)
X #include <machine/endian.h>
X #elif defined (sgi)
X #include <sys/endian.h>
END-of-xwave/patches/patch-ac
echo x - xwave/patches/patch-ad
sed 's/^X//' >xwave/patches/patch-ad << 'END-of-xwave/patches/patch-ad'
X--- src/audio.c.orig Tue Nov 26 19:13:44 1996
X+++ src/audio.c Sat Jun 3 00:00:00 2000
X@@ -37,7 +37,7 @@
X #ifdef linux
X #include <linux/soundcard.h>
X
X-#elif defined(FreeBSD)
X+#elif defined(__FreeBSD__)
X #include <machine/soundcard.h>
X
X #elif defined(sgi)
X@@ -55,7 +55,7 @@
X #include "sample_settings.h"
X #include "audio.h"
X
X-#if defined(linux) || defined (FreeBSD) || defined(sun)
X+#if defined(linux) || defined (__FreeBSD__) || defined(sun)
X static int set_dsp(int o_mode,int res,int channels,int freq,int *buf_size);
X #endif
X
X@@ -67,7 +67,7 @@
X static Audio_File af;
X static int stop_record;
X
X-#if defined (linux) || defined (FreeBSD)
X+#if defined (linux) || defined (__FreeBSD__)
X int set_dsp(int o_mode,int res, int channels, int freq, int *buf_size)
X {
X int check;
X@@ -370,7 +370,7 @@
X
X void play_file(char *fname,Main_Bool *mb)
X {
X-#if defined (linux) || defined (FreeBSD) || defined (sun)
X+#if defined (linux) || defined (__FreeBSD__) || defined (sun)
X int audio;
X #elif defined(sgi)
X ALport port;
X@@ -384,7 +384,7 @@
X return;
X }
X
X-#if defined (linux) || defined (FreeBSD) || defined (sun)
X+#if defined (linux) || defined (__FreeBSD__) || defined (sun)
X if ((audio=set_dsp(O_WRONLY,af.bps,af.channels,af.freq,&buf_size))==-1) {
X fprintf(stderr,"XWave: Error ! Cannot set dsp !\n");
X close(af.fd);
X@@ -404,7 +404,7 @@
X if ((buffer=malloc(buf_size))==NULL) {
X fprintf(stderr,"XWave: Error ! Cannot alloc mem !\n");
X close(af.fd);
X-#if defined (linux) || defined (FreeBSD) || defined (sun)
X+#if defined (linux) || defined (__FreeBSD__) || defined (sun)
X close(audio);
X #elif defined(sgi)
X ALcloseport(port);
X@@ -413,7 +413,7 @@
X return;
X }
X
X-#if defined (linux) || defined (FreeBSD) || defined (sun)
X+#if defined (linux) || defined (__FreeBSD__) || defined (sun)
X while ((length=af_read(af,buffer,buf_size))>0) {
X if (write(audio, buffer, length)==-1) break;
X }
X@@ -440,7 +440,7 @@
X int offset=0,playlength,length;
X #ifdef sgi
X ALport port;
X-#elif defined(linux) || defined (FreeBSD) || defined (sun)
X+#elif defined(linux) || defined (__FreeBSD__) || defined (sun)
X int audio;
X
X if ((audio=set_dsp(O_WRONLY,wd->res,wd->channels,wd->freq,&buf_size))==-1) {
X@@ -473,7 +473,7 @@
X buffer=wd->buffer+offset;
X while (playlength>0) {
X if (playlength<buf_size) buf_size=playlength;
X-#if defined (linux) || defined (FreeBSD) || defined (sun)
X+#if defined (linux) || defined (__FreeBSD__) || defined (sun)
X if (write(audio, buffer, buf_size)==-1) {
X close(audio);
X kill((pid_t) getppid(),SIGUSR1);
X@@ -497,7 +497,7 @@
X wd2af(wd,&af);
X af_rewind(af);
X if (af_seek(af,offset,SEEK_CUR)==AF_ERROR) {
X-#if defined (linux) || defined (FreeBSD) || defined (sun)
X+#if defined (linux) || defined (__FreeBSD__) || defined (sun)
X close(audio);
X #elif defined(sgi)
X ALcloseport(port);
X@@ -510,7 +510,7 @@
X while (playlength>0) {
X if (playlength<buf_size) buf_size=playlength;
X if ((length=af_read(af,(char*) md->mg->fbuf,buf_size))==-1) {
X-#if defined (linux) || defined (FreeBSD) || defined (sun)
X+#if defined (linux) || defined (__FreeBSD__) || defined (sun)
X close(audio);
X #elif defined(sgi)
X ALcloseport(port);
X@@ -518,7 +518,7 @@
X kill((pid_t) getppid(),SIGUSR1);
X return;
X }
X-#if defined (linux) || defined (FreeBSD) || defined (sun)
X+#if defined (linux) || defined (__FreeBSD__) || defined (sun)
X if (write(audio,(char*) md->mg->fbuf,length)==-1) {
X close(audio);
X kill((pid_t) getppid(),SIGUSR1);
X@@ -536,7 +536,7 @@
X }
X }
X
X-#if defined (linux) || defined (FreeBSD) || defined (sun)
X+#if defined (linux) || defined (__FreeBSD__) || defined (sun)
X close(audio);
X #elif defined(sgi)
X while (ALgetfilled(port)) sginap(2);
X@@ -556,7 +556,7 @@
X void write_length();
X byte *data=NULL;
X int abuf_size,count;
X-#if defined (linux) || defined (FreeBSD) || defined (sun)
X+#if defined (linux) || defined (__FreeBSD__) || defined (sun)
X int audio;
X
X if ((audio=set_dsp(O_RDONLY,res,mode,freq,&abuf_size))==-1) {
X@@ -577,7 +577,7 @@
X
X if ((data = (byte *) malloc(abuf_size)) == NULL) {
X fprintf(stderr,"XWave: Error while alloc mem for audio_buffer !\n");
X-#if defined (linux) || defined (FreeBSD) || defined (sun)
X+#if defined (linux) || defined (__FreeBSD__) || defined (sun)
X close(audio);
X #elif defined(sgi)
X ALcloseport(port);
X@@ -595,7 +595,7 @@
X
X if (af_open(fname,&af,AF_NEW)==AF_ERROR) {
X free(data);
X-#if defined (linux) || defined (FreeBSD) || defined (sun)
X+#if defined (linux) || defined (__FreeBSD__) || defined (sun)
X close(audio);
X #elif defined(sgi)
X ALcloseport(port);
X@@ -608,7 +608,7 @@
X signal(SIGUSR1,write_length);
X
X while(1) {
X-#if defined (linux) || defined (FreeBSD) || defined (sun)
X+#if defined (linux) || defined (__FreeBSD__) || defined (sun)
X if ((count=read(audio, data, abuf_size))==-1) {
X close(audio);
X af_close(af);
X@@ -632,7 +632,7 @@
X return;
X }
X if ((count=af_write(af,(char*)data,count))==AF_ERROR) {
X-#if defined (linux) || defined (FreeBSD) || defined (sun)
X+#if defined (linux) || defined (__FreeBSD__) || defined (sun)
X close(audio);
X #elif defined(sgi)
X ALcloseport(port);
END-of-xwave/patches/patch-ad
echo x - xwave/patches/patch-ae
sed 's/^X//' >xwave/patches/patch-ae << 'END-of-xwave/patches/patch-ae'
X--- src/button.c.orig Tue Nov 19 21:27:11 1996
X+++ src/button.c Sat Jun 3 00:00:00 2000
X@@ -521,7 +521,7 @@
X now_clock=clock();
X sample_time=(float)md->wd->tlength/(float)md->wd->freq;
X
X-#if defined(linux) || defined (FreeBSD) || defined(sun)
X+#if defined(linux) || defined (__FreeBSD__) || defined(sun)
X gone_time=(float)(now_clock-start_clock)/(float)CLOCKS_PER_SEC;
X #elif defined(sgi)
X gone_time=(float)(now_clock-start_clock)/(float)750000;
END-of-xwave/patches/patch-ae
echo x - xwave/patches/patch-af
sed 's/^X//' >xwave/patches/patch-af << 'END-of-xwave/patches/patch-af'
X--- src/effects.c.orig Mon Nov 9 08:22:55 1998
X+++ src/effects.c Sat Jun 3 00:00:00 2000
X@@ -348,7 +348,7 @@
X
X switch (sr->res) {
X case 8: {
X-#if defined (linux) || defined (FreeBSD)
X+#if defined (linux) || defined (__FreeBSD__)
X for (i=0;i<newlength;i++) newbuf[i]=obuf[(i<<1)+1]+128;
X #elif defined (sgi) || defined (sun)
X for (i=0;i<newlength;i++) newbuf[i]=obuf[(i<<1)]+128;
X@@ -356,7 +356,7 @@
X break;
X }
X case 16: {
X-#if defined (linux) || defined (FreeBSD)
X+#if defined (linux) || defined (__FreeBSD__)
X for (i=0;i<wd->length;i++) newbuf[(i<<1)+1]=obuf[i]-128;
X #elif defined (sgi) || defined (sun)
X for (i=0;i<wd->length;i++) newbuf[(i<<1)]=obuf[i]-128;
END-of-xwave/patches/patch-af
echo x - xwave/patches/patch-ag
sed 's/^X//' >xwave/patches/patch-ag << 'END-of-xwave/patches/patch-ag'
X--- src/endian.h.orig Mon Nov 9 08:22:55 1998
X+++ src/endian.h Sat Jun 3 00:00:00 2000
X@@ -16,7 +16,7 @@
X #define big_endian 1
X #endif
X
X-#elif defined (linux) || defined (sun) || defined (FreeBSD)
X+#elif defined (linux) || defined (sun) || defined (__FreeBSD__)
X
X #if BYTE_ORDER==LITTLE_ENDIAN
X #define little_endian 1
END-of-xwave/patches/patch-ag
echo x - xwave/patches/patch-ah
sed 's/^X//' >xwave/patches/patch-ah << 'END-of-xwave/patches/patch-ah'
X--- src/graphics.c.orig Mon Nov 25 21:33:43 1996
X+++ src/graphics.c Sat Jun 3 00:00:00 2000
X@@ -30,7 +30,7 @@
X
X #ifdef linux
X #include <endian.h>
X-#elif defined (FreeBSD)
X+#elif defined (__FreeBSD__)
X #include <machine/endian.h>
X #elif defined (sgi)
X #include <sys/endian.h>
X@@ -1442,7 +1442,7 @@
X if (md->mb->exposing) return;
X */
X
X-#if defined (linux) || defined (FreeBSD)
X+#if defined (linux) || defined (__FreeBSD__)
X if (resizing) {
X resizing=FALSE;
X return;
X@@ -1498,7 +1498,7 @@
X
X void expose_canvas (Widget w, Main_Data *md, XExposeEvent *event, Boolean *flg)
X {
X-#if defined (linux) || defined (FreeBSD)
X+#if defined (linux) || defined (__FreeBSD__)
X if (resizing) {
X if (!event->count) resizing=FALSE;
X return;
END-of-xwave/patches/patch-ah
echo x - xwave/patches/patch-ai
sed 's/^X//' >xwave/patches/patch-ai << 'END-of-xwave/patches/patch-ai'
X--- src/record_dialog.c.orig Tue Nov 19 23:24:36 1996
X+++ src/record_dialog.c Sat Jun 3 00:00:00 2000
X@@ -498,7 +498,7 @@
X sprintf(MD->mw->messages,"%.2f kbytes (%.2fs)",
X (float)playsize/1024,recordtime);
X XtVaSetValues(label5,XtNlabel, MD->mw->messages, NULL);
X-#if defined(linux)||defined(FreeBSD)||defined(sun)
X+#if defined(linux)||defined(__FreeBSD__)||defined(sun)
X usleep(80000);
X #elif defined(sgi)
X sginap(CLK_TCK/(ONE_SECOND/80000));
END-of-xwave/patches/patch-ai
echo x - xwave/patches/patch-aj
sed 's/^X//' >xwave/patches/patch-aj << 'END-of-xwave/patches/patch-aj'
X--- src/riff.c.orig Mon Nov 9 08:22:55 1998
X+++ src/riff.c Sat Jun 3 00:00:00 2000
X@@ -33,7 +33,7 @@
X
X #ifdef linux
X #include <endian.h>
X-#elif defined (FreeBSD)
X+#elif defined (__FreeBSD__)
X #include <machine/endian.h>
X #elif defined (sgi)
X #include <sys/endian.h>
END-of-xwave/patches/patch-aj
echo x - xwave/patches/patch-ak
sed 's/^X//' >xwave/patches/patch-ak << 'END-of-xwave/patches/patch-ak'
X--- src/types.h.orig Mon Nov 9 08:22:55 1998
X+++ src/types.h Sat Jun 3 00:00:00 2000
X@@ -27,7 +27,7 @@
X typedef unsigned char byte;
X typedef byte bool;
X
X-#ifdef FreeBSD
X+#ifdef __FreeBSD__
X typedef unsigned long ulong;
X #endif
X
END-of-xwave/patches/patch-ak
echo x - xwave/patches/patch-al
sed 's/^X//' >xwave/patches/patch-al << 'END-of-xwave/patches/patch-al'
X--- FWF/Imakefile.orig Thu Feb 15 23:43:46 1996
X+++ FWF/Imakefile Sat Jun 3 00:00:00 2000
X@@ -9,6 +9,7 @@
X MakeDirectories(all,$(ALLDIRS))
X
X InitSubdirs($(SUBDIRS))
X+DependSubdirs($(SUBDIRS))
X MakeObjectsSubdirs($(SUBDIRS))
X MakeExecsSubdirs($(SUBDIRS))
X GatherDescriptionSubdirs($(SUBDIRS))
END-of-xwave/patches/patch-al
echo x - xwave/patches/patch-am
sed 's/^X//' >xwave/patches/patch-am << 'END-of-xwave/patches/patch-am'
X--- FWF/src/Imakefile.orig Thu Feb 15 23:38:37 1996
X+++ FWF/src/Imakefile Sat Jun 3 00:00:00 2000
X@@ -34,6 +34,7 @@
X
X
X InitSubdirs($(SUBDIRS))
X+DependSubdirs($(SUBDIRS))
X MakeObjectsSubdirs($(SUBDIRS))
X MakeExecsSubdirs($(SUBDIRS))
X GatherDescriptionSubdirs($(SUBDIRS))
END-of-xwave/patches/patch-am
echo c - xwave/pkg
mkdir -p xwave/pkg > /dev/null 2>&1
echo x - xwave/pkg/COMMENT
sed 's/^X//' >xwave/pkg/COMMENT << 'END-of-xwave/pkg/COMMENT'
XAn audio player, recorder, editor for the XWindow System
END-of-xwave/pkg/COMMENT
echo x - xwave/pkg/DESCR
sed 's/^X//' >xwave/pkg/DESCR << 'END-of-xwave/pkg/DESCR'
XXwave is an audio editor, player, recorder for XWindow System,
X - supports editing of large files (on hdd),
X - cut,copy,paste,merge,
X - some effects (echo,reverse,swap channels,resample,volume),
X - supports RIFF,AIFF,AIFC,AU
X - Linux,SGI,SUN,FreeBSD
X
XThe user interface of xwave is based on the Athena Widget
XSet and some Widgets from FWF.
X
Xxwave was written and is maintained by
XKai Kollmorgen <kkollmor@informatik.uni-rostock.de>.
X
X- Martin Kraft
Xmartin.kraft@fal.de
END-of-xwave/pkg/DESCR
echo x - xwave/pkg/PLIST
sed 's/^X//' >xwave/pkg/PLIST << 'END-of-xwave/pkg/PLIST'
Xbin/xwave
Xlib/X11/app-defaults/XWave
END-of-xwave/pkg/PLIST
exit
--
KATO Tsuguru / tkato@prontomail.ne.jp
Sent by Japanese ProntoMail
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200006030000.RAA30332>