Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 11 Jun 2000 12:13:32 -0400 (EDT)
From:      Trevor Johnson <trevor@jpj.net>
To:        FreeBSD-gnats-submit@FreeBSD.ORG
Subject:   ports/19200: new port:  audio/xwave
Message-ID:  <Pine.BSI.4.21.0006111208040.15618-100000@blues.jpj.net>

next in thread | raw e-mail | index | archive | help

>Number:         19200
>Category:       ports
>Synopsis:       new port:  audio/xwave
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 11 09:20:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     Trevor Johnson
>Release:        4.0-STABLE i386
>Organization:
myself
>Environment:

4.0-STABLE FreeBSD 4.0-STABLE #0: Fri May 26 19:12:56 BST 2000
root@ws99.invalid:/usr/src/sys/compile/FREEBASE40f i386

>Description:

audio player/recorder/editor for the X Window System

>How-To-Repeat:
N/A
>Fix:

# 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/files
#	xwave/files/md5
#	xwave/patches
#	xwave/patches/patch-al
#	xwave/patches/patch-ad
#	xwave/patches/patch-ak
#	xwave/patches/patch-am
#	xwave/patches/patch-ao
#	xwave/patches/patch-ap
#	xwave/patches/patch-aq
#	xwave/patches/patch-an
#	xwave/pkg
#	xwave/pkg/COMMENT
#	xwave/pkg/DESCR
#	xwave/pkg/PLIST
#	xwave/pkg/MESSAGE
#	xwave/Makefile
#
echo c - xwave
mkdir -p xwave > /dev/null 2>&1
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'
X$NetBSD: md5,v 1.3 1999/02/08 21:27:11 hubertf Exp $
X
XMD5 (xwave2.tar.gz) = fddc9ac33e3c7ec5272212abe8c8e606
END-of-xwave/files/md5
echo c - xwave/patches
mkdir -p xwave/patches > /dev/null 2>&1
echo x - xwave/patches/patch-al
sed 's/^X//' >xwave/patches/patch-al << 'END-of-xwave/patches/patch-al'
X$NetBSD: patch-al,v 1.2 1998/08/07 10:36:24 agc Exp $
X
X--- config.site.BAK	Sat Feb 21 19:55:25 1998
X+++ config.site	Sat Feb 21 19:55:55 1998
X@@ -1,5 +1,5 @@
X 
X-EXTRA_INCLUDES=-I../ -I../include
X+EXTRA_INCLUDES=-I../ -I../include -I${X11BASE}/include
X 
X XCOMM On sgi we need libaudio
X XCOMM OSLIBS=-laudio
END-of-xwave/patches/patch-al
echo x - xwave/patches/patch-ad
sed 's/^X//' >xwave/patches/patch-ad << 'END-of-xwave/patches/patch-ad'
X$NetBSD: patch-ad,v 1.2 1998/08/07 10:36:23 agc Exp $
X
X--- xwave/src/audio.c.orig	Wed Aug 12 23:27:09 1998
X+++ src/audio.c	Sun Jun 11 13:35:54 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@@ -274,7 +274,7 @@
X }
X #endif
X 
X-#ifdef sun
X+#if defined(sun)
X void check_audio(Main_Bool *mb)
X /* test if there is a play device, and how fast we can play */
X {
X@@ -307,7 +307,7 @@
X 	 case AUDIO_ENCODING_LINEAR:
X 	    printf("ULAW\n");break;
X 	 default:
X-	    printf("unknown encoding\n");
X+	    printf("unknown encoding: %d\n",au_info.play.encoding);
X 	}
X 	close(audio);
X     } else  {
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-ak
sed 's/^X//' >xwave/patches/patch-ak << 'END-of-xwave/patches/patch-ak'
X$NetBSD: patch-ak,v 1.4 1999/12/25 23:58:59 wiz Exp $
X--- FWF/FWF.rules.orig	Thu Aug 13 01:27:07 1998
X+++ FWF/FWF.rules	Fri Oct 22 15:13:20 1999
X@@ -23,13 +23,11 @@
X libdir/libname:: objlist						@@\
X 	-@(if [ ! -f libdir/libname ]; then \				@@\
X 		$(MKDIRHIER) libdir ; \					@@\
X-		echo Creating Library libdir/libname ; \		@@\
X-		$(AR) libdir/libname ; \				@@\
X-		RanLibrary(libdir/libname) ; \				@@\
X 	fi; exit 0)							@@\
X 	@echo Adding objlist To Library libdir/libname			@@\
X 	$(ARMERGE) libdir/libname objlist				@@\
X-	RanLibrary(libdir/libname)
X+	RanLibrary(libdir/libname)					@@\
X+	sleep 1
X #endif /* AddToLibraryTarget */
X 
X /*
X@@ -44,16 +42,6 @@
X #endif /* FileCopyWhenNeeded */
X 
X /*
X- * RequireThisFileForDepend(file)
X- *
X- */
X-#ifndef RequireThisFileForDepend
X-#define RequireThisFileForDepend(file)					@@\
X-depend:: file								@@\
X-
X-#endif /* RequireThisFileForDepend */
X-
X-/*
X  * RequireThisFileForInit(file)
X  *
X  */
X@@ -146,7 +134,8 @@
X #define InstallLibraryFile(srcdir,lib,destdir)				@@\
X install:: srcdir/lib							@@\
X 	$(INSTALL) -c $(INSTLIBFLAGS) srcdir/lib destdir		@@\
X-	RanLibrary($(RANLIBINSTFLAGS) destdir/lib)
X+	RanLibrary($(RANLIBINSTFLAGS) destdir/lib)			@@\
X+	sleep 1
X #endif /* InstallLibraryFile */
X 
X /*
X@@ -244,18 +233,6 @@
X #endif /* ObjectRuleWithFlags */
X 
X /*
X- * DependTargetWithFlags(flags,sources)
X- *
X- */
X-#ifndef DependTargetWithFlags
X-#define	DependTargetWithFlags(flags,sources)				@@\
X-DependDependency()							@@\
X-									@@\
X-depend::								@@\
X-	$(DEPEND) -s "# DO NOT DELETE" -- flags -- sources
X-#endif /* DependTargetWithFlags */
X-
X-/*
X  * SqueakyCleanTarget()
X  *
X  */
X@@ -282,3 +259,6 @@
X #define SqueakyCleanSubdirs(dirs)					@@\
X NamedSqueakyCleanSubdirs(squeakyclean,dirs)
X #endif
X+
X+DependSubdirs($(SUBDIRS))
X+
END-of-xwave/patches/patch-ak
echo x - xwave/patches/patch-am
sed 's/^X//' >xwave/patches/patch-am << 'END-of-xwave/patches/patch-am'
X$NetBSD: patch-am,v 1.2 1998/08/07 10:36:25 agc Exp $
X
X--- src/Imakefile.distrib.BAK	Sat Feb 21 20:59:35 1998
X+++ src/Imakefile.distrib	Sat Feb 21 20:59:43 1998
X@@ -17,6 +17,8 @@
X LIBS=  $(OSLIBS) $(XLIBS) $(AUDIOLIBS) -lm -lc 
X 
X NormalProgramTarget(xwave,$(OBJS),,$(LIBS),)
X+ComplexProgramTarget(xwave)
X+InstallAppDefaults(XWave)
X 
X all:: $(PROGRAMS)
X 
END-of-xwave/patches/patch-am
echo x - xwave/patches/patch-ao
sed 's/^X//' >xwave/patches/patch-ao << 'END-of-xwave/patches/patch-ao'
X$NetBSD: patch-ao,v 1.2 1998/08/07 10:36:25 agc Exp $
X
X--- FWF/FWF.tmpl.orig   Thu Jul 23 02:11:50 1998
X+++ FWF/FWF.tmpl        Thu Jul 23 02:16:13 1998
X@@ -54,4 +54,4 @@
X 
X-XPM_LIBDIR = 
X-XPM_INCDIR = 
X+XPM_LIBDIR = $(PREFIX)/lib
X+XPM_INCDIR = $(PREFIX)/include
X XPM_LIB = -lXpm
END-of-xwave/patches/patch-ao
echo x - xwave/patches/patch-ap
sed 's/^X//' >xwave/patches/patch-ap << 'END-of-xwave/patches/patch-ap'
X--- src/record_dialog.c.orig	Wed Aug 12 23:27:10 1998
X+++ src/record_dialog.c	Sun Jun 11 13:36:13 2000
X@@ -33,8 +33,6 @@
X #include <sys/wait.h>
X #include <signal.h>
X 
X-
X-
X #include <X11/Intrinsic.h>	/* Intrinsics Definitions */
X #include <X11/StringDefs.h>	/* Standard Name-String definitions */
X #include <X11/Shell.h>     	/* Shell Definitions */
X@@ -52,12 +50,13 @@
X #include "button.h"
X #include "xwave_widget.h"
X #include "sample_settings.h"
X-#include "audio.h"
X+//#include "audio.h"
X #include "audio_file.h"
X #include "filebrowse.h"
X #include "graphics.h"
X #include "fileop.h"
X #include "record_dialog.h"
X+#include "audio.h"
X 
X extern Main_Data *MD;
X extern AppResources app_resources;
END-of-xwave/patches/patch-ap
echo x - xwave/patches/patch-aq
sed 's/^X//' >xwave/patches/patch-aq << 'END-of-xwave/patches/patch-aq'
X--- src/types.h.orig	Wed Aug 12 23:27:10 1998
X+++ src/types.h	Sun Jun 11 13:17:49 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-aq
echo x - xwave/patches/patch-an
sed 's/^X//' >xwave/patches/patch-an << 'END-of-xwave/patches/patch-an'
X$NetBSD: patch-an,v 1.2 1998/08/07 10:36:25 agc Exp $
X
X--- Imakefile.BAK	Sat Feb 21 21:53:52 1998
X+++ Imakefile	Sat Feb 21 21:56:04 1998
X@@ -2,13 +2,14 @@
X #define IHaveSubDirs
X #define PassCDebugFlags CDEBUGFLAGS='$(CDEBUGFLAGS)'
X 
X-SUBDIRS = ccitt adpcm2pcm ieee FWF  src
X+SUBDIRS = ccitt adpcm2pcm ieee src
X+ALLSUBDIRS=	FWF ${SUBDIRS}
X 
X-MakeSubdirs($(SUBDIRS))
X+MakeSubdirs($(ALLSUBDIRS))
X InstallSubdirs($(SUBDIRS))
X-DependSubdirs($(SUBDIRS))
X-CleanSubdirs($(SUBDIRS))
X-MakefileSubdirs($(SUBDIRS))
X+DependSubdirs($(ALLSUBDIRS))
X+CleanSubdirs($(ALLSUBDIRS))
X+MakefileSubdirs($(ALLSUBDIRS))
X 
X clean::
X 	@rm -rf lib include man
END-of-xwave/patches/patch-an
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'
XAudio player/recorder/editor for the X Window System
END-of-xwave/pkg/COMMENT
echo x - xwave/pkg/DESCR
sed 's/^X//' >xwave/pkg/DESCR << 'END-of-xwave/pkg/DESCR'
Xnote from the original author:
X 
XThe user interface of xwave is based on Athena and FWF widgets.
XThe application defaults are optimized for Xaw3d, so if you don't
Xuse Xaw3d you may want to modify the resources.
X
XFeatures:
X	- multiple files
X	- overview window 
X	- zoom window
X	- mark, cut, copy, paste, merge
X	- echo, reverse, swap, resample, volume (absolute, dynamic
X	  compressor)
X	- stop recording on demand
X	- raw, wav, au, aiff, aifc (PCM, ALAW, ULAW, and some ADPCM
X	  implementations)
X	- files of any length
X
XTrevor Johnson
Xtrevor@jpj.net
END-of-xwave/pkg/DESCR
echo x - xwave/pkg/PLIST
sed 's/^X//' >xwave/pkg/PLIST << 'END-of-xwave/pkg/PLIST'
X@comment $NetBSD: PLIST,v 1.2 1999/02/08 21:27:12 hubertf Exp $
Xbin/xwave
Xlib/X11/app-defaults/XWave
Xshare/doc/xwave2/README
Xshare/doc/xwave2/README-XWAVE2
Xshare/doc/xwave2/README.v06
Xshare/doc/xwave2/COPYING
Xshare/doc/xwave2/INSTALL
X@dirrm share/doc/xwave2
END-of-xwave/pkg/PLIST
echo x - xwave/pkg/MESSAGE
sed 's/^X//' >xwave/pkg/MESSAGE << 'END-of-xwave/pkg/MESSAGE'
XIf you run out of space for the temporary files, set the X ressource
XXWave*tdir (either in /usr/X11R6/lib/X11/app-defaults/XWave or your
X~/.Xdefaults) to a suitable directory.
END-of-xwave/pkg/MESSAGE
echo x - xwave/Makefile
sed 's/^X//' >xwave/Makefile << 'END-of-xwave/Makefile'
X# New ports collection makefile for:	xwave
X# Date created:				2000-06-11
X# Whom:					Trevor Johnson <trevor@jpj.net>
X# based on the NetBSD port
X#
X# $NetBSD: Makefile,v 1.8 2000/04/24 14:52:33 hubertf Exp $
X# $FreeBSD$
X#
X
XPORTNAME=		xwave
XPORTVERSION=		2
XCATEGORIES=		audio
XMASTER_SITES=		ftp://ftp.vex.net/pub/software/
XDISTNAME=		xwave2
X
XMAINTAINER=		trevor@jpj.net
X
XLIB_DEPENDS=		Xpm.4:${PORTSDIR}/graphics/xpm
X
XUSE_IMAKE=		yes
X
XDOC_FILES=	README README-XWAVE2 README.v06 COPYING INSTALL
X
Xdo-install:
X	${INSTALL_PROGRAM} ${WRKSRC}/src/xwave ${PREFIX}/bin
X	${INSTALL_DATA} ${WRKSRC}/src/XWave ${PREFIX}/lib/X11/app-defaults/
X
X.if !defined(NOPORTDOCS)
X	${MKDIR} ${PREFIX}/share/doc/xwave2
X.for i in ${DOC_FILES}
X	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/xwave2
X.endfor
X.endif
X
X.include <bsd.port.mk>
END-of-xwave/Makefile
exit



>Release-Note:
>Audit-Trail:
>Unformatted:


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?Pine.BSI.4.21.0006111208040.15618-100000>