sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-02 03:16:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Upgrade to 1.12.0.

Browse source 
pwlib has been split out into its own port.
This commit is contained in:
Roger Hardiman 2003-08-28 06:56:10 +00:00
parent afbbd896cb
commit 38e9c2e97d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=87834
28 changed files with 276 additions and 1028 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
net/opal/Makefile
View file

@ -6,17 +6,15 @@
#
PORTNAME= openh323
PORTVERSION= 1.11.2
PORTREVISION= 1
PORTVERSION= 1.12.0
CATEGORIES= net
MASTER_SITES= http://www.openh323.org/bin/ \
http://www.de.openh323.org/bin/ \
http://www.gnomemeeting.org/downloads/0.96.1/sources/
DISTFILES= openh323_1.11.2.tar.gz \
pwlib_1.4.7.tar.gz
http://www.gnomemeeting.org/downloads/0.98.0/sources/
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= roger@freebsd.org
COMMENT= A H323 Video Conferencing library, used with OhPhone
COMMENT= A H323 Video Conferencing library
LIB_DEPENDS= expat.4:${PORTSDIR}/textproc/expat2
@ -37,8 +35,13 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_BISON= yes
USE_GMAKE= yes
USE_AUTOCONF= yes
WANT_AUTOCONF_VER= 253
GNU_CONFIGURE= yes
CONFIGURE_ENV= PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \
OPENH323DIR=${WRKDIR}/openh323
ALL_TARGET= optnoshared
MAKE_ENV= PWLIBDIR=${WRKDIR}/pwlib \
MAKE_ENV= PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \
OPENH323DIR=${WRKDIR}/openh323
THE_MACHTYPE= ${ARCH:S/i386/x86/}
MAKE_ARGS= OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX}

3
net/opal/distinfo
View file

@ -1,2 +1 @@
MD5 (openh323_1.11.2.tar.gz) = 89ab27a6a8f4a73ffd9e19751bc78786
MD5 (pwlib_1.4.7.tar.gz) = 24f2b7f2e983f48141d9657931f16fc4
MD5 (openh323_1.12.0.tar.gz) = f7932f0a17d6afafc7332036a4b5d392

31
net/opal/files/patch-configurein Normal file
View file

@ -0,0 +1,31 @@
*** configure.in.orig Thu May 22 13:25:00 2003
--- configure.in Sat Aug 23 07:52:44 2003
*************** fi
*** 73,85 ****
dnl ########################################################################
dnl get pwlib directory
! if test "${PWLIBDIR:-unset}" == "unset" ; then
PWLIBDIR=`ptlib-config --prefix`
fi
! if test "x$PWLIBDIR" == "x/usr" -o "x$PWLIBDIR" == "x/usr/"; then
PWLIBDIR="/usr/share/pwlib/"
fi
! if test "xPWLIBDIR" == "x/usr/local" -o "x$PWLIBDIR" == "x/usr/"; then
PWLIBDIR="/usr/local/share/pwlib/"
fi
echo "PWLib prefix set to.... $PWLIBDIR"
--- 73,85 ----
dnl ########################################################################
dnl get pwlib directory
! if test "${PWLIBDIR:-unset}" = "unset" ; then
PWLIBDIR=`ptlib-config --prefix`
fi
! if test "x$PWLIBDIR" = "x/usr" -o "x$PWLIBDIR" = "x/usr/"; then
PWLIBDIR="/usr/share/pwlib/"
fi
! if test "xPWLIBDIR" = "x/usr/local" -o "x$PWLIBDIR" = "x/usr/"; then
PWLIBDIR="/usr/local/share/pwlib/"
fi
echo "PWLib prefix set to.... $PWLIBDIR"

35
net/opal/files/patch-openh323u
View file

@ -1,35 +0,0 @@
*** openh323u.mak.orig Tue Nov 26 10:24:54 2002
--- openh323u.mak Tue Jan 28 13:51:51 2003
*************** LIBDIRS += $(OPENH323DIR)
*** 137,147 ****
OH323_SRCDIR = $(OPENH323DIR)/src
- ifdef PREFIX
- OH323_INCDIR = $(PREFIX)/include/openh323
- else
OH323_INCDIR = $(OPENH323DIR)/include
- endif
OH323_LIBDIR = $(OPENH323DIR)/lib
--- 137,143 ----
*************** endif
*** 192,197 ****
--- 188,203 ----
ifneq (,$(wildcard /usr/local/include/sys/telephony.h))
HAS_IXJ = 1
STDCCFLAGS += -DHAS_IXJ -I/usr/local/include
+ endif
+
+ ifneq (,$(wildcard /usr/local/include/sys/telephony.h))
+ HAS_IXJ = 1
+ STDCCFLAGS += -DHAS_IXJ -I/usr/local/include
+ endif
+
+ ifneq (,$(wildcard $(OPENH323DIR)/include/sys/telephony.h))
+ HAS_IXJ = 1
+ STDCCFLAGS += -DHAS_IXJ
endif
ifneq (,$(wildcard $(SYSINCDIR)/linux/soundcard.h))

27
net/opal/files/patch-openh323uin Normal file
View file

@ -0,0 +1,27 @@
*** openh323u.mak.in.orig Sat Aug 23 08:09:48 2003
--- openh323u.mak.in Sat Aug 23 08:10:34 2003
*************** LIBDIRS += $(OPENH323DIR)
*** 142,152 ****
OH323_SRCDIR = $(OPENH323DIR)/src
! ifdef PREFIX
! OH323_INCDIR = $(PREFIX)/include/openh323
! else
OH323_INCDIR = $(OPENH323DIR)/include
! endif
OH323_LIBDIR = $(OPENH323DIR)/lib
--- 142,152 ----
OH323_SRCDIR = $(OPENH323DIR)/src
! #ifdef PREFIX
! #OH323_INCDIR = $(PREFIX)/include/openh323
! #else
OH323_INCDIR = $(OPENH323DIR)/include
! #endif
OH323_LIBDIR = $(OPENH323DIR)/lib

154
net/opal/files/patch-oss
View file

@ -1,154 +0,0 @@
*** ../pwlib/src/ptlib/unix/oss.cxx.orig Thu Dec 12 09:03:56 2002
--- ../pwlib/src/ptlib/unix/oss.cxx Sun Feb 2 19:22:40 2003
***************
*** 27,32 ****
--- 27,45 ----
* Contributor(s): Loopback feature: Philip Edelbrock <phil@netroedge.com>.
*
* $Log: oss.cxx,v $
+ * Revision 1.58 2003/02/02 18:54:22 rogerh
+ * FreeBSD changes for support of dspN.M (eg dsp0.0) sound card entries.
+ * Problem reported by Lars Eggert <larse@isi.edu>
+ *
+ * Revision 1.57 2003/01/06 19:25:07 rogerh
+ * Add NetBSD video support.
+ * Add correct includes for OSS ioctls (note the proper way to do this now
+ * is via pwlib commands)
+ * From Andreas Wrede, taken in part from NetBSD's package system
+ *
+ * Revision 1.56 2003/01/06 19:10:22 rogerh
+ * NetBSD uses /dev/audio and not /dev/dsp
+ *
* Revision 1.55 2002/12/12 09:03:56 rogerh
* On two FreeBSD machines, Read() calls from the sound card were not blocking
* correctly and returned with less bytes than asked for. This made OpenH323
***************
*** 223,229 ****
#ifdef P_LINUX
#include <sys/soundcard.h>
- #include <sys/time.h>
#endif
#ifdef P_FREEBSD
--- 236,241 ----
*************** PSoundChannel::~PSoundChannel()
*** 456,468 ****
}
static BOOL IsNumericString(PString numbers) {
! // return true if 'numbers' contains only digits 0 to 9
for (PINDEX p = 0; p < numbers.GetLength(); p++) {
! if (!isdigit(numbers[p])) {
! return FALSE;
}
}
! return TRUE;
}
static void CollectSoundDevices(PDirectory devdir, POrdinalToString & dsp, POrdinalToString & mixer, BOOL collect_with_names)
--- 468,485 ----
}
static BOOL IsNumericString(PString numbers) {
! // return true if 'numbers' contains only digits (0 to 9)
! // or if it contains digits followed by a '.'
!
! BOOL isNumber = FALSE;
for (PINDEX p = 0; p < numbers.GetLength(); p++) {
! if (isdigit(numbers[p])) {
! isNumber = TRUE;
! } else {
! return isNumber;
}
}
! return isNumber;
}
static void CollectSoundDevices(PDirectory devdir, POrdinalToString & dsp, POrdinalToString & mixer, BOOL collect_with_names)
*************** static void CollectSoundDevices(PDirecto
*** 499,520 ****
// On Linux devfs systems, the major numbers can change dynamically.
// On FreeBSD and other OSs, the major numbes are different to Linux.
// So collect devices by looking for dsp(N) and mixer(N).
! // Notes. FreeBSD supports audio stream mixing. For /dev/dsp0
! // there are also entries for /dev/dsp0.0 dsp0.1 dsp0.2 and dsp0.3
! // We will ignore these N.M devices.
// Look for dsp
if (filename == "dsp") {
dsp.SetAt(0, devname);
}
! // Look for dspN. Insert at position cardnum + 1
if ((filename.GetLength() > 3) && (filename.Left(3) == "dsp")) {
PString numbers = filename.Mid(3); // get everything after 'dsp'
if (IsNumericString(numbers)) {
PINDEX cardnum = numbers.AsInteger();
dsp.SetAt(cardnum+1, devname);
}
}
// Look for mixer
if (filename == "mixer") {
mixer.SetAt(0, devname);
--- 516,562 ----
// On Linux devfs systems, the major numbers can change dynamically.
// On FreeBSD and other OSs, the major numbes are different to Linux.
// So collect devices by looking for dsp(N) and mixer(N).
! // (or /dev/audio(N) and mixer(N) on NetBSD
! // Notes. FreeBSD supports audio stream mixing. A single sound card
! // may have multiple /dev entries in the form /dev/dspN.M
! // eg /dev/dsp0.0 /dev/dsp0.1 /dev/dsp0.2 and /dev/dsp0.3
! // When adding these to the 'dsp' string array, only the first one
! // found is used.
+ #ifndef P_NETBSD
// Look for dsp
if (filename == "dsp") {
dsp.SetAt(0, devname);
}
!
! // Look for dspN entries. Insert at position N + 1
! // and look for dspN.M entries. Insert at position N + 1 (ignoring M)
!
if ((filename.GetLength() > 3) && (filename.Left(3) == "dsp")) {
+
PString numbers = filename.Mid(3); // get everything after 'dsp'
if (IsNumericString(numbers)) {
+ PINDEX cardnum = numbers.AsInteger(); //dspN.M is truncated to dspN.
+ // If we have not yet inserted something for this cardnum, insert it
+ if (dsp.GetAt(cardnum+1) == NULL) {
+ dsp.SetAt(cardnum+1, devname);
+ }
+ }
+ }
+ #else
+ // Look for audio on NetBSD
+ if (filename == "audio") {
+ dsp.SetAt(0, devname);
+ }
+ // Look for audioN. Insert at position cardnum + 1
+ if ((filename.GetLength() > 5) && (filename.Left(5) == "audio")) {
+ PString numbers = filename.Mid(5); // get everything after 'audio'
+ if (IsNumericString(numbers)) {
PINDEX cardnum = numbers.AsInteger();
dsp.SetAt(cardnum+1, devname);
}
}
+ #endif
// Look for mixer
if (filename == "mixer") {
mixer.SetAt(0, devname);
*************** PString PSoundChannel::GetDefaultDevice(
*** 604,611 ****
--- 646,656 ----
{
// Normally /dev/dsp points to the default sound device. If this is not
// present, probe /dev for sound devices and return the first detected device.
+
if (PFile::Exists("/dev/dsp")) {
return "/dev/dsp";
+ } else if (PFile::Exists("/dev/audio")) { // the NetBSD default name
+ return "/dev/audio";
} else {
// return the first dsp device detected
PStringArray devicenames;

59
net/opal/files/patch-unix
View file

@ -1,59 +0,0 @@
*** ../pwlib/make/unix.mak.orig Fri Nov 22 10:59:27 2002
--- ../pwlib/make/unix.mak Tue Jan 28 13:51:15 2003
*************** ifeq ($(OSTYPE),FreeBSD)
*** 770,780 ****
P_PTHREADS := 1
! ifeq ($(MACHTYPE),x86)
! ifdef CPUTYPE
! STDCCFLAGS += -mcpu=$(CPUTYPE)
! endif
! endif
ifndef OSRELEASE
OSRELEASE := $(shell sysctl -n kern.osreldate)
--- 770,780 ----
P_PTHREADS := 1
! #ifeq ($(MACHTYPE),x86)
! #ifdef CPUTYPE
! #STDCCFLAGS += -mcpu=$(CPUTYPE)
! #endif
! #endif
ifndef OSRELEASE
OSRELEASE := $(shell sysctl -n kern.osreldate)
*************** SHELL := /bin/sh
*** 1335,1345 ****
# Directories
- ifdef PREFIX
- UNIX_INC_DIR = $(PREFIX)/include/ptlib/unix
- else
UNIX_INC_DIR = $(PWLIBDIR)/include/ptlib/unix
- endif
ifndef UNIX_SRC_DIR
UNIX_SRC_DIR = $(PWLIBDIR)/src/ptlib/unix
--- 1335,1341 ----
*************** LDFLAGS += $(DEBLDFLAGS)
*** 1375,1381 ****
else
! OPTCCFLAGS += -O3 -DNDEBUG
#OPTCCFLAGS += -DP_USE_INLINES=1
#OPTCCFLAGS += -fconserve-space
ifneq ($(OSTYPE),Carbon)
--- 1371,1378 ----
else
! #OPTCCFLAGS += -O3 -DNDEBUG
! OPTCCFLAGS += -DNDEBUG
#OPTCCFLAGS += -DP_USE_INLINES=1
#OPTCCFLAGS += -fconserve-space
ifneq ($(OSTYPE),Carbon)

17
net/opal3/Makefile
View file

@ -6,17 +6,15 @@
#
PORTNAME= openh323
PORTVERSION= 1.11.2
PORTREVISION= 1
PORTVERSION= 1.12.0
CATEGORIES= net
MASTER_SITES= http://www.openh323.org/bin/ \
http://www.de.openh323.org/bin/ \
http://www.gnomemeeting.org/downloads/0.96.1/sources/
DISTFILES= openh323_1.11.2.tar.gz \
pwlib_1.4.7.tar.gz
http://www.gnomemeeting.org/downloads/0.98.0/sources/
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= roger@freebsd.org
COMMENT= A H323 Video Conferencing library, used with OhPhone
COMMENT= A H323 Video Conferencing library
LIB_DEPENDS= expat.4:${PORTSDIR}/textproc/expat2
@ -37,8 +35,13 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_BISON= yes
USE_GMAKE= yes
USE_AUTOCONF= yes
WANT_AUTOCONF_VER= 253
GNU_CONFIGURE= yes
CONFIGURE_ENV= PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \
OPENH323DIR=${WRKDIR}/openh323
ALL_TARGET= optnoshared
MAKE_ENV= PWLIBDIR=${WRKDIR}/pwlib \
MAKE_ENV= PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \
OPENH323DIR=${WRKDIR}/openh323
THE_MACHTYPE= ${ARCH:S/i386/x86/}
MAKE_ARGS= OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX}

3
net/opal3/distinfo
View file

@ -1,2 +1 @@
MD5 (openh323_1.11.2.tar.gz) = 89ab27a6a8f4a73ffd9e19751bc78786
MD5 (pwlib_1.4.7.tar.gz) = 24f2b7f2e983f48141d9657931f16fc4
MD5 (openh323_1.12.0.tar.gz) = f7932f0a17d6afafc7332036a4b5d392

31
net/opal3/files/patch-configurein Normal file
View file

@ -0,0 +1,31 @@
*** configure.in.orig Thu May 22 13:25:00 2003
--- configure.in Sat Aug 23 07:52:44 2003
*************** fi
*** 73,85 ****
dnl ########################################################################
dnl get pwlib directory
! if test "${PWLIBDIR:-unset}" == "unset" ; then
PWLIBDIR=`ptlib-config --prefix`
fi
! if test "x$PWLIBDIR" == "x/usr" -o "x$PWLIBDIR" == "x/usr/"; then
PWLIBDIR="/usr/share/pwlib/"
fi
! if test "xPWLIBDIR" == "x/usr/local" -o "x$PWLIBDIR" == "x/usr/"; then
PWLIBDIR="/usr/local/share/pwlib/"
fi
echo "PWLib prefix set to.... $PWLIBDIR"
--- 73,85 ----
dnl ########################################################################
dnl get pwlib directory
! if test "${PWLIBDIR:-unset}" = "unset" ; then
PWLIBDIR=`ptlib-config --prefix`
fi
! if test "x$PWLIBDIR" = "x/usr" -o "x$PWLIBDIR" = "x/usr/"; then
PWLIBDIR="/usr/share/pwlib/"
fi
! if test "xPWLIBDIR" = "x/usr/local" -o "x$PWLIBDIR" = "x/usr/"; then
PWLIBDIR="/usr/local/share/pwlib/"
fi
echo "PWLib prefix set to.... $PWLIBDIR"

35
net/opal3/files/patch-openh323u
View file

@ -1,35 +0,0 @@
*** openh323u.mak.orig Tue Nov 26 10:24:54 2002
--- openh323u.mak Tue Jan 28 13:51:51 2003
*************** LIBDIRS += $(OPENH323DIR)
*** 137,147 ****
OH323_SRCDIR = $(OPENH323DIR)/src
- ifdef PREFIX
- OH323_INCDIR = $(PREFIX)/include/openh323
- else
OH323_INCDIR = $(OPENH323DIR)/include
- endif
OH323_LIBDIR = $(OPENH323DIR)/lib
--- 137,143 ----
*************** endif
*** 192,197 ****
--- 188,203 ----
ifneq (,$(wildcard /usr/local/include/sys/telephony.h))
HAS_IXJ = 1
STDCCFLAGS += -DHAS_IXJ -I/usr/local/include
+ endif
+
+ ifneq (,$(wildcard /usr/local/include/sys/telephony.h))
+ HAS_IXJ = 1
+ STDCCFLAGS += -DHAS_IXJ -I/usr/local/include
+ endif
+
+ ifneq (,$(wildcard $(OPENH323DIR)/include/sys/telephony.h))
+ HAS_IXJ = 1
+ STDCCFLAGS += -DHAS_IXJ
endif
ifneq (,$(wildcard $(SYSINCDIR)/linux/soundcard.h))

27
net/opal3/files/patch-openh323uin Normal file
View file

@ -0,0 +1,27 @@
*** openh323u.mak.in.orig Sat Aug 23 08:09:48 2003
--- openh323u.mak.in Sat Aug 23 08:10:34 2003
*************** LIBDIRS += $(OPENH323DIR)
*** 142,152 ****
OH323_SRCDIR = $(OPENH323DIR)/src
! ifdef PREFIX
! OH323_INCDIR = $(PREFIX)/include/openh323
! else
OH323_INCDIR = $(OPENH323DIR)/include
! endif
OH323_LIBDIR = $(OPENH323DIR)/lib
--- 142,152 ----
OH323_SRCDIR = $(OPENH323DIR)/src
! #ifdef PREFIX
! #OH323_INCDIR = $(PREFIX)/include/openh323
! #else
OH323_INCDIR = $(OPENH323DIR)/include
! #endif
OH323_LIBDIR = $(OPENH323DIR)/lib

154
net/opal3/files/patch-oss
View file

@ -1,154 +0,0 @@
*** ../pwlib/src/ptlib/unix/oss.cxx.orig Thu Dec 12 09:03:56 2002
--- ../pwlib/src/ptlib/unix/oss.cxx Sun Feb 2 19:22:40 2003
***************
*** 27,32 ****
--- 27,45 ----
* Contributor(s): Loopback feature: Philip Edelbrock <phil@netroedge.com>.
*
* $Log: oss.cxx,v $
+ * Revision 1.58 2003/02/02 18:54:22 rogerh
+ * FreeBSD changes for support of dspN.M (eg dsp0.0) sound card entries.
+ * Problem reported by Lars Eggert <larse@isi.edu>
+ *
+ * Revision 1.57 2003/01/06 19:25:07 rogerh
+ * Add NetBSD video support.
+ * Add correct includes for OSS ioctls (note the proper way to do this now
+ * is via pwlib commands)
+ * From Andreas Wrede, taken in part from NetBSD's package system
+ *
+ * Revision 1.56 2003/01/06 19:10:22 rogerh
+ * NetBSD uses /dev/audio and not /dev/dsp
+ *
* Revision 1.55 2002/12/12 09:03:56 rogerh
* On two FreeBSD machines, Read() calls from the sound card were not blocking
* correctly and returned with less bytes than asked for. This made OpenH323
***************
*** 223,229 ****
#ifdef P_LINUX
#include <sys/soundcard.h>
- #include <sys/time.h>
#endif
#ifdef P_FREEBSD
--- 236,241 ----
*************** PSoundChannel::~PSoundChannel()
*** 456,468 ****
}
static BOOL IsNumericString(PString numbers) {
! // return true if 'numbers' contains only digits 0 to 9
for (PINDEX p = 0; p < numbers.GetLength(); p++) {
! if (!isdigit(numbers[p])) {
! return FALSE;
}
}
! return TRUE;
}
static void CollectSoundDevices(PDirectory devdir, POrdinalToString & dsp, POrdinalToString & mixer, BOOL collect_with_names)
--- 468,485 ----
}
static BOOL IsNumericString(PString numbers) {
! // return true if 'numbers' contains only digits (0 to 9)
! // or if it contains digits followed by a '.'
!
! BOOL isNumber = FALSE;
for (PINDEX p = 0; p < numbers.GetLength(); p++) {
! if (isdigit(numbers[p])) {
! isNumber = TRUE;
! } else {
! return isNumber;
}
}
! return isNumber;
}
static void CollectSoundDevices(PDirectory devdir, POrdinalToString & dsp, POrdinalToString & mixer, BOOL collect_with_names)
*************** static void CollectSoundDevices(PDirecto
*** 499,520 ****
// On Linux devfs systems, the major numbers can change dynamically.
// On FreeBSD and other OSs, the major numbes are different to Linux.
// So collect devices by looking for dsp(N) and mixer(N).
! // Notes. FreeBSD supports audio stream mixing. For /dev/dsp0
! // there are also entries for /dev/dsp0.0 dsp0.1 dsp0.2 and dsp0.3
! // We will ignore these N.M devices.
// Look for dsp
if (filename == "dsp") {
dsp.SetAt(0, devname);
}
! // Look for dspN. Insert at position cardnum + 1
if ((filename.GetLength() > 3) && (filename.Left(3) == "dsp")) {
PString numbers = filename.Mid(3); // get everything after 'dsp'
if (IsNumericString(numbers)) {
PINDEX cardnum = numbers.AsInteger();
dsp.SetAt(cardnum+1, devname);
}
}
// Look for mixer
if (filename == "mixer") {
mixer.SetAt(0, devname);
--- 516,562 ----
// On Linux devfs systems, the major numbers can change dynamically.
// On FreeBSD and other OSs, the major numbes are different to Linux.
// So collect devices by looking for dsp(N) and mixer(N).
! // (or /dev/audio(N) and mixer(N) on NetBSD
! // Notes. FreeBSD supports audio stream mixing. A single sound card
! // may have multiple /dev entries in the form /dev/dspN.M
! // eg /dev/dsp0.0 /dev/dsp0.1 /dev/dsp0.2 and /dev/dsp0.3
! // When adding these to the 'dsp' string array, only the first one
! // found is used.
+ #ifndef P_NETBSD
// Look for dsp
if (filename == "dsp") {
dsp.SetAt(0, devname);
}
!
! // Look for dspN entries. Insert at position N + 1
! // and look for dspN.M entries. Insert at position N + 1 (ignoring M)
!
if ((filename.GetLength() > 3) && (filename.Left(3) == "dsp")) {
+
PString numbers = filename.Mid(3); // get everything after 'dsp'
if (IsNumericString(numbers)) {
+ PINDEX cardnum = numbers.AsInteger(); //dspN.M is truncated to dspN.
+ // If we have not yet inserted something for this cardnum, insert it
+ if (dsp.GetAt(cardnum+1) == NULL) {
+ dsp.SetAt(cardnum+1, devname);
+ }
+ }
+ }
+ #else
+ // Look for audio on NetBSD
+ if (filename == "audio") {
+ dsp.SetAt(0, devname);
+ }
+ // Look for audioN. Insert at position cardnum + 1
+ if ((filename.GetLength() > 5) && (filename.Left(5) == "audio")) {
+ PString numbers = filename.Mid(5); // get everything after 'audio'
+ if (IsNumericString(numbers)) {
PINDEX cardnum = numbers.AsInteger();
dsp.SetAt(cardnum+1, devname);
}
}
+ #endif
// Look for mixer
if (filename == "mixer") {
mixer.SetAt(0, devname);
*************** PString PSoundChannel::GetDefaultDevice(
*** 604,611 ****
--- 646,656 ----
{
// Normally /dev/dsp points to the default sound device. If this is not
// present, probe /dev for sound devices and return the first detected device.
+
if (PFile::Exists("/dev/dsp")) {
return "/dev/dsp";
+ } else if (PFile::Exists("/dev/audio")) { // the NetBSD default name
+ return "/dev/audio";
} else {
// return the first dsp device detected
PStringArray devicenames;

59
net/opal3/files/patch-unix
View file

@ -1,59 +0,0 @@
*** ../pwlib/make/unix.mak.orig Fri Nov 22 10:59:27 2002
--- ../pwlib/make/unix.mak Tue Jan 28 13:51:15 2003
*************** ifeq ($(OSTYPE),FreeBSD)
*** 770,780 ****
P_PTHREADS := 1
! ifeq ($(MACHTYPE),x86)
! ifdef CPUTYPE
! STDCCFLAGS += -mcpu=$(CPUTYPE)
! endif
! endif
ifndef OSRELEASE
OSRELEASE := $(shell sysctl -n kern.osreldate)
--- 770,780 ----
P_PTHREADS := 1
! #ifeq ($(MACHTYPE),x86)
! #ifdef CPUTYPE
! #STDCCFLAGS += -mcpu=$(CPUTYPE)
! #endif
! #endif
ifndef OSRELEASE
OSRELEASE := $(shell sysctl -n kern.osreldate)
*************** SHELL := /bin/sh
*** 1335,1345 ****
# Directories
- ifdef PREFIX
- UNIX_INC_DIR = $(PREFIX)/include/ptlib/unix
- else
UNIX_INC_DIR = $(PWLIBDIR)/include/ptlib/unix
- endif
ifndef UNIX_SRC_DIR
UNIX_SRC_DIR = $(PWLIBDIR)/src/ptlib/unix
--- 1335,1341 ----
*************** LDFLAGS += $(DEBLDFLAGS)
*** 1375,1381 ****
else
! OPTCCFLAGS += -O3 -DNDEBUG
#OPTCCFLAGS += -DP_USE_INLINES=1
#OPTCCFLAGS += -fconserve-space
ifneq ($(OSTYPE),Carbon)
--- 1371,1378 ----
else
! #OPTCCFLAGS += -O3 -DNDEBUG
! OPTCCFLAGS += -DNDEBUG
#OPTCCFLAGS += -DP_USE_INLINES=1
#OPTCCFLAGS += -fconserve-space
ifneq ($(OSTYPE),Carbon)

17
net/openh323-112/Makefile
View file

@ -6,17 +6,15 @@
#
PORTNAME= openh323
PORTVERSION= 1.11.2
PORTREVISION= 1
PORTVERSION= 1.12.0
CATEGORIES= net
MASTER_SITES= http://www.openh323.org/bin/ \
http://www.de.openh323.org/bin/ \
http://www.gnomemeeting.org/downloads/0.96.1/sources/
DISTFILES= openh323_1.11.2.tar.gz \
pwlib_1.4.7.tar.gz
http://www.gnomemeeting.org/downloads/0.98.0/sources/
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= roger@freebsd.org
COMMENT= A H323 Video Conferencing library, used with OhPhone
COMMENT= A H323 Video Conferencing library
LIB_DEPENDS= expat.4:${PORTSDIR}/textproc/expat2
@ -37,8 +35,13 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_BISON= yes
USE_GMAKE= yes
USE_AUTOCONF= yes
WANT_AUTOCONF_VER= 253
GNU_CONFIGURE= yes
CONFIGURE_ENV= PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \
OPENH323DIR=${WRKDIR}/openh323
ALL_TARGET= optnoshared
MAKE_ENV= PWLIBDIR=${WRKDIR}/pwlib \
MAKE_ENV= PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \
OPENH323DIR=${WRKDIR}/openh323
THE_MACHTYPE= ${ARCH:S/i386/x86/}
MAKE_ARGS= OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX}

3
net/openh323-112/distinfo
View file

@ -1,2 +1 @@
MD5 (openh323_1.11.2.tar.gz) = 89ab27a6a8f4a73ffd9e19751bc78786
MD5 (pwlib_1.4.7.tar.gz) = 24f2b7f2e983f48141d9657931f16fc4
MD5 (openh323_1.12.0.tar.gz) = f7932f0a17d6afafc7332036a4b5d392

31
net/openh323-112/files/patch-configurein Normal file
View file

@ -0,0 +1,31 @@
*** configure.in.orig Thu May 22 13:25:00 2003
--- configure.in Sat Aug 23 07:52:44 2003
*************** fi
*** 73,85 ****
dnl ########################################################################
dnl get pwlib directory
! if test "${PWLIBDIR:-unset}" == "unset" ; then
PWLIBDIR=`ptlib-config --prefix`
fi
! if test "x$PWLIBDIR" == "x/usr" -o "x$PWLIBDIR" == "x/usr/"; then
PWLIBDIR="/usr/share/pwlib/"
fi
! if test "xPWLIBDIR" == "x/usr/local" -o "x$PWLIBDIR" == "x/usr/"; then
PWLIBDIR="/usr/local/share/pwlib/"
fi
echo "PWLib prefix set to.... $PWLIBDIR"
--- 73,85 ----
dnl ########################################################################
dnl get pwlib directory
! if test "${PWLIBDIR:-unset}" = "unset" ; then
PWLIBDIR=`ptlib-config --prefix`
fi
! if test "x$PWLIBDIR" = "x/usr" -o "x$PWLIBDIR" = "x/usr/"; then
PWLIBDIR="/usr/share/pwlib/"
fi
! if test "xPWLIBDIR" = "x/usr/local" -o "x$PWLIBDIR" = "x/usr/"; then
PWLIBDIR="/usr/local/share/pwlib/"
fi
echo "PWLib prefix set to.... $PWLIBDIR"

35
net/openh323-112/files/patch-openh323u
View file

@ -1,35 +0,0 @@
*** openh323u.mak.orig Tue Nov 26 10:24:54 2002
--- openh323u.mak Tue Jan 28 13:51:51 2003
*************** LIBDIRS += $(OPENH323DIR)
*** 137,147 ****
OH323_SRCDIR = $(OPENH323DIR)/src
- ifdef PREFIX
- OH323_INCDIR = $(PREFIX)/include/openh323
- else
OH323_INCDIR = $(OPENH323DIR)/include
- endif
OH323_LIBDIR = $(OPENH323DIR)/lib
--- 137,143 ----
*************** endif
*** 192,197 ****
--- 188,203 ----
ifneq (,$(wildcard /usr/local/include/sys/telephony.h))
HAS_IXJ = 1
STDCCFLAGS += -DHAS_IXJ -I/usr/local/include
+ endif
+
+ ifneq (,$(wildcard /usr/local/include/sys/telephony.h))
+ HAS_IXJ = 1
+ STDCCFLAGS += -DHAS_IXJ -I/usr/local/include
+ endif
+
+ ifneq (,$(wildcard $(OPENH323DIR)/include/sys/telephony.h))
+ HAS_IXJ = 1
+ STDCCFLAGS += -DHAS_IXJ
endif
ifneq (,$(wildcard $(SYSINCDIR)/linux/soundcard.h))

27
net/openh323-112/files/patch-openh323uin Normal file
View file

@ -0,0 +1,27 @@
*** openh323u.mak.in.orig Sat Aug 23 08:09:48 2003
--- openh323u.mak.in Sat Aug 23 08:10:34 2003
*************** LIBDIRS += $(OPENH323DIR)
*** 142,152 ****
OH323_SRCDIR = $(OPENH323DIR)/src
! ifdef PREFIX
! OH323_INCDIR = $(PREFIX)/include/openh323
! else
OH323_INCDIR = $(OPENH323DIR)/include
! endif
OH323_LIBDIR = $(OPENH323DIR)/lib
--- 142,152 ----
OH323_SRCDIR = $(OPENH323DIR)/src
! #ifdef PREFIX
! #OH323_INCDIR = $(PREFIX)/include/openh323
! #else
OH323_INCDIR = $(OPENH323DIR)/include
! #endif
OH323_LIBDIR = $(OPENH323DIR)/lib

154
net/openh323-112/files/patch-oss
View file

@ -1,154 +0,0 @@
*** ../pwlib/src/ptlib/unix/oss.cxx.orig Thu Dec 12 09:03:56 2002
--- ../pwlib/src/ptlib/unix/oss.cxx Sun Feb 2 19:22:40 2003
***************
*** 27,32 ****
--- 27,45 ----
* Contributor(s): Loopback feature: Philip Edelbrock <phil@netroedge.com>.
*
* $Log: oss.cxx,v $
+ * Revision 1.58 2003/02/02 18:54:22 rogerh
+ * FreeBSD changes for support of dspN.M (eg dsp0.0) sound card entries.
+ * Problem reported by Lars Eggert <larse@isi.edu>
+ *
+ * Revision 1.57 2003/01/06 19:25:07 rogerh
+ * Add NetBSD video support.
+ * Add correct includes for OSS ioctls (note the proper way to do this now
+ * is via pwlib commands)
+ * From Andreas Wrede, taken in part from NetBSD's package system
+ *
+ * Revision 1.56 2003/01/06 19:10:22 rogerh
+ * NetBSD uses /dev/audio and not /dev/dsp
+ *
* Revision 1.55 2002/12/12 09:03:56 rogerh
* On two FreeBSD machines, Read() calls from the sound card were not blocking
* correctly and returned with less bytes than asked for. This made OpenH323
***************
*** 223,229 ****
#ifdef P_LINUX
#include <sys/soundcard.h>
- #include <sys/time.h>
#endif
#ifdef P_FREEBSD
--- 236,241 ----
*************** PSoundChannel::~PSoundChannel()
*** 456,468 ****
}
static BOOL IsNumericString(PString numbers) {
! // return true if 'numbers' contains only digits 0 to 9
for (PINDEX p = 0; p < numbers.GetLength(); p++) {
! if (!isdigit(numbers[p])) {
! return FALSE;
}
}
! return TRUE;
}
static void CollectSoundDevices(PDirectory devdir, POrdinalToString & dsp, POrdinalToString & mixer, BOOL collect_with_names)
--- 468,485 ----
}
static BOOL IsNumericString(PString numbers) {
! // return true if 'numbers' contains only digits (0 to 9)
! // or if it contains digits followed by a '.'
!
! BOOL isNumber = FALSE;
for (PINDEX p = 0; p < numbers.GetLength(); p++) {
! if (isdigit(numbers[p])) {
! isNumber = TRUE;
! } else {
! return isNumber;
}
}
! return isNumber;
}
static void CollectSoundDevices(PDirectory devdir, POrdinalToString & dsp, POrdinalToString & mixer, BOOL collect_with_names)
*************** static void CollectSoundDevices(PDirecto
*** 499,520 ****
// On Linux devfs systems, the major numbers can change dynamically.
// On FreeBSD and other OSs, the major numbes are different to Linux.
// So collect devices by looking for dsp(N) and mixer(N).
! // Notes. FreeBSD supports audio stream mixing. For /dev/dsp0
! // there are also entries for /dev/dsp0.0 dsp0.1 dsp0.2 and dsp0.3
! // We will ignore these N.M devices.
// Look for dsp
if (filename == "dsp") {
dsp.SetAt(0, devname);
}
! // Look for dspN. Insert at position cardnum + 1
if ((filename.GetLength() > 3) && (filename.Left(3) == "dsp")) {
PString numbers = filename.Mid(3); // get everything after 'dsp'
if (IsNumericString(numbers)) {
PINDEX cardnum = numbers.AsInteger();
dsp.SetAt(cardnum+1, devname);
}
}
// Look for mixer
if (filename == "mixer") {
mixer.SetAt(0, devname);
--- 516,562 ----
// On Linux devfs systems, the major numbers can change dynamically.
// On FreeBSD and other OSs, the major numbes are different to Linux.
// So collect devices by looking for dsp(N) and mixer(N).
! // (or /dev/audio(N) and mixer(N) on NetBSD
! // Notes. FreeBSD supports audio stream mixing. A single sound card
! // may have multiple /dev entries in the form /dev/dspN.M
! // eg /dev/dsp0.0 /dev/dsp0.1 /dev/dsp0.2 and /dev/dsp0.3
! // When adding these to the 'dsp' string array, only the first one
! // found is used.
+ #ifndef P_NETBSD
// Look for dsp
if (filename == "dsp") {
dsp.SetAt(0, devname);
}
!
! // Look for dspN entries. Insert at position N + 1
! // and look for dspN.M entries. Insert at position N + 1 (ignoring M)
!
if ((filename.GetLength() > 3) && (filename.Left(3) == "dsp")) {
+
PString numbers = filename.Mid(3); // get everything after 'dsp'
if (IsNumericString(numbers)) {
+ PINDEX cardnum = numbers.AsInteger(); //dspN.M is truncated to dspN.
+ // If we have not yet inserted something for this cardnum, insert it
+ if (dsp.GetAt(cardnum+1) == NULL) {
+ dsp.SetAt(cardnum+1, devname);
+ }
+ }
+ }
+ #else
+ // Look for audio on NetBSD
+ if (filename == "audio") {
+ dsp.SetAt(0, devname);
+ }
+ // Look for audioN. Insert at position cardnum + 1
+ if ((filename.GetLength() > 5) && (filename.Left(5) == "audio")) {
+ PString numbers = filename.Mid(5); // get everything after 'audio'
+ if (IsNumericString(numbers)) {
PINDEX cardnum = numbers.AsInteger();
dsp.SetAt(cardnum+1, devname);
}
}
+ #endif
// Look for mixer
if (filename == "mixer") {
mixer.SetAt(0, devname);
*************** PString PSoundChannel::GetDefaultDevice(
*** 604,611 ****
--- 646,656 ----
{
// Normally /dev/dsp points to the default sound device. If this is not
// present, probe /dev for sound devices and return the first detected device.
+
if (PFile::Exists("/dev/dsp")) {
return "/dev/dsp";
+ } else if (PFile::Exists("/dev/audio")) { // the NetBSD default name
+ return "/dev/audio";
} else {
// return the first dsp device detected
PStringArray devicenames;

59
net/openh323-112/files/patch-unix
View file

@ -1,59 +0,0 @@
*** ../pwlib/make/unix.mak.orig Fri Nov 22 10:59:27 2002
--- ../pwlib/make/unix.mak Tue Jan 28 13:51:15 2003
*************** ifeq ($(OSTYPE),FreeBSD)
*** 770,780 ****
P_PTHREADS := 1
! ifeq ($(MACHTYPE),x86)
! ifdef CPUTYPE
! STDCCFLAGS += -mcpu=$(CPUTYPE)
! endif
! endif
ifndef OSRELEASE
OSRELEASE := $(shell sysctl -n kern.osreldate)
--- 770,780 ----
P_PTHREADS := 1
! #ifeq ($(MACHTYPE),x86)
! #ifdef CPUTYPE
! #STDCCFLAGS += -mcpu=$(CPUTYPE)
! #endif
! #endif
ifndef OSRELEASE
OSRELEASE := $(shell sysctl -n kern.osreldate)
*************** SHELL := /bin/sh
*** 1335,1345 ****
# Directories
- ifdef PREFIX
- UNIX_INC_DIR = $(PREFIX)/include/ptlib/unix
- else
UNIX_INC_DIR = $(PWLIBDIR)/include/ptlib/unix
- endif
ifndef UNIX_SRC_DIR
UNIX_SRC_DIR = $(PWLIBDIR)/src/ptlib/unix
--- 1335,1341 ----
*************** LDFLAGS += $(DEBLDFLAGS)
*** 1375,1381 ****
else
! OPTCCFLAGS += -O3 -DNDEBUG
#OPTCCFLAGS += -DP_USE_INLINES=1
#OPTCCFLAGS += -fconserve-space
ifneq ($(OSTYPE),Carbon)
--- 1371,1378 ----
else
! #OPTCCFLAGS += -O3 -DNDEBUG
! OPTCCFLAGS += -DNDEBUG
#OPTCCFLAGS += -DP_USE_INLINES=1
#OPTCCFLAGS += -fconserve-space
ifneq ($(OSTYPE),Carbon)

17
net/openh323/Makefile
View file

@ -6,17 +6,15 @@
#
PORTNAME= openh323
PORTVERSION= 1.11.2
PORTREVISION= 1
PORTVERSION= 1.12.0
CATEGORIES= net
MASTER_SITES= http://www.openh323.org/bin/ \
http://www.de.openh323.org/bin/ \
http://www.gnomemeeting.org/downloads/0.96.1/sources/
DISTFILES= openh323_1.11.2.tar.gz \
pwlib_1.4.7.tar.gz
http://www.gnomemeeting.org/downloads/0.98.0/sources/
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= roger@freebsd.org
COMMENT= A H323 Video Conferencing library, used with OhPhone
COMMENT= A H323 Video Conferencing library
LIB_DEPENDS= expat.4:${PORTSDIR}/textproc/expat2
@ -37,8 +35,13 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_BISON= yes
USE_GMAKE= yes
USE_AUTOCONF= yes
WANT_AUTOCONF_VER= 253
GNU_CONFIGURE= yes
CONFIGURE_ENV= PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \
OPENH323DIR=${WRKDIR}/openh323
ALL_TARGET= optnoshared
MAKE_ENV= PWLIBDIR=${WRKDIR}/pwlib \
MAKE_ENV= PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \
OPENH323DIR=${WRKDIR}/openh323
THE_MACHTYPE= ${ARCH:S/i386/x86/}
MAKE_ARGS= OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX}

3
net/openh323/distinfo
View file

@ -1,2 +1 @@
MD5 (openh323_1.11.2.tar.gz) = 89ab27a6a8f4a73ffd9e19751bc78786
MD5 (pwlib_1.4.7.tar.gz) = 24f2b7f2e983f48141d9657931f16fc4
MD5 (openh323_1.12.0.tar.gz) = f7932f0a17d6afafc7332036a4b5d392

31
net/openh323/files/patch-configurein Normal file
View file

@ -0,0 +1,31 @@
*** configure.in.orig Thu May 22 13:25:00 2003
--- configure.in Sat Aug 23 07:52:44 2003
*************** fi
*** 73,85 ****
dnl ########################################################################
dnl get pwlib directory
! if test "${PWLIBDIR:-unset}" == "unset" ; then
PWLIBDIR=`ptlib-config --prefix`
fi
! if test "x$PWLIBDIR" == "x/usr" -o "x$PWLIBDIR" == "x/usr/"; then
PWLIBDIR="/usr/share/pwlib/"
fi
! if test "xPWLIBDIR" == "x/usr/local" -o "x$PWLIBDIR" == "x/usr/"; then
PWLIBDIR="/usr/local/share/pwlib/"
fi
echo "PWLib prefix set to.... $PWLIBDIR"
--- 73,85 ----
dnl ########################################################################
dnl get pwlib directory
! if test "${PWLIBDIR:-unset}" = "unset" ; then
PWLIBDIR=`ptlib-config --prefix`
fi
! if test "x$PWLIBDIR" = "x/usr" -o "x$PWLIBDIR" = "x/usr/"; then
PWLIBDIR="/usr/share/pwlib/"
fi
! if test "xPWLIBDIR" = "x/usr/local" -o "x$PWLIBDIR" = "x/usr/"; then
PWLIBDIR="/usr/local/share/pwlib/"
fi
echo "PWLib prefix set to.... $PWLIBDIR"

35
net/openh323/files/patch-openh323u
View file

@ -1,35 +0,0 @@
*** openh323u.mak.orig Tue Nov 26 10:24:54 2002
--- openh323u.mak Tue Jan 28 13:51:51 2003
*************** LIBDIRS += $(OPENH323DIR)
*** 137,147 ****
OH323_SRCDIR = $(OPENH323DIR)/src
- ifdef PREFIX
- OH323_INCDIR = $(PREFIX)/include/openh323
- else
OH323_INCDIR = $(OPENH323DIR)/include
- endif
OH323_LIBDIR = $(OPENH323DIR)/lib
--- 137,143 ----
*************** endif
*** 192,197 ****
--- 188,203 ----
ifneq (,$(wildcard /usr/local/include/sys/telephony.h))
HAS_IXJ = 1
STDCCFLAGS += -DHAS_IXJ -I/usr/local/include
+ endif
+
+ ifneq (,$(wildcard /usr/local/include/sys/telephony.h))
+ HAS_IXJ = 1
+ STDCCFLAGS += -DHAS_IXJ -I/usr/local/include
+ endif
+
+ ifneq (,$(wildcard $(OPENH323DIR)/include/sys/telephony.h))
+ HAS_IXJ = 1
+ STDCCFLAGS += -DHAS_IXJ
endif
ifneq (,$(wildcard $(SYSINCDIR)/linux/soundcard.h))

27
net/openh323/files/patch-openh323uin Normal file
View file

@ -0,0 +1,27 @@
*** openh323u.mak.in.orig Sat Aug 23 08:09:48 2003
--- openh323u.mak.in Sat Aug 23 08:10:34 2003
*************** LIBDIRS += $(OPENH323DIR)
*** 142,152 ****
OH323_SRCDIR = $(OPENH323DIR)/src
! ifdef PREFIX
! OH323_INCDIR = $(PREFIX)/include/openh323
! else
OH323_INCDIR = $(OPENH323DIR)/include
! endif
OH323_LIBDIR = $(OPENH323DIR)/lib
--- 142,152 ----
OH323_SRCDIR = $(OPENH323DIR)/src
! #ifdef PREFIX
! #OH323_INCDIR = $(PREFIX)/include/openh323
! #else
OH323_INCDIR = $(OPENH323DIR)/include
! #endif
OH323_LIBDIR = $(OPENH323DIR)/lib

154
net/openh323/files/patch-oss
View file

@ -1,154 +0,0 @@
*** ../pwlib/src/ptlib/unix/oss.cxx.orig Thu Dec 12 09:03:56 2002
--- ../pwlib/src/ptlib/unix/oss.cxx Sun Feb 2 19:22:40 2003
***************
*** 27,32 ****
--- 27,45 ----
* Contributor(s): Loopback feature: Philip Edelbrock <phil@netroedge.com>.
*
* $Log: oss.cxx,v $
+ * Revision 1.58 2003/02/02 18:54:22 rogerh
+ * FreeBSD changes for support of dspN.M (eg dsp0.0) sound card entries.
+ * Problem reported by Lars Eggert <larse@isi.edu>
+ *
+ * Revision 1.57 2003/01/06 19:25:07 rogerh
+ * Add NetBSD video support.
+ * Add correct includes for OSS ioctls (note the proper way to do this now
+ * is via pwlib commands)
+ * From Andreas Wrede, taken in part from NetBSD's package system
+ *
+ * Revision 1.56 2003/01/06 19:10:22 rogerh
+ * NetBSD uses /dev/audio and not /dev/dsp
+ *
* Revision 1.55 2002/12/12 09:03:56 rogerh
* On two FreeBSD machines, Read() calls from the sound card were not blocking
* correctly and returned with less bytes than asked for. This made OpenH323
***************
*** 223,229 ****
#ifdef P_LINUX
#include <sys/soundcard.h>
- #include <sys/time.h>
#endif
#ifdef P_FREEBSD
--- 236,241 ----
*************** PSoundChannel::~PSoundChannel()
*** 456,468 ****
}
static BOOL IsNumericString(PString numbers) {
! // return true if 'numbers' contains only digits 0 to 9
for (PINDEX p = 0; p < numbers.GetLength(); p++) {
! if (!isdigit(numbers[p])) {
! return FALSE;
}
}
! return TRUE;
}
static void CollectSoundDevices(PDirectory devdir, POrdinalToString & dsp, POrdinalToString & mixer, BOOL collect_with_names)
--- 468,485 ----
}
static BOOL IsNumericString(PString numbers) {
! // return true if 'numbers' contains only digits (0 to 9)
! // or if it contains digits followed by a '.'
!
! BOOL isNumber = FALSE;
for (PINDEX p = 0; p < numbers.GetLength(); p++) {
! if (isdigit(numbers[p])) {
! isNumber = TRUE;
! } else {
! return isNumber;
}
}
! return isNumber;
}
static void CollectSoundDevices(PDirectory devdir, POrdinalToString & dsp, POrdinalToString & mixer, BOOL collect_with_names)
*************** static void CollectSoundDevices(PDirecto
*** 499,520 ****
// On Linux devfs systems, the major numbers can change dynamically.
// On FreeBSD and other OSs, the major numbes are different to Linux.
// So collect devices by looking for dsp(N) and mixer(N).
! // Notes. FreeBSD supports audio stream mixing. For /dev/dsp0
! // there are also entries for /dev/dsp0.0 dsp0.1 dsp0.2 and dsp0.3
! // We will ignore these N.M devices.
// Look for dsp
if (filename == "dsp") {
dsp.SetAt(0, devname);
}
! // Look for dspN. Insert at position cardnum + 1
if ((filename.GetLength() > 3) && (filename.Left(3) == "dsp")) {
PString numbers = filename.Mid(3); // get everything after 'dsp'
if (IsNumericString(numbers)) {
PINDEX cardnum = numbers.AsInteger();
dsp.SetAt(cardnum+1, devname);
}
}
// Look for mixer
if (filename == "mixer") {
mixer.SetAt(0, devname);
--- 516,562 ----
// On Linux devfs systems, the major numbers can change dynamically.
// On FreeBSD and other OSs, the major numbes are different to Linux.
// So collect devices by looking for dsp(N) and mixer(N).
! // (or /dev/audio(N) and mixer(N) on NetBSD
! // Notes. FreeBSD supports audio stream mixing. A single sound card
! // may have multiple /dev entries in the form /dev/dspN.M
! // eg /dev/dsp0.0 /dev/dsp0.1 /dev/dsp0.2 and /dev/dsp0.3
! // When adding these to the 'dsp' string array, only the first one
! // found is used.
+ #ifndef P_NETBSD
// Look for dsp
if (filename == "dsp") {
dsp.SetAt(0, devname);
}
!
! // Look for dspN entries. Insert at position N + 1
! // and look for dspN.M entries. Insert at position N + 1 (ignoring M)
!
if ((filename.GetLength() > 3) && (filename.Left(3) == "dsp")) {
+
PString numbers = filename.Mid(3); // get everything after 'dsp'
if (IsNumericString(numbers)) {
+ PINDEX cardnum = numbers.AsInteger(); //dspN.M is truncated to dspN.
+ // If we have not yet inserted something for this cardnum, insert it
+ if (dsp.GetAt(cardnum+1) == NULL) {
+ dsp.SetAt(cardnum+1, devname);
+ }
+ }
+ }
+ #else
+ // Look for audio on NetBSD
+ if (filename == "audio") {
+ dsp.SetAt(0, devname);
+ }
+ // Look for audioN. Insert at position cardnum + 1
+ if ((filename.GetLength() > 5) && (filename.Left(5) == "audio")) {
+ PString numbers = filename.Mid(5); // get everything after 'audio'
+ if (IsNumericString(numbers)) {
PINDEX cardnum = numbers.AsInteger();
dsp.SetAt(cardnum+1, devname);
}
}
+ #endif
// Look for mixer
if (filename == "mixer") {
mixer.SetAt(0, devname);
*************** PString PSoundChannel::GetDefaultDevice(
*** 604,611 ****
--- 646,656 ----
{
// Normally /dev/dsp points to the default sound device. If this is not
// present, probe /dev for sound devices and return the first detected device.
+
if (PFile::Exists("/dev/dsp")) {
return "/dev/dsp";
+ } else if (PFile::Exists("/dev/audio")) { // the NetBSD default name
+ return "/dev/audio";
} else {
// return the first dsp device detected
PStringArray devicenames;

59
net/openh323/files/patch-unix
View file

@ -1,59 +0,0 @@
*** ../pwlib/make/unix.mak.orig Fri Nov 22 10:59:27 2002
--- ../pwlib/make/unix.mak Tue Jan 28 13:51:15 2003
*************** ifeq ($(OSTYPE),FreeBSD)
*** 770,780 ****
P_PTHREADS := 1
! ifeq ($(MACHTYPE),x86)
! ifdef CPUTYPE
! STDCCFLAGS += -mcpu=$(CPUTYPE)
! endif
! endif
ifndef OSRELEASE
OSRELEASE := $(shell sysctl -n kern.osreldate)
--- 770,780 ----
P_PTHREADS := 1
! #ifeq ($(MACHTYPE),x86)
! #ifdef CPUTYPE
! #STDCCFLAGS += -mcpu=$(CPUTYPE)
! #endif
! #endif
ifndef OSRELEASE
OSRELEASE := $(shell sysctl -n kern.osreldate)
*************** SHELL := /bin/sh
*** 1335,1345 ****
# Directories
- ifdef PREFIX
- UNIX_INC_DIR = $(PREFIX)/include/ptlib/unix
- else
UNIX_INC_DIR = $(PWLIBDIR)/include/ptlib/unix
- endif
ifndef UNIX_SRC_DIR
UNIX_SRC_DIR = $(PWLIBDIR)/src/ptlib/unix
--- 1335,1341 ----
*************** LDFLAGS += $(DEBLDFLAGS)
*** 1375,1381 ****
else
! OPTCCFLAGS += -O3 -DNDEBUG
#OPTCCFLAGS += -DP_USE_INLINES=1
#OPTCCFLAGS += -fconserve-space
ifneq ($(OSTYPE),Carbon)
--- 1371,1378 ----
else
! #OPTCCFLAGS += -O3 -DNDEBUG
! OPTCCFLAGS += -DNDEBUG
#OPTCCFLAGS += -DP_USE_INLINES=1
#OPTCCFLAGS += -fconserve-space
ifneq ($(OSTYPE),Carbon)