diff options
Diffstat (limited to 'net/openh323/files')
| -rw-r--r-- | net/openh323/files/patch-ad | 51 | ||||
| -rw-r--r-- | net/openh323/files/patch-ae | 131 |
2 files changed, 182 insertions, 0 deletions
diff --git a/net/openh323/files/patch-ad b/net/openh323/files/patch-ad new file mode 100644 index 000000000000..af0be448519a --- /dev/null +++ b/net/openh323/files/patch-ad @@ -0,0 +1,51 @@ +*** ../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 diff --git a/net/openh323/files/patch-ae b/net/openh323/files/patch-ae new file mode 100644 index 000000000000..35ba7fc56b4c --- /dev/null +++ b/net/openh323/files/patch-ae @@ -0,0 +1,131 @@ +*** ../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 /////////////////////////////////////////////////////////////// |