diff options
| author | Roger Hardiman <roger@FreeBSD.org> | 2003-08-28 07:14:38 +0000 |
|---|---|---|
| committer | Roger Hardiman <roger@FreeBSD.org> | 2003-08-28 07:14:38 +0000 |
| commit | 027cf3add782478a3afce1c22b53f52499a45819 (patch) | |
| tree | 1a637704724d28776557963322dbc154ee8ee61b /net/ohphone | |
| parent | Upgrade to 1.12.0. (diff) | |
Upgrade to ver 1.4.1
Notes
Notes:
svn path=/head/; revision=87835
Diffstat (limited to 'net/ohphone')
| -rw-r--r-- | net/ohphone/Makefile | 6 | ||||
| -rw-r--r-- | net/ohphone/distinfo | 2 | ||||
| -rw-r--r-- | net/ohphone/files/patch-main | 69 |
3 files changed, 73 insertions, 4 deletions
diff --git a/net/ohphone/Makefile b/net/ohphone/Makefile index dae07e501018..806a89de0c49 100644 --- a/net/ohphone/Makefile +++ b/net/ohphone/Makefile @@ -6,12 +6,12 @@ # PORTNAME= ohphone -PORTVERSION= 1.3.5 +PORTVERSION= 1.4.1 CATEGORIES= net MASTER_SITES= http://www.openh323.org/bin/ \ http://www.de.openh323.org/bin/ \ http://www.ru.openh323.org/bin/ -DISTNAME= ohphone_${PORTVERSION} +DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= roger@FreeBSD.org COMMENT= H323 Video Conferencing Program, compatible with NetMeeting @@ -26,7 +26,7 @@ USE_BISON= yes USE_XLIB= yes USE_GMAKE= yes ALL_TARGET= optnoshared -MAKE_ENV= PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib \ +MAKE_ENV= PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib/work/pwlib \ OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323 THE_MACHTYPE= ${ARCH:S/i386/x86/} MAKE_ARGS= OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX} diff --git a/net/ohphone/distinfo b/net/ohphone/distinfo index 6dd14c7cae54..ce31e41a4868 100644 --- a/net/ohphone/distinfo +++ b/net/ohphone/distinfo @@ -1 +1 @@ -MD5 (ohphone_1.3.5.tar.gz) = edf220431f7778600dc376dfd78e878f +MD5 (ohphone_1.4.1.tar.gz) = f5b975db51589e2ed741367e20f75ed0 diff --git a/net/ohphone/files/patch-main b/net/ohphone/files/patch-main new file mode 100644 index 000000000000..4bb0c9d4db1f --- /dev/null +++ b/net/ohphone/files/patch-main @@ -0,0 +1,69 @@ +*** main.cxx.orig Mon Aug 4 05:07:54 2003 +--- main.cxx Sat Aug 23 09:17:04 2003 +*************** +*** 501,507 **** + #include <speexcodec.h> + #include "h261codec.h" + #include "h263codec.h" +! #include "ffh263codec.h" + #include "h323pdu.h" + #include "g726codec.h" + //#include "h323t120.h" +--- 501,507 ---- + #include <speexcodec.h> + #include "h261codec.h" + #include "h263codec.h" +! //#include "ffh263codec.h" + #include "h323pdu.h" + #include "g726codec.h" + //#include "h323t120.h" +*************** BOOL MyH323EndPoint::Initialise(PConfigA +*** 1519,1530 **** + } \ + } \ + +! #if H323_AVCODEC +! ADD_VIDEO_CAPAB (H323_FFH263Capability); +! #endif +! #if H323_VICH263 +! ADD_VIDEO_CAPAB (H323_H263Capability); +! #endif + + if (!videoReceiveDevice.IsEmpty()) { + if (videoSize == 1) { +--- 1519,1530 ---- + } \ + } \ + +! //#if H323_AVCODEC +! // ADD_VIDEO_CAPAB (H323_FFH263Capability); +! //#endif +! //#if H323_VICH263 +! // ADD_VIDEO_CAPAB (H323_H263Capability); +! //#endif + + if (!videoReceiveDevice.IsEmpty()) { + if (videoSize == 1) { +*************** void MyH323EndPoint::TestVideoGrabber(PC +*** 3609,3618 **** + + if (cap->IsDescendant(H323_H261Capability::Class())) + frame.SetPayloadType(RTP_DataFrame::H261); +! #if H323_AVCODEC +! else if (cap->IsDescendant(H323_FFH263Capability::Class())) +! frame.SetPayloadType(RTP_DataFrame::DynamicBase); +! #endif + frameCount = 0; + skipCount = 0; + PINDEX bitsEncoded = 0; +--- 3609,3618 ---- + + if (cap->IsDescendant(H323_H261Capability::Class())) + frame.SetPayloadType(RTP_DataFrame::H261); +! //#if H323_AVCODEC +! // else if (cap->IsDescendant(H323_FFH263Capability::Class())) +! // frame.SetPayloadType(RTP_DataFrame::DynamicBase); +! //#endif + frameCount = 0; + skipCount = 0; + PINDEX bitsEncoded = 0; |