kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change the vat port to use USE_AUTOCONF .

Browse source 
Hand-edit patches/patch-ah to remove the RCS $Header$ from the patch, so
 that CVS doesn't munge it.
 BE EXTREMELY CAREFUL WHEN REGENERATING patches/patch-ah!
This commit is contained in:
Bill Fenner 1998-06-26 19:05:35 +00:00
parent 0b7a232ad3
commit bde94a1057
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=11547
6 changed files with 26 additions and 2954 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
audio/vat/Makefile
View file

@ -3,7 +3,7 @@
# Date created: 2 November 1996
# Whom: fenner
#
# $Id: Makefile,v 1.3 1997/04/20 13:19:26 wosch Exp $
# $Id: Makefile,v 1.4 1997/09/11 03:54:43 fenner Exp $
#
DISTNAME= vat-4.0b2
@ -24,7 +24,7 @@ LIB_DEPENDS= tk80:${PORTSDIR}/x11/tk80 \
gsm:${GSM_DIR}
USE_X11= yes
GNU_CONFIGURE= yes
USE_AUTOCONF= yes
CONFIGURE_ARGS= --with-gsm=${GSM_WORK}
INSTALL_TARGET= install install-man
MAN1= vat.1

1458
audio/vat/files/patch-aa
View file

File diff suppressed because it is too large Load diff

28
audio/vat/files/patch-ah
View file

@ -1,6 +1,5 @@
diff -ubwr old/audio-voxware.cc audio-voxware.cc
--- old/audio-voxware.cc Fri Apr 26 12:22:37 1996
+++ audio-voxware.cc Mon Apr 13 15:45:39 1998
--- audio-voxware.cc.dist Fri Apr 26 05:22:37 1996
+++ audio-voxware.cc Fri Jun 26 11:44:52 1998
@@ -1,4 +1,6 @@
/*
+ * Modifications (C) 1997-1998 by Luigi Rizzo and others.
@ -8,12 +7,7 @@ diff -ubwr old/audio-voxware.cc audio-voxware.cc
* Copyright (c) 1991-1993 Regents of the University of California.
* All rights reserved.
*
@@ -30,34 +32,40 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-static const char rcsid[] =
- "@(#) $Header: audio-voxware.cc,v 1.10 96/04/26 05:22:05 van Exp $ (LBL)";
@@ -35,29 +37,37 @@
-#include <string.h>
-#include <sys/fcntl.h>
@ -67,7 +61,7 @@ diff -ubwr old/audio-voxware.cc audio-voxware.cc
virtual int FrameReady();
virtual u_char* Read();
virtual void Write(u_char *);
@@ -66,163 +74,400 @@
@@ -66,163 +76,400 @@
virtual void OutputPort(int);
virtual void InputPort(int);
virtual void Obtain();
@ -168,10 +162,6 @@ diff -ubwr old/audio-voxware.cc audio-voxware.cc
if (fd >= 0) {
- int on = 1;
- ioctl(fd, FIONBIO, &on);
-
- int frag = (NFRAG << 16) | ABUFLOG2;
- ioctl(fd, SNDCTL_DSP_SETFRAGMENT, &frag);
-#ifdef fullduplex
+ int i = -1 ;
+ u_long fmt = 0 ;
+ int rate = 8000 ;
@ -229,7 +219,10 @@ diff -ubwr old/audio-voxware.cc audio-voxware.cc
+ fd = -1;
+ return;
+ }
+
- int frag = (NFRAG << 16) | ABUFLOG2;
- ioctl(fd, SNDCTL_DSP_SETFRAGMENT, &frag);
-#ifdef fullduplex
+ pa.play_format = play_fmt ;
+ pa.rec_format = rec_fmt ;
+ pa.play_rate = pa.rec_rate = rate ;
@ -309,7 +302,8 @@ diff -ubwr old/audio-voxware.cc audio-voxware.cc
}
-int VoxWareAudio::FrameReady()
-{
+void VoxWare::Release()
{
- if ((rmute & 1) == 0) {
- register u_char* cp = ubufptr;
- register u_char* cpend = ubufend;
@ -328,8 +322,6 @@ diff -ubwr old/audio-voxware.cc audio-voxware.cc
- Obtain();
- }
- return (0);
+void VoxWare::Release()
+{
+ if (HaveAudio()) {
+ Audio::Release();
}

4
mbone/vat/Makefile
View file

@ -3,7 +3,7 @@
# Date created: 2 November 1996
# Whom: fenner
#
# $Id: Makefile,v 1.3 1997/04/20 13:19:26 wosch Exp $
# $Id: Makefile,v 1.4 1997/09/11 03:54:43 fenner Exp $
#
DISTNAME= vat-4.0b2
@ -24,7 +24,7 @@ LIB_DEPENDS= tk80:${PORTSDIR}/x11/tk80 \
gsm:${GSM_DIR}
USE_X11= yes
GNU_CONFIGURE= yes
USE_AUTOCONF= yes
CONFIGURE_ARGS= --with-gsm=${GSM_WORK}
INSTALL_TARGET= install install-man
MAN1= vat.1

1458
mbone/vat/files/patch-aa
View file

File diff suppressed because it is too large Load diff

28
mbone/vat/files/patch-ah
View file

@ -1,6 +1,5 @@
diff -ubwr old/audio-voxware.cc audio-voxware.cc
--- old/audio-voxware.cc Fri Apr 26 12:22:37 1996
+++ audio-voxware.cc Mon Apr 13 15:45:39 1998
--- audio-voxware.cc.dist Fri Apr 26 05:22:37 1996
+++ audio-voxware.cc Fri Jun 26 11:44:52 1998
@@ -1,4 +1,6 @@
/*
+ * Modifications (C) 1997-1998 by Luigi Rizzo and others.
@ -8,12 +7,7 @@ diff -ubwr old/audio-voxware.cc audio-voxware.cc
* Copyright (c) 1991-1993 Regents of the University of California.
* All rights reserved.
*
@@ -30,34 +32,40 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-static const char rcsid[] =
- "@(#) $Header: audio-voxware.cc,v 1.10 96/04/26 05:22:05 van Exp $ (LBL)";
@@ -35,29 +37,37 @@
-#include <string.h>
-#include <sys/fcntl.h>
@ -67,7 +61,7 @@ diff -ubwr old/audio-voxware.cc audio-voxware.cc
virtual int FrameReady();
virtual u_char* Read();
virtual void Write(u_char *);
@@ -66,163 +74,400 @@
@@ -66,163 +76,400 @@
virtual void OutputPort(int);
virtual void InputPort(int);
virtual void Obtain();
@ -168,10 +162,6 @@ diff -ubwr old/audio-voxware.cc audio-voxware.cc
if (fd >= 0) {
- int on = 1;
- ioctl(fd, FIONBIO, &on);
-
- int frag = (NFRAG << 16) | ABUFLOG2;
- ioctl(fd, SNDCTL_DSP_SETFRAGMENT, &frag);
-#ifdef fullduplex
+ int i = -1 ;
+ u_long fmt = 0 ;
+ int rate = 8000 ;
@ -229,7 +219,10 @@ diff -ubwr old/audio-voxware.cc audio-voxware.cc
+ fd = -1;
+ return;
+ }
+
- int frag = (NFRAG << 16) | ABUFLOG2;
- ioctl(fd, SNDCTL_DSP_SETFRAGMENT, &frag);
-#ifdef fullduplex
+ pa.play_format = play_fmt ;
+ pa.rec_format = rec_fmt ;
+ pa.play_rate = pa.rec_rate = rate ;
@ -309,7 +302,8 @@ diff -ubwr old/audio-voxware.cc audio-voxware.cc
}
-int VoxWareAudio::FrameReady()
-{
+void VoxWare::Release()
{
- if ((rmute & 1) == 0) {
- register u_char* cp = ubufptr;
- register u_char* cpend = ubufend;
@ -328,8 +322,6 @@ diff -ubwr old/audio-voxware.cc audio-voxware.cc
- Obtain();
- }
- return (0);
+void VoxWare::Release()
+{
+ if (HaveAudio()) {
+ Audio::Release();
}