mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-28 01:06:17 +00:00
Update to new version ready for GnomeMeeting upgrade
This commit is contained in:
Roger Hardiman
parent
7f6cedb058
commit
0c2eea3a5f
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=74141
@ -6,19 +6,17 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
PORTNAME= openh323
|
PORTNAME= openh323
|
||||||
PORTVERSION= 1.9.10
|
PORTVERSION= 1.11.2
|
||||||
PORTREVISION= 2
|
|
||||||
CATEGORIES= net
|
CATEGORIES= net
|
||||||
MASTER_SITES= http://www.openh323.org/bin/ \
|
MASTER_SITES= http://www.openh323.org/bin/ \
|
||||||
http://www.de.openh323.org/bin/ \
|
http://www.de.openh323.org/bin/ \
|
||||||
http://www.gnomemeeting.org/downloads/0.94.1/sources/
|
http://www.gnomemeeting.org/downloads/0.94.1/sources/
|
||||||
DISTFILES= openh323_1.9.10.tar.gz \
|
DISTFILES= openh323_1.11.2.tar.gz \
|
||||||
pwlib_1.3.11.tar.gz
|
pwlib_1.4.7.tar.gz
|
||||||
|
|
||||||
MAINTAINER= roger@freebsd.org
|
MAINTAINER= roger@freebsd.org
|
||||||
|
|
||||||
LIB_DEPENDS= speex.0:${PORTSDIR}/audio/speex \
|
LIB_DEPENDS= expat.4:${PORTSDIR}/textproc/expat2
|
||||||
expat.4:${PORTSDIR}/textproc/expat2
|
|
||||||
|
|
||||||
.include <bsd.port.pre.mk>
|
.include <bsd.port.pre.mk>
|
||||||
.if ${OSVERSION} < 500000
|
.if ${OSVERSION} < 500000
|
||||||
|
|||||||
@ -1,2 +1,2 @@
|
|||||||
MD5 (openh323_1.9.10.tar.gz) = 4efbe1356cb26b8442add3cc4cfba91d
|
MD5 (openh323_1.11.2.tar.gz) = 89ab27a6a8f4a73ffd9e19751bc78786
|
||||||
MD5 (pwlib_1.3.11.tar.gz) = da68d42d18a1b4aac93aaa2a9520de00
|
MD5 (pwlib_1.4.7.tar.gz) = 24f2b7f2e983f48141d9657931f16fc4
|
||||||
|
|||||||
@ -1,21 +0,0 @@
|
|||||||
*** openh323u.mak.orig Wed May 22 00:57:21 2002
|
|
||||||
--- openh323u.mak Wed May 22 00:57:51 2002
|
|
||||||
*************** HAS_IXJ = 1
|
|
||||||
*** 139,144 ****
|
|
||||||
--- 139,154 ----
|
|
||||||
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))
|
|
||||||
HAS_OSS = 1
|
|
||||||
STDCCFLAGS += -DHAS_OSS
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
*** ../pwlib/src/ptlib/unix/Makefile.orig Sun Oct 27 15:54:26 2002
|
|
||||||
--- ../pwlib/src/ptlib/unix/Makefile Sun Oct 27 15:54:56 2002
|
|
||||||
*************** $(DEPDIR)/getdate.tab.dep: $(GETDATE_SOU
|
|
||||||
*** 553,559 ****
|
|
||||||
$(CC) $(STDCCFLAGS) -M $< >> $@
|
|
||||||
|
|
||||||
$(GETDATE_SOURCE): $(COMMON_SRC_DIR)/getdate.y
|
|
||||||
! bison $(COMMON_SRC_DIR)/getdate.y
|
|
||||||
|
|
||||||
#######################################################
|
|
||||||
|
|
||||||
--- 553,559 ----
|
|
||||||
$(CC) $(STDCCFLAGS) -M $< >> $@
|
|
||||||
|
|
||||||
$(GETDATE_SOURCE): $(COMMON_SRC_DIR)/getdate.y
|
|
||||||
! bison $(COMMON_SRC_DIR)/getdate.y -o $(COMMON_SRC_DIR)/getdate.tab.c
|
|
||||||
|
|
||||||
#######################################################
|
|
||||||
|
|
||||||
@ -1,51 +0,0 @@
|
|||||||
*** ../pwlib/src/ptlib/unix/video4bsd.cxx.orig Tue Oct 29 00:15:59 2002
|
|
||||||
--- ../pwlib/src/ptlib/unix/video4bsd.cxx Tue Oct 29 00:16:17 2002
|
|
||||||
***************
|
|
||||||
*** 24,29 ****
|
|
||||||
--- 24,32 ----
|
|
||||||
* Contributor(s): Roger Hardiman <roger@freebsd.org>
|
|
||||||
*
|
|
||||||
* $Log: video4bsd.cxx,v $
|
|
||||||
+ * Revision 1.20 2002/10/28 19:12:45 rogerh
|
|
||||||
+ * Add svideo input support for Lars Eggert <larse@isi.edu>
|
|
||||||
+ *
|
|
||||||
* Revision 1.19 2002/04/10 08:40:36 rogerh
|
|
||||||
* Simplify the SetVideoChannelFormat() code. Use the implementation in the
|
|
||||||
* ancestor class.
|
|
||||||
*************** BOOL PVideoInputDevice::Open(const PStri
|
|
||||||
*** 129,135 ****
|
|
||||||
videoCapability.minwidth = 32;
|
|
||||||
videoCapability.maxheight = 768;
|
|
||||||
videoCapability.maxwidth = 576;
|
|
||||||
! videoCapability.channels = 4;
|
|
||||||
|
|
||||||
// set height and width
|
|
||||||
frameHeight = videoCapability.maxheight;
|
|
||||||
--- 132,138 ----
|
|
||||||
videoCapability.minwidth = 32;
|
|
||||||
videoCapability.maxheight = 768;
|
|
||||||
videoCapability.maxwidth = 576;
|
|
||||||
! videoCapability.channels = 5;
|
|
||||||
|
|
||||||
// set height and width
|
|
||||||
frameHeight = videoCapability.maxheight;
|
|
||||||
*************** BOOL PVideoInputDevice::SetChannel(int n
|
|
||||||
*** 259,266 ****
|
|
||||||
return FALSE;
|
|
||||||
|
|
||||||
// set channel information
|
|
||||||
! static int chnl[4] = { METEOR_INPUT_DEV0, METEOR_INPUT_DEV1,
|
|
||||||
! METEOR_INPUT_DEV2, METEOR_INPUT_DEV3 };
|
|
||||||
int channel = chnl[newChannel];
|
|
||||||
|
|
||||||
// set the information
|
|
||||||
--- 262,270 ----
|
|
||||||
return FALSE;
|
|
||||||
|
|
||||||
// set channel information
|
|
||||||
! static int chnl[5] = { METEOR_INPUT_DEV0, METEOR_INPUT_DEV1,
|
|
||||||
! METEOR_INPUT_DEV2, METEOR_INPUT_DEV3,
|
|
||||||
! METEOR_INPUT_DEV_SVIDEO };
|
|
||||||
int channel = chnl[newChannel];
|
|
||||||
|
|
||||||
// set the information
|
|
||||||
@ -1,131 +0,0 @@
|
|||||||
*** ../pwlib/src/ptlib/common/object.cxx.orig Tue Oct 29 00:21:28 2002
|
|
||||||
--- ../pwlib/src/ptlib/common/object.cxx Tue Oct 29 00:22:07 2002
|
|
||||||
***************
|
|
||||||
*** 27,32 ****
|
|
||||||
--- 27,38 ----
|
|
||||||
* Contributor(s): ______________________________________.
|
|
||||||
*
|
|
||||||
* $Log: object.cxx,v $
|
|
||||||
+ * Revision 1.62 2002/10/21 12:52:27 rogerh
|
|
||||||
+ * Add throw()s to new and delete. Error reported by FreeBSD 5.0 and GCC 3.2.1
|
|
||||||
+ *
|
|
||||||
+ * Revision 1.61 2002/10/10 04:43:44 robertj
|
|
||||||
+ * VxWorks port, thanks Martijn Roest
|
|
||||||
+ *
|
|
||||||
* Revision 1.60 2002/09/06 05:29:42 craigs
|
|
||||||
* Reversed order of memory block check on delete to improve performance in
|
|
||||||
* Linux debug mode
|
|
||||||
*************** void PAssertFunc(const char * file, int
|
|
||||||
*** 308,332 ****
|
|
||||||
--- 314,354 ----
|
|
||||||
#undef free
|
|
||||||
|
|
||||||
|
|
||||||
+ #if __GNUC__ >= 3
|
|
||||||
+ void * operator new(size_t nSize) throw (std::bad_alloc)
|
|
||||||
+ #else
|
|
||||||
void * operator new(size_t nSize)
|
|
||||||
+ #endif
|
|
||||||
{
|
|
||||||
return PMemoryHeap::Allocate(nSize, (const char *)NULL, 0, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
+ #if __GNUC__ >= 3
|
|
||||||
+ void * operator new[](size_t nSize) throw (std::bad_alloc)
|
|
||||||
+ #else
|
|
||||||
void * operator new[](size_t nSize)
|
|
||||||
+ #endif
|
|
||||||
{
|
|
||||||
return PMemoryHeap::Allocate(nSize, (const char *)NULL, 0, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
+ #if __GNUC__ >= 3
|
|
||||||
+ void operator delete(void * ptr) throw()
|
|
||||||
+ #else
|
|
||||||
void operator delete(void * ptr)
|
|
||||||
+ #endif
|
|
||||||
{
|
|
||||||
PMemoryHeap::Deallocate(ptr, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
+ #if __GNUC__ >= 3
|
|
||||||
+ void operator delete[](void * ptr) throw()
|
|
||||||
+ #else
|
|
||||||
void operator delete[](void * ptr)
|
|
||||||
+ #endif
|
|
||||||
{
|
|
||||||
PMemoryHeap::Deallocate(ptr, NULL);
|
|
||||||
}
|
|
||||||
*************** void PMemoryHeap::InternalDumpObjectsSin
|
|
||||||
*** 814,829 ****
|
|
||||||
--- 836,863 ----
|
|
||||||
|
|
||||||
#else // PMEMORY_CHECK
|
|
||||||
|
|
||||||
+ #ifndef P_VXWORKS
|
|
||||||
+
|
|
||||||
+ #if __GNUC__ >= 3
|
|
||||||
+ void * operator new[](size_t nSize) throw (std::bad_alloc)
|
|
||||||
+ #else
|
|
||||||
void * operator new[](size_t nSize)
|
|
||||||
+ #endif
|
|
||||||
{
|
|
||||||
return malloc(nSize);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ #if __GNUC__ >= 3
|
|
||||||
+ void operator delete[](void * ptr) throw ()
|
|
||||||
+ #else
|
|
||||||
void operator delete[](void * ptr)
|
|
||||||
+ #endif
|
|
||||||
{
|
|
||||||
free(ptr);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ #endif // !P_VXWORKS
|
|
||||||
+
|
|
||||||
#endif // PMEMORY_CHECK
|
|
||||||
|
|
||||||
|
|
||||||
*************** istream & operator>>(istream & stream, P
|
|
||||||
*** 1505,1510 ****
|
|
||||||
--- 1539,1574 ----
|
|
||||||
|
|
||||||
|
|
||||||
#endif
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+ #ifdef P_TORNADO
|
|
||||||
+
|
|
||||||
+ // the library provided with Tornado 2.0 does not contain implementation
|
|
||||||
+ // for the functions defined below, therefor the own implementation
|
|
||||||
+
|
|
||||||
+ ostream & ostream::operator<<(PInt64 v)
|
|
||||||
+ {
|
|
||||||
+ return *this << (long)(v >> 32) << (long)(v & 0xFFFFFFFF);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+ ostream & ostream::operator<<(PUInt64 v)
|
|
||||||
+ {
|
|
||||||
+ return *this << (long)(v >> 32) << (long)(v & 0xFFFFFFFF);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ istream & istream::operator>>(PInt64 & v)
|
|
||||||
+ {
|
|
||||||
+ return *this >> (long)(v >> 32) >> (long)(v & 0xFFFFFFFF);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+ istream & istream::operator>>(PUInt64 & v)
|
|
||||||
+ {
|
|
||||||
+ return *this >> (long)(v >> 32) >> (long)(v & 0xFFFFFFFF);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ #endif // P_TORNADO
|
|
||||||
|
|
||||||
|
|
||||||
// End Of File ///////////////////////////////////////////////////////////////
|
|
||||||
35
net/opal/files/patch-openh323u
Normal file
35
net/opal/files/patch-openh323u
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
*** 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))
|
||||||
@ -1,7 +1,7 @@
|
|||||||
*** ../pwlib/make/unix.mak.orig Tue May 7 02:57:51 2002
|
*** ../pwlib/make/unix.mak.orig Fri Nov 22 10:59:27 2002
|
||||||
--- ../pwlib/make/unix.mak Wed May 22 00:53:00 2002
|
--- ../pwlib/make/unix.mak Tue Jan 28 13:51:15 2003
|
||||||
*************** ifeq ($(OSTYPE),FreeBSD)
|
*************** ifeq ($(OSTYPE),FreeBSD)
|
||||||
*** 644,654 ****
|
*** 770,780 ****
|
||||||
|
|
||||||
P_PTHREADS := 1
|
P_PTHREADS := 1
|
||||||
|
|
||||||
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
ifndef OSRELEASE
|
ifndef OSRELEASE
|
||||||
OSRELEASE := $(shell sysctl -n kern.osreldate)
|
OSRELEASE := $(shell sysctl -n kern.osreldate)
|
||||||
--- 644,654 ----
|
--- 770,780 ----
|
||||||
|
|
||||||
P_PTHREADS := 1
|
P_PTHREADS := 1
|
||||||
|
|
||||||
@ -25,8 +25,22 @@
|
|||||||
|
|
||||||
ifndef OSRELEASE
|
ifndef OSRELEASE
|
||||||
OSRELEASE := $(shell sysctl -n kern.osreldate)
|
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)
|
*************** LDFLAGS += $(DEBLDFLAGS)
|
||||||
*** 1136,1142 ****
|
*** 1375,1381 ****
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
||||||
@ -34,7 +48,7 @@
|
|||||||
#OPTCCFLAGS += -DP_USE_INLINES=1
|
#OPTCCFLAGS += -DP_USE_INLINES=1
|
||||||
#OPTCCFLAGS += -fconserve-space
|
#OPTCCFLAGS += -fconserve-space
|
||||||
ifneq ($(OSTYPE),Carbon)
|
ifneq ($(OSTYPE),Carbon)
|
||||||
--- 1136,1143 ----
|
--- 1371,1378 ----
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
||||||
@ -6,19 +6,17 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
PORTNAME= openh323
|
PORTNAME= openh323
|
||||||
PORTVERSION= 1.9.10
|
PORTVERSION= 1.11.2
|
||||||
PORTREVISION= 2
|
|
||||||
CATEGORIES= net
|
CATEGORIES= net
|
||||||
MASTER_SITES= http://www.openh323.org/bin/ \
|
MASTER_SITES= http://www.openh323.org/bin/ \
|
||||||
http://www.de.openh323.org/bin/ \
|
http://www.de.openh323.org/bin/ \
|
||||||
http://www.gnomemeeting.org/downloads/0.94.1/sources/
|
http://www.gnomemeeting.org/downloads/0.94.1/sources/
|
||||||
DISTFILES= openh323_1.9.10.tar.gz \
|
DISTFILES= openh323_1.11.2.tar.gz \
|
||||||
pwlib_1.3.11.tar.gz
|
pwlib_1.4.7.tar.gz
|
||||||
|
|
||||||
MAINTAINER= roger@freebsd.org
|
MAINTAINER= roger@freebsd.org
|
||||||
|
|
||||||
LIB_DEPENDS= speex.0:${PORTSDIR}/audio/speex \
|
LIB_DEPENDS= expat.4:${PORTSDIR}/textproc/expat2
|
||||||
expat.4:${PORTSDIR}/textproc/expat2
|
|
||||||
|
|
||||||
.include <bsd.port.pre.mk>
|
.include <bsd.port.pre.mk>
|
||||||
.if ${OSVERSION} < 500000
|
.if ${OSVERSION} < 500000
|
||||||
|
|||||||
@ -1,2 +1,2 @@
|
|||||||
MD5 (openh323_1.9.10.tar.gz) = 4efbe1356cb26b8442add3cc4cfba91d
|
MD5 (openh323_1.11.2.tar.gz) = 89ab27a6a8f4a73ffd9e19751bc78786
|
||||||
MD5 (pwlib_1.3.11.tar.gz) = da68d42d18a1b4aac93aaa2a9520de00
|
MD5 (pwlib_1.4.7.tar.gz) = 24f2b7f2e983f48141d9657931f16fc4
|
||||||
|
|||||||
@ -1,21 +0,0 @@
|
|||||||
*** openh323u.mak.orig Wed May 22 00:57:21 2002
|
|
||||||
--- openh323u.mak Wed May 22 00:57:51 2002
|
|
||||||
*************** HAS_IXJ = 1
|
|
||||||
*** 139,144 ****
|
|
||||||
--- 139,154 ----
|
|
||||||
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))
|
|
||||||
HAS_OSS = 1
|
|
||||||
STDCCFLAGS += -DHAS_OSS
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
*** ../pwlib/src/ptlib/unix/Makefile.orig Sun Oct 27 15:54:26 2002
|
|
||||||
--- ../pwlib/src/ptlib/unix/Makefile Sun Oct 27 15:54:56 2002
|
|
||||||
*************** $(DEPDIR)/getdate.tab.dep: $(GETDATE_SOU
|
|
||||||
*** 553,559 ****
|
|
||||||
$(CC) $(STDCCFLAGS) -M $< >> $@
|
|
||||||
|
|
||||||
$(GETDATE_SOURCE): $(COMMON_SRC_DIR)/getdate.y
|
|
||||||
! bison $(COMMON_SRC_DIR)/getdate.y
|
|
||||||
|
|
||||||
#######################################################
|
|
||||||
|
|
||||||
--- 553,559 ----
|
|
||||||
$(CC) $(STDCCFLAGS) -M $< >> $@
|
|
||||||
|
|
||||||
$(GETDATE_SOURCE): $(COMMON_SRC_DIR)/getdate.y
|
|
||||||
! bison $(COMMON_SRC_DIR)/getdate.y -o $(COMMON_SRC_DIR)/getdate.tab.c
|
|
||||||
|
|
||||||
#######################################################
|
|
||||||
|
|
||||||
@ -1,51 +0,0 @@
|
|||||||
*** ../pwlib/src/ptlib/unix/video4bsd.cxx.orig Tue Oct 29 00:15:59 2002
|
|
||||||
--- ../pwlib/src/ptlib/unix/video4bsd.cxx Tue Oct 29 00:16:17 2002
|
|
||||||
***************
|
|
||||||
*** 24,29 ****
|
|
||||||
--- 24,32 ----
|
|
||||||
* Contributor(s): Roger Hardiman <roger@freebsd.org>
|
|
||||||
*
|
|
||||||
* $Log: video4bsd.cxx,v $
|
|
||||||
+ * Revision 1.20 2002/10/28 19:12:45 rogerh
|
|
||||||
+ * Add svideo input support for Lars Eggert <larse@isi.edu>
|
|
||||||
+ *
|
|
||||||
* Revision 1.19 2002/04/10 08:40:36 rogerh
|
|
||||||
* Simplify the SetVideoChannelFormat() code. Use the implementation in the
|
|
||||||
* ancestor class.
|
|
||||||
*************** BOOL PVideoInputDevice::Open(const PStri
|
|
||||||
*** 129,135 ****
|
|
||||||
videoCapability.minwidth = 32;
|
|
||||||
videoCapability.maxheight = 768;
|
|
||||||
videoCapability.maxwidth = 576;
|
|
||||||
! videoCapability.channels = 4;
|
|
||||||
|
|
||||||
// set height and width
|
|
||||||
frameHeight = videoCapability.maxheight;
|
|
||||||
--- 132,138 ----
|
|
||||||
videoCapability.minwidth = 32;
|
|
||||||
videoCapability.maxheight = 768;
|
|
||||||
videoCapability.maxwidth = 576;
|
|
||||||
! videoCapability.channels = 5;
|
|
||||||
|
|
||||||
// set height and width
|
|
||||||
frameHeight = videoCapability.maxheight;
|
|
||||||
*************** BOOL PVideoInputDevice::SetChannel(int n
|
|
||||||
*** 259,266 ****
|
|
||||||
return FALSE;
|
|
||||||
|
|
||||||
// set channel information
|
|
||||||
! static int chnl[4] = { METEOR_INPUT_DEV0, METEOR_INPUT_DEV1,
|
|
||||||
! METEOR_INPUT_DEV2, METEOR_INPUT_DEV3 };
|
|
||||||
int channel = chnl[newChannel];
|
|
||||||
|
|
||||||
// set the information
|
|
||||||
--- 262,270 ----
|
|
||||||
return FALSE;
|
|
||||||
|
|
||||||
// set channel information
|
|
||||||
! static int chnl[5] = { METEOR_INPUT_DEV0, METEOR_INPUT_DEV1,
|
|
||||||
! METEOR_INPUT_DEV2, METEOR_INPUT_DEV3,
|
|
||||||
! METEOR_INPUT_DEV_SVIDEO };
|
|
||||||
int channel = chnl[newChannel];
|
|
||||||
|
|
||||||
// set the information
|
|
||||||
@ -1,131 +0,0 @@
|
|||||||
*** ../pwlib/src/ptlib/common/object.cxx.orig Tue Oct 29 00:21:28 2002
|
|
||||||
--- ../pwlib/src/ptlib/common/object.cxx Tue Oct 29 00:22:07 2002
|
|
||||||
***************
|
|
||||||
*** 27,32 ****
|
|
||||||
--- 27,38 ----
|
|
||||||
* Contributor(s): ______________________________________.
|
|
||||||
*
|
|
||||||
* $Log: object.cxx,v $
|
|
||||||
+ * Revision 1.62 2002/10/21 12:52:27 rogerh
|
|
||||||
+ * Add throw()s to new and delete. Error reported by FreeBSD 5.0 and GCC 3.2.1
|
|
||||||
+ *
|
|
||||||
+ * Revision 1.61 2002/10/10 04:43:44 robertj
|
|
||||||
+ * VxWorks port, thanks Martijn Roest
|
|
||||||
+ *
|
|
||||||
* Revision 1.60 2002/09/06 05:29:42 craigs
|
|
||||||
* Reversed order of memory block check on delete to improve performance in
|
|
||||||
* Linux debug mode
|
|
||||||
*************** void PAssertFunc(const char * file, int
|
|
||||||
*** 308,332 ****
|
|
||||||
--- 314,354 ----
|
|
||||||
#undef free
|
|
||||||
|
|
||||||
|
|
||||||
+ #if __GNUC__ >= 3
|
|
||||||
+ void * operator new(size_t nSize) throw (std::bad_alloc)
|
|
||||||
+ #else
|
|
||||||
void * operator new(size_t nSize)
|
|
||||||
+ #endif
|
|
||||||
{
|
|
||||||
return PMemoryHeap::Allocate(nSize, (const char *)NULL, 0, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
+ #if __GNUC__ >= 3
|
|
||||||
+ void * operator new[](size_t nSize) throw (std::bad_alloc)
|
|
||||||
+ #else
|
|
||||||
void * operator new[](size_t nSize)
|
|
||||||
+ #endif
|
|
||||||
{
|
|
||||||
return PMemoryHeap::Allocate(nSize, (const char *)NULL, 0, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
+ #if __GNUC__ >= 3
|
|
||||||
+ void operator delete(void * ptr) throw()
|
|
||||||
+ #else
|
|
||||||
void operator delete(void * ptr)
|
|
||||||
+ #endif
|
|
||||||
{
|
|
||||||
PMemoryHeap::Deallocate(ptr, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
+ #if __GNUC__ >= 3
|
|
||||||
+ void operator delete[](void * ptr) throw()
|
|
||||||
+ #else
|
|
||||||
void operator delete[](void * ptr)
|
|
||||||
+ #endif
|
|
||||||
{
|
|
||||||
PMemoryHeap::Deallocate(ptr, NULL);
|
|
||||||
}
|
|
||||||
*************** void PMemoryHeap::InternalDumpObjectsSin
|
|
||||||
*** 814,829 ****
|
|
||||||
--- 836,863 ----
|
|
||||||
|
|
||||||
#else // PMEMORY_CHECK
|
|
||||||
|
|
||||||
+ #ifndef P_VXWORKS
|
|
||||||
+
|
|
||||||
+ #if __GNUC__ >= 3
|
|
||||||
+ void * operator new[](size_t nSize) throw (std::bad_alloc)
|
|
||||||
+ #else
|
|
||||||
void * operator new[](size_t nSize)
|
|
||||||
+ #endif
|
|
||||||
{
|
|
||||||
return malloc(nSize);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ #if __GNUC__ >= 3
|
|
||||||
+ void operator delete[](void * ptr) throw ()
|
|
||||||
+ #else
|
|
||||||
void operator delete[](void * ptr)
|
|
||||||
+ #endif
|
|
||||||
{
|
|
||||||
free(ptr);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ #endif // !P_VXWORKS
|
|
||||||
+
|
|
||||||
#endif // PMEMORY_CHECK
|
|
||||||
|
|
||||||
|
|
||||||
*************** istream & operator>>(istream & stream, P
|
|
||||||
*** 1505,1510 ****
|
|
||||||
--- 1539,1574 ----
|
|
||||||
|
|
||||||
|
|
||||||
#endif
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+ #ifdef P_TORNADO
|
|
||||||
+
|
|
||||||
+ // the library provided with Tornado 2.0 does not contain implementation
|
|
||||||
+ // for the functions defined below, therefor the own implementation
|
|
||||||
+
|
|
||||||
+ ostream & ostream::operator<<(PInt64 v)
|
|
||||||
+ {
|
|
||||||
+ return *this << (long)(v >> 32) << (long)(v & 0xFFFFFFFF);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+ ostream & ostream::operator<<(PUInt64 v)
|
|
||||||
+ {
|
|
||||||
+ return *this << (long)(v >> 32) << (long)(v & 0xFFFFFFFF);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ istream & istream::operator>>(PInt64 & v)
|
|
||||||
+ {
|
|
||||||
+ return *this >> (long)(v >> 32) >> (long)(v & 0xFFFFFFFF);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+ istream & istream::operator>>(PUInt64 & v)
|
|
||||||
+ {
|
|
||||||
+ return *this >> (long)(v >> 32) >> (long)(v & 0xFFFFFFFF);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ #endif // P_TORNADO
|
|
||||||
|
|
||||||
|
|
||||||
// End Of File ///////////////////////////////////////////////////////////////
|
|
||||||
35
net/opal3/files/patch-openh323u
Normal file
35
net/opal3/files/patch-openh323u
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
*** 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))
|
||||||
@ -1,7 +1,7 @@
|
|||||||
*** ../pwlib/make/unix.mak.orig Tue May 7 02:57:51 2002
|
*** ../pwlib/make/unix.mak.orig Fri Nov 22 10:59:27 2002
|
||||||
--- ../pwlib/make/unix.mak Wed May 22 00:53:00 2002
|
--- ../pwlib/make/unix.mak Tue Jan 28 13:51:15 2003
|
||||||
*************** ifeq ($(OSTYPE),FreeBSD)
|
*************** ifeq ($(OSTYPE),FreeBSD)
|
||||||
*** 644,654 ****
|
*** 770,780 ****
|
||||||
|
|
||||||
P_PTHREADS := 1
|
P_PTHREADS := 1
|
||||||
|
|
||||||
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
ifndef OSRELEASE
|
ifndef OSRELEASE
|
||||||
OSRELEASE := $(shell sysctl -n kern.osreldate)
|
OSRELEASE := $(shell sysctl -n kern.osreldate)
|
||||||
--- 644,654 ----
|
--- 770,780 ----
|
||||||
|
|
||||||
P_PTHREADS := 1
|
P_PTHREADS := 1
|
||||||
|
|
||||||
@ -25,8 +25,22 @@
|
|||||||
|
|
||||||
ifndef OSRELEASE
|
ifndef OSRELEASE
|
||||||
OSRELEASE := $(shell sysctl -n kern.osreldate)
|
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)
|
*************** LDFLAGS += $(DEBLDFLAGS)
|
||||||
*** 1136,1142 ****
|
*** 1375,1381 ****
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
||||||
@ -34,7 +48,7 @@
|
|||||||
#OPTCCFLAGS += -DP_USE_INLINES=1
|
#OPTCCFLAGS += -DP_USE_INLINES=1
|
||||||
#OPTCCFLAGS += -fconserve-space
|
#OPTCCFLAGS += -fconserve-space
|
||||||
ifneq ($(OSTYPE),Carbon)
|
ifneq ($(OSTYPE),Carbon)
|
||||||
--- 1136,1143 ----
|
--- 1371,1378 ----
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
||||||
@ -6,19 +6,17 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
PORTNAME= openh323
|
PORTNAME= openh323
|
||||||
PORTVERSION= 1.9.10
|
PORTVERSION= 1.11.2
|
||||||
PORTREVISION= 2
|
|
||||||
CATEGORIES= net
|
CATEGORIES= net
|
||||||
MASTER_SITES= http://www.openh323.org/bin/ \
|
MASTER_SITES= http://www.openh323.org/bin/ \
|
||||||
http://www.de.openh323.org/bin/ \
|
http://www.de.openh323.org/bin/ \
|
||||||
http://www.gnomemeeting.org/downloads/0.94.1/sources/
|
http://www.gnomemeeting.org/downloads/0.94.1/sources/
|
||||||
DISTFILES= openh323_1.9.10.tar.gz \
|
DISTFILES= openh323_1.11.2.tar.gz \
|
||||||
pwlib_1.3.11.tar.gz
|
pwlib_1.4.7.tar.gz
|
||||||
|
|
||||||
MAINTAINER= roger@freebsd.org
|
MAINTAINER= roger@freebsd.org
|
||||||
|
|
||||||
LIB_DEPENDS= speex.0:${PORTSDIR}/audio/speex \
|
LIB_DEPENDS= expat.4:${PORTSDIR}/textproc/expat2
|
||||||
expat.4:${PORTSDIR}/textproc/expat2
|
|
||||||
|
|
||||||
.include <bsd.port.pre.mk>
|
.include <bsd.port.pre.mk>
|
||||||
.if ${OSVERSION} < 500000
|
.if ${OSVERSION} < 500000
|
||||||
|
|||||||
@ -1,2 +1,2 @@
|
|||||||
MD5 (openh323_1.9.10.tar.gz) = 4efbe1356cb26b8442add3cc4cfba91d
|
MD5 (openh323_1.11.2.tar.gz) = 89ab27a6a8f4a73ffd9e19751bc78786
|
||||||
MD5 (pwlib_1.3.11.tar.gz) = da68d42d18a1b4aac93aaa2a9520de00
|
MD5 (pwlib_1.4.7.tar.gz) = 24f2b7f2e983f48141d9657931f16fc4
|
||||||
|
|||||||
@ -1,21 +0,0 @@
|
|||||||
*** openh323u.mak.orig Wed May 22 00:57:21 2002
|
|
||||||
--- openh323u.mak Wed May 22 00:57:51 2002
|
|
||||||
*************** HAS_IXJ = 1
|
|
||||||
*** 139,144 ****
|
|
||||||
--- 139,154 ----
|
|
||||||
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))
|
|
||||||
HAS_OSS = 1
|
|
||||||
STDCCFLAGS += -DHAS_OSS
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
*** ../pwlib/src/ptlib/unix/Makefile.orig Sun Oct 27 15:54:26 2002
|
|
||||||
--- ../pwlib/src/ptlib/unix/Makefile Sun Oct 27 15:54:56 2002
|
|
||||||
*************** $(DEPDIR)/getdate.tab.dep: $(GETDATE_SOU
|
|
||||||
*** 553,559 ****
|
|
||||||
$(CC) $(STDCCFLAGS) -M $< >> $@
|
|
||||||
|
|
||||||
$(GETDATE_SOURCE): $(COMMON_SRC_DIR)/getdate.y
|
|
||||||
! bison $(COMMON_SRC_DIR)/getdate.y
|
|
||||||
|
|
||||||
#######################################################
|
|
||||||
|
|
||||||
--- 553,559 ----
|
|
||||||
$(CC) $(STDCCFLAGS) -M $< >> $@
|
|
||||||
|
|
||||||
$(GETDATE_SOURCE): $(COMMON_SRC_DIR)/getdate.y
|
|
||||||
! bison $(COMMON_SRC_DIR)/getdate.y -o $(COMMON_SRC_DIR)/getdate.tab.c
|
|
||||||
|
|
||||||
#######################################################
|
|
||||||
|
|
||||||
@ -1,51 +0,0 @@
|
|||||||
*** ../pwlib/src/ptlib/unix/video4bsd.cxx.orig Tue Oct 29 00:15:59 2002
|
|
||||||
--- ../pwlib/src/ptlib/unix/video4bsd.cxx Tue Oct 29 00:16:17 2002
|
|
||||||
***************
|
|
||||||
*** 24,29 ****
|
|
||||||
--- 24,32 ----
|
|
||||||
* Contributor(s): Roger Hardiman <roger@freebsd.org>
|
|
||||||
*
|
|
||||||
* $Log: video4bsd.cxx,v $
|
|
||||||
+ * Revision 1.20 2002/10/28 19:12:45 rogerh
|
|
||||||
+ * Add svideo input support for Lars Eggert <larse@isi.edu>
|
|
||||||
+ *
|
|
||||||
* Revision 1.19 2002/04/10 08:40:36 rogerh
|
|
||||||
* Simplify the SetVideoChannelFormat() code. Use the implementation in the
|
|
||||||
* ancestor class.
|
|
||||||
*************** BOOL PVideoInputDevice::Open(const PStri
|
|
||||||
*** 129,135 ****
|
|
||||||
videoCapability.minwidth = 32;
|
|
||||||
videoCapability.maxheight = 768;
|
|
||||||
videoCapability.maxwidth = 576;
|
|
||||||
! videoCapability.channels = 4;
|
|
||||||
|
|
||||||
// set height and width
|
|
||||||
frameHeight = videoCapability.maxheight;
|
|
||||||
--- 132,138 ----
|
|
||||||
videoCapability.minwidth = 32;
|
|
||||||
videoCapability.maxheight = 768;
|
|
||||||
videoCapability.maxwidth = 576;
|
|
||||||
! videoCapability.channels = 5;
|
|
||||||
|
|
||||||
// set height and width
|
|
||||||
frameHeight = videoCapability.maxheight;
|
|
||||||
*************** BOOL PVideoInputDevice::SetChannel(int n
|
|
||||||
*** 259,266 ****
|
|
||||||
return FALSE;
|
|
||||||
|
|
||||||
// set channel information
|
|
||||||
! static int chnl[4] = { METEOR_INPUT_DEV0, METEOR_INPUT_DEV1,
|
|
||||||
! METEOR_INPUT_DEV2, METEOR_INPUT_DEV3 };
|
|
||||||
int channel = chnl[newChannel];
|
|
||||||
|
|
||||||
// set the information
|
|
||||||
--- 262,270 ----
|
|
||||||
return FALSE;
|
|
||||||
|
|
||||||
// set channel information
|
|
||||||
! static int chnl[5] = { METEOR_INPUT_DEV0, METEOR_INPUT_DEV1,
|
|
||||||
! METEOR_INPUT_DEV2, METEOR_INPUT_DEV3,
|
|
||||||
! METEOR_INPUT_DEV_SVIDEO };
|
|
||||||
int channel = chnl[newChannel];
|
|
||||||
|
|
||||||
// set the information
|
|
||||||
@ -1,131 +0,0 @@
|
|||||||
*** ../pwlib/src/ptlib/common/object.cxx.orig Tue Oct 29 00:21:28 2002
|
|
||||||
--- ../pwlib/src/ptlib/common/object.cxx Tue Oct 29 00:22:07 2002
|
|
||||||
***************
|
|
||||||
*** 27,32 ****
|
|
||||||
--- 27,38 ----
|
|
||||||
* Contributor(s): ______________________________________.
|
|
||||||
*
|
|
||||||
* $Log: object.cxx,v $
|
|
||||||
+ * Revision 1.62 2002/10/21 12:52:27 rogerh
|
|
||||||
+ * Add throw()s to new and delete. Error reported by FreeBSD 5.0 and GCC 3.2.1
|
|
||||||
+ *
|
|
||||||
+ * Revision 1.61 2002/10/10 04:43:44 robertj
|
|
||||||
+ * VxWorks port, thanks Martijn Roest
|
|
||||||
+ *
|
|
||||||
* Revision 1.60 2002/09/06 05:29:42 craigs
|
|
||||||
* Reversed order of memory block check on delete to improve performance in
|
|
||||||
* Linux debug mode
|
|
||||||
*************** void PAssertFunc(const char * file, int
|
|
||||||
*** 308,332 ****
|
|
||||||
--- 314,354 ----
|
|
||||||
#undef free
|
|
||||||
|
|
||||||
|
|
||||||
+ #if __GNUC__ >= 3
|
|
||||||
+ void * operator new(size_t nSize) throw (std::bad_alloc)
|
|
||||||
+ #else
|
|
||||||
void * operator new(size_t nSize)
|
|
||||||
+ #endif
|
|
||||||
{
|
|
||||||
return PMemoryHeap::Allocate(nSize, (const char *)NULL, 0, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
+ #if __GNUC__ >= 3
|
|
||||||
+ void * operator new[](size_t nSize) throw (std::bad_alloc)
|
|
||||||
+ #else
|
|
||||||
void * operator new[](size_t nSize)
|
|
||||||
+ #endif
|
|
||||||
{
|
|
||||||
return PMemoryHeap::Allocate(nSize, (const char *)NULL, 0, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
+ #if __GNUC__ >= 3
|
|
||||||
+ void operator delete(void * ptr) throw()
|
|
||||||
+ #else
|
|
||||||
void operator delete(void * ptr)
|
|
||||||
+ #endif
|
|
||||||
{
|
|
||||||
PMemoryHeap::Deallocate(ptr, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
+ #if __GNUC__ >= 3
|
|
||||||
+ void operator delete[](void * ptr) throw()
|
|
||||||
+ #else
|
|
||||||
void operator delete[](void * ptr)
|
|
||||||
+ #endif
|
|
||||||
{
|
|
||||||
PMemoryHeap::Deallocate(ptr, NULL);
|
|
||||||
}
|
|
||||||
*************** void PMemoryHeap::InternalDumpObjectsSin
|
|
||||||
*** 814,829 ****
|
|
||||||
--- 836,863 ----
|
|
||||||
|
|
||||||
#else // PMEMORY_CHECK
|
|
||||||
|
|
||||||
+ #ifndef P_VXWORKS
|
|
||||||
+
|
|
||||||
+ #if __GNUC__ >= 3
|
|
||||||
+ void * operator new[](size_t nSize) throw (std::bad_alloc)
|
|
||||||
+ #else
|
|
||||||
void * operator new[](size_t nSize)
|
|
||||||
+ #endif
|
|
||||||
{
|
|
||||||
return malloc(nSize);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ #if __GNUC__ >= 3
|
|
||||||
+ void operator delete[](void * ptr) throw ()
|
|
||||||
+ #else
|
|
||||||
void operator delete[](void * ptr)
|
|
||||||
+ #endif
|
|
||||||
{
|
|
||||||
free(ptr);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ #endif // !P_VXWORKS
|
|
||||||
+
|
|
||||||
#endif // PMEMORY_CHECK
|
|
||||||
|
|
||||||
|
|
||||||
*************** istream & operator>>(istream & stream, P
|
|
||||||
*** 1505,1510 ****
|
|
||||||
--- 1539,1574 ----
|
|
||||||
|
|
||||||
|
|
||||||
#endif
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+ #ifdef P_TORNADO
|
|
||||||
+
|
|
||||||
+ // the library provided with Tornado 2.0 does not contain implementation
|
|
||||||
+ // for the functions defined below, therefor the own implementation
|
|
||||||
+
|
|
||||||
+ ostream & ostream::operator<<(PInt64 v)
|
|
||||||
+ {
|
|
||||||
+ return *this << (long)(v >> 32) << (long)(v & 0xFFFFFFFF);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+ ostream & ostream::operator<<(PUInt64 v)
|
|
||||||
+ {
|
|
||||||
+ return *this << (long)(v >> 32) << (long)(v & 0xFFFFFFFF);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ istream & istream::operator>>(PInt64 & v)
|
|
||||||
+ {
|
|
||||||
+ return *this >> (long)(v >> 32) >> (long)(v & 0xFFFFFFFF);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+ istream & istream::operator>>(PUInt64 & v)
|
|
||||||
+ {
|
|
||||||
+ return *this >> (long)(v >> 32) >> (long)(v & 0xFFFFFFFF);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ #endif // P_TORNADO
|
|
||||||
|
|
||||||
|
|
||||||
// End Of File ///////////////////////////////////////////////////////////////
|
|
||||||
35
net/openh323-112/files/patch-openh323u
Normal file
35
net/openh323-112/files/patch-openh323u
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
*** 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))
|
||||||
@ -1,7 +1,7 @@
|
|||||||
*** ../pwlib/make/unix.mak.orig Tue May 7 02:57:51 2002
|
*** ../pwlib/make/unix.mak.orig Fri Nov 22 10:59:27 2002
|
||||||
--- ../pwlib/make/unix.mak Wed May 22 00:53:00 2002
|
--- ../pwlib/make/unix.mak Tue Jan 28 13:51:15 2003
|
||||||
*************** ifeq ($(OSTYPE),FreeBSD)
|
*************** ifeq ($(OSTYPE),FreeBSD)
|
||||||
*** 644,654 ****
|
*** 770,780 ****
|
||||||
|
|
||||||
P_PTHREADS := 1
|
P_PTHREADS := 1
|
||||||
|
|
||||||
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
ifndef OSRELEASE
|
ifndef OSRELEASE
|
||||||
OSRELEASE := $(shell sysctl -n kern.osreldate)
|
OSRELEASE := $(shell sysctl -n kern.osreldate)
|
||||||
--- 644,654 ----
|
--- 770,780 ----
|
||||||
|
|
||||||
P_PTHREADS := 1
|
P_PTHREADS := 1
|
||||||
|
|
||||||
@ -25,8 +25,22 @@
|
|||||||
|
|
||||||
ifndef OSRELEASE
|
ifndef OSRELEASE
|
||||||
OSRELEASE := $(shell sysctl -n kern.osreldate)
|
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)
|
*************** LDFLAGS += $(DEBLDFLAGS)
|
||||||
*** 1136,1142 ****
|
*** 1375,1381 ****
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
||||||
@ -34,7 +48,7 @@
|
|||||||
#OPTCCFLAGS += -DP_USE_INLINES=1
|
#OPTCCFLAGS += -DP_USE_INLINES=1
|
||||||
#OPTCCFLAGS += -fconserve-space
|
#OPTCCFLAGS += -fconserve-space
|
||||||
ifneq ($(OSTYPE),Carbon)
|
ifneq ($(OSTYPE),Carbon)
|
||||||
--- 1136,1143 ----
|
--- 1371,1378 ----
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
||||||
@ -6,19 +6,17 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
PORTNAME= openh323
|
PORTNAME= openh323
|
||||||
PORTVERSION= 1.9.10
|
PORTVERSION= 1.11.2
|
||||||
PORTREVISION= 2
|
|
||||||
CATEGORIES= net
|
CATEGORIES= net
|
||||||
MASTER_SITES= http://www.openh323.org/bin/ \
|
MASTER_SITES= http://www.openh323.org/bin/ \
|
||||||
http://www.de.openh323.org/bin/ \
|
http://www.de.openh323.org/bin/ \
|
||||||
http://www.gnomemeeting.org/downloads/0.94.1/sources/
|
http://www.gnomemeeting.org/downloads/0.94.1/sources/
|
||||||
DISTFILES= openh323_1.9.10.tar.gz \
|
DISTFILES= openh323_1.11.2.tar.gz \
|
||||||
pwlib_1.3.11.tar.gz
|
pwlib_1.4.7.tar.gz
|
||||||
|
|
||||||
MAINTAINER= roger@freebsd.org
|
MAINTAINER= roger@freebsd.org
|
||||||
|
|
||||||
LIB_DEPENDS= speex.0:${PORTSDIR}/audio/speex \
|
LIB_DEPENDS= expat.4:${PORTSDIR}/textproc/expat2
|
||||||
expat.4:${PORTSDIR}/textproc/expat2
|
|
||||||
|
|
||||||
.include <bsd.port.pre.mk>
|
.include <bsd.port.pre.mk>
|
||||||
.if ${OSVERSION} < 500000
|
.if ${OSVERSION} < 500000
|
||||||
|
|||||||
@ -1,2 +1,2 @@
|
|||||||
MD5 (openh323_1.9.10.tar.gz) = 4efbe1356cb26b8442add3cc4cfba91d
|
MD5 (openh323_1.11.2.tar.gz) = 89ab27a6a8f4a73ffd9e19751bc78786
|
||||||
MD5 (pwlib_1.3.11.tar.gz) = da68d42d18a1b4aac93aaa2a9520de00
|
MD5 (pwlib_1.4.7.tar.gz) = 24f2b7f2e983f48141d9657931f16fc4
|
||||||
|
|||||||
@ -1,21 +0,0 @@
|
|||||||
*** openh323u.mak.orig Wed May 22 00:57:21 2002
|
|
||||||
--- openh323u.mak Wed May 22 00:57:51 2002
|
|
||||||
*************** HAS_IXJ = 1
|
|
||||||
*** 139,144 ****
|
|
||||||
--- 139,154 ----
|
|
||||||
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))
|
|
||||||
HAS_OSS = 1
|
|
||||||
STDCCFLAGS += -DHAS_OSS
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
*** ../pwlib/src/ptlib/unix/Makefile.orig Sun Oct 27 15:54:26 2002
|
|
||||||
--- ../pwlib/src/ptlib/unix/Makefile Sun Oct 27 15:54:56 2002
|
|
||||||
*************** $(DEPDIR)/getdate.tab.dep: $(GETDATE_SOU
|
|
||||||
*** 553,559 ****
|
|
||||||
$(CC) $(STDCCFLAGS) -M $< >> $@
|
|
||||||
|
|
||||||
$(GETDATE_SOURCE): $(COMMON_SRC_DIR)/getdate.y
|
|
||||||
! bison $(COMMON_SRC_DIR)/getdate.y
|
|
||||||
|
|
||||||
#######################################################
|
|
||||||
|
|
||||||
--- 553,559 ----
|
|
||||||
$(CC) $(STDCCFLAGS) -M $< >> $@
|
|
||||||
|
|
||||||
$(GETDATE_SOURCE): $(COMMON_SRC_DIR)/getdate.y
|
|
||||||
! bison $(COMMON_SRC_DIR)/getdate.y -o $(COMMON_SRC_DIR)/getdate.tab.c
|
|
||||||
|
|
||||||
#######################################################
|
|
||||||
|
|
||||||
@ -1,51 +0,0 @@
|
|||||||
*** ../pwlib/src/ptlib/unix/video4bsd.cxx.orig Tue Oct 29 00:15:59 2002
|
|
||||||
--- ../pwlib/src/ptlib/unix/video4bsd.cxx Tue Oct 29 00:16:17 2002
|
|
||||||
***************
|
|
||||||
*** 24,29 ****
|
|
||||||
--- 24,32 ----
|
|
||||||
* Contributor(s): Roger Hardiman <roger@freebsd.org>
|
|
||||||
*
|
|
||||||
* $Log: video4bsd.cxx,v $
|
|
||||||
+ * Revision 1.20 2002/10/28 19:12:45 rogerh
|
|
||||||
+ * Add svideo input support for Lars Eggert <larse@isi.edu>
|
|
||||||
+ *
|
|
||||||
* Revision 1.19 2002/04/10 08:40:36 rogerh
|
|
||||||
* Simplify the SetVideoChannelFormat() code. Use the implementation in the
|
|
||||||
* ancestor class.
|
|
||||||
*************** BOOL PVideoInputDevice::Open(const PStri
|
|
||||||
*** 129,135 ****
|
|
||||||
videoCapability.minwidth = 32;
|
|
||||||
videoCapability.maxheight = 768;
|
|
||||||
videoCapability.maxwidth = 576;
|
|
||||||
! videoCapability.channels = 4;
|
|
||||||
|
|
||||||
// set height and width
|
|
||||||
frameHeight = videoCapability.maxheight;
|
|
||||||
--- 132,138 ----
|
|
||||||
videoCapability.minwidth = 32;
|
|
||||||
videoCapability.maxheight = 768;
|
|
||||||
videoCapability.maxwidth = 576;
|
|
||||||
! videoCapability.channels = 5;
|
|
||||||
|
|
||||||
// set height and width
|
|
||||||
frameHeight = videoCapability.maxheight;
|
|
||||||
*************** BOOL PVideoInputDevice::SetChannel(int n
|
|
||||||
*** 259,266 ****
|
|
||||||
return FALSE;
|
|
||||||
|
|
||||||
// set channel information
|
|
||||||
! static int chnl[4] = { METEOR_INPUT_DEV0, METEOR_INPUT_DEV1,
|
|
||||||
! METEOR_INPUT_DEV2, METEOR_INPUT_DEV3 };
|
|
||||||
int channel = chnl[newChannel];
|
|
||||||
|
|
||||||
// set the information
|
|
||||||
--- 262,270 ----
|
|
||||||
return FALSE;
|
|
||||||
|
|
||||||
// set channel information
|
|
||||||
! static int chnl[5] = { METEOR_INPUT_DEV0, METEOR_INPUT_DEV1,
|
|
||||||
! METEOR_INPUT_DEV2, METEOR_INPUT_DEV3,
|
|
||||||
! METEOR_INPUT_DEV_SVIDEO };
|
|
||||||
int channel = chnl[newChannel];
|
|
||||||
|
|
||||||
// set the information
|
|
||||||
@ -1,131 +0,0 @@
|
|||||||
*** ../pwlib/src/ptlib/common/object.cxx.orig Tue Oct 29 00:21:28 2002
|
|
||||||
--- ../pwlib/src/ptlib/common/object.cxx Tue Oct 29 00:22:07 2002
|
|
||||||
***************
|
|
||||||
*** 27,32 ****
|
|
||||||
--- 27,38 ----
|
|
||||||
* Contributor(s): ______________________________________.
|
|
||||||
*
|
|
||||||
* $Log: object.cxx,v $
|
|
||||||
+ * Revision 1.62 2002/10/21 12:52:27 rogerh
|
|
||||||
+ * Add throw()s to new and delete. Error reported by FreeBSD 5.0 and GCC 3.2.1
|
|
||||||
+ *
|
|
||||||
+ * Revision 1.61 2002/10/10 04:43:44 robertj
|
|
||||||
+ * VxWorks port, thanks Martijn Roest
|
|
||||||
+ *
|
|
||||||
* Revision 1.60 2002/09/06 05:29:42 craigs
|
|
||||||
* Reversed order of memory block check on delete to improve performance in
|
|
||||||
* Linux debug mode
|
|
||||||
*************** void PAssertFunc(const char * file, int
|
|
||||||
*** 308,332 ****
|
|
||||||
--- 314,354 ----
|
|
||||||
#undef free
|
|
||||||
|
|
||||||
|
|
||||||
+ #if __GNUC__ >= 3
|
|
||||||
+ void * operator new(size_t nSize) throw (std::bad_alloc)
|
|
||||||
+ #else
|
|
||||||
void * operator new(size_t nSize)
|
|
||||||
+ #endif
|
|
||||||
{
|
|
||||||
return PMemoryHeap::Allocate(nSize, (const char *)NULL, 0, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
+ #if __GNUC__ >= 3
|
|
||||||
+ void * operator new[](size_t nSize) throw (std::bad_alloc)
|
|
||||||
+ #else
|
|
||||||
void * operator new[](size_t nSize)
|
|
||||||
+ #endif
|
|
||||||
{
|
|
||||||
return PMemoryHeap::Allocate(nSize, (const char *)NULL, 0, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
+ #if __GNUC__ >= 3
|
|
||||||
+ void operator delete(void * ptr) throw()
|
|
||||||
+ #else
|
|
||||||
void operator delete(void * ptr)
|
|
||||||
+ #endif
|
|
||||||
{
|
|
||||||
PMemoryHeap::Deallocate(ptr, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
+ #if __GNUC__ >= 3
|
|
||||||
+ void operator delete[](void * ptr) throw()
|
|
||||||
+ #else
|
|
||||||
void operator delete[](void * ptr)
|
|
||||||
+ #endif
|
|
||||||
{
|
|
||||||
PMemoryHeap::Deallocate(ptr, NULL);
|
|
||||||
}
|
|
||||||
*************** void PMemoryHeap::InternalDumpObjectsSin
|
|
||||||
*** 814,829 ****
|
|
||||||
--- 836,863 ----
|
|
||||||
|
|
||||||
#else // PMEMORY_CHECK
|
|
||||||
|
|
||||||
+ #ifndef P_VXWORKS
|
|
||||||
+
|
|
||||||
+ #if __GNUC__ >= 3
|
|
||||||
+ void * operator new[](size_t nSize) throw (std::bad_alloc)
|
|
||||||
+ #else
|
|
||||||
void * operator new[](size_t nSize)
|
|
||||||
+ #endif
|
|
||||||
{
|
|
||||||
return malloc(nSize);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ #if __GNUC__ >= 3
|
|
||||||
+ void operator delete[](void * ptr) throw ()
|
|
||||||
+ #else
|
|
||||||
void operator delete[](void * ptr)
|
|
||||||
+ #endif
|
|
||||||
{
|
|
||||||
free(ptr);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ #endif // !P_VXWORKS
|
|
||||||
+
|
|
||||||
#endif // PMEMORY_CHECK
|
|
||||||
|
|
||||||
|
|
||||||
*************** istream & operator>>(istream & stream, P
|
|
||||||
*** 1505,1510 ****
|
|
||||||
--- 1539,1574 ----
|
|
||||||
|
|
||||||
|
|
||||||
#endif
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+ #ifdef P_TORNADO
|
|
||||||
+
|
|
||||||
+ // the library provided with Tornado 2.0 does not contain implementation
|
|
||||||
+ // for the functions defined below, therefor the own implementation
|
|
||||||
+
|
|
||||||
+ ostream & ostream::operator<<(PInt64 v)
|
|
||||||
+ {
|
|
||||||
+ return *this << (long)(v >> 32) << (long)(v & 0xFFFFFFFF);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+ ostream & ostream::operator<<(PUInt64 v)
|
|
||||||
+ {
|
|
||||||
+ return *this << (long)(v >> 32) << (long)(v & 0xFFFFFFFF);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ istream & istream::operator>>(PInt64 & v)
|
|
||||||
+ {
|
|
||||||
+ return *this >> (long)(v >> 32) >> (long)(v & 0xFFFFFFFF);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+ istream & istream::operator>>(PUInt64 & v)
|
|
||||||
+ {
|
|
||||||
+ return *this >> (long)(v >> 32) >> (long)(v & 0xFFFFFFFF);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ #endif // P_TORNADO
|
|
||||||
|
|
||||||
|
|
||||||
// End Of File ///////////////////////////////////////////////////////////////
|
|
||||||
35
net/openh323/files/patch-openh323u
Normal file
35
net/openh323/files/patch-openh323u
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
*** 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))
|
||||||
@ -1,7 +1,7 @@
|
|||||||
*** ../pwlib/make/unix.mak.orig Tue May 7 02:57:51 2002
|
*** ../pwlib/make/unix.mak.orig Fri Nov 22 10:59:27 2002
|
||||||
--- ../pwlib/make/unix.mak Wed May 22 00:53:00 2002
|
--- ../pwlib/make/unix.mak Tue Jan 28 13:51:15 2003
|
||||||
*************** ifeq ($(OSTYPE),FreeBSD)
|
*************** ifeq ($(OSTYPE),FreeBSD)
|
||||||
*** 644,654 ****
|
*** 770,780 ****
|
||||||
|
|
||||||
P_PTHREADS := 1
|
P_PTHREADS := 1
|
||||||
|
|
||||||
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
ifndef OSRELEASE
|
ifndef OSRELEASE
|
||||||
OSRELEASE := $(shell sysctl -n kern.osreldate)
|
OSRELEASE := $(shell sysctl -n kern.osreldate)
|
||||||
--- 644,654 ----
|
--- 770,780 ----
|
||||||
|
|
||||||
P_PTHREADS := 1
|
P_PTHREADS := 1
|
||||||
|
|
||||||
@ -25,8 +25,22 @@
|
|||||||
|
|
||||||
ifndef OSRELEASE
|
ifndef OSRELEASE
|
||||||
OSRELEASE := $(shell sysctl -n kern.osreldate)
|
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)
|
*************** LDFLAGS += $(DEBLDFLAGS)
|
||||||
*** 1136,1142 ****
|
*** 1375,1381 ****
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
||||||
@ -34,7 +48,7 @@
|
|||||||
#OPTCCFLAGS += -DP_USE_INLINES=1
|
#OPTCCFLAGS += -DP_USE_INLINES=1
|
||||||
#OPTCCFLAGS += -fconserve-space
|
#OPTCCFLAGS += -fconserve-space
|
||||||
ifneq ($(OSTYPE),Carbon)
|
ifneq ($(OSTYPE),Carbon)
|
||||||
--- 1136,1143 ----
|
--- 1371,1378 ----
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user