Attachment #64097 for bug #95424

View | Details | Raw Unified | Return to bug 95424
Collapse All | Expand All




#

PORTNAME=	ohphone
PORTVERSION=	1.4.5
PORTREVISION=	2
CATEGORIES=	net
MASTER_SITES=	ftp://ftp.frm2.tum..de/pub/jpulz/FreeBSD/distfiles
		http://www.de.openh323.org/bin/ \
		http://www.ru.openh323.org/bin/
DISTNAME=	${PORTNAME}_${PORTVERSION}

MAINTAINER=	Joerg.Pulz@frm2.tum.de
COMMENT=	H323 Video Conferencing Program, compatible with NetMeeting

LIB_DEPENDS=	h323_r.1:${PORTSDIR}/net/openh323

BROKEN=		Incomplete dependency list

WRKSRC=		${WRKDIR}/${PORTNAME}

NOCLEANDEPENDS=	yes

USE_BISON=	yes
USE_XLIB=	yes
USE_GMAKE=	yes
ALL_TARGET=	optshared
MAKE_ENV=	PWLIBDIR=${LOCALBASE}/share/pwlib \
		OPENH323DIR=${LOCALBASE}/share/openh323 \
		SYSLIBDIR=${LOCALBASE}/lib
MAKE_ARGS=	OSTYPE=${OPSYS} MACHTYPE=${ARCH:S/i386/x86/} \
		OSRELEASE=${OSVERSION} CPLUS=${CXX}

MAN1=		ohphone.1

PLIST_SUB=	PORTNAME=${PORTNAME}
DOCSDIR=	${PREFIX}/share/doc/openh323
EXAMPLESDIR=	${PREFIX}/share/examples/openh323

.include <bsd.port.pre.mk>

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/obj_r/ohphone ${PREFIX}/bin
	${INSTALL_MAN} ${WRKSRC}/ohphone.1 ${PREFIX}/man/man1
.if !defined(NOPORTDOCS)
	${MKDIR} ${DOCSDIR}/${PORTNAME}
	${INSTALL_DATA} ${WRKSRC}/ReadMe.txt ${DOCSDIR}/${PORTNAME}
.endif
	${MKDIR} ${EXAMPLESDIR}/${PORTNAME}
	${INSTALL_DATA} ${WRKSRC}/check_listen.awk ${EXAMPLESDIR}/${PORTNAME}
	${INSTALL_DATA} ${WRKSRC}/regtest ${EXAMPLESDIR}/${PORTNAME}
	${INSTALL_DATA} ${WRKSRC}/stresstest ${EXAMPLESDIR}/${PORTNAME}

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (ohphone_1.4.1.tar.gz) = f5b975db51589e2ed741367e20f75ed0	1	MD5 (ohphone-1.4.5.tar.gz) = 87328457be0a44d8805a4d4e10057092
2	SHA256 (ohphone_1.4.1.tar.gz) = 277987557f821b54126867a19312fe83444fe15fc035e83ddd6879ce87176355	2	SHA256 (ohphone-1.4.5.tar.gz) = 62e3038341d940700d186f68fff9a4b38c891d7afc6562e5afa9c31789b96d3d
3	SIZE (ohphone_1.4.1.tar.gz) = 77085	3	SIZE (ohphone-1.4.5.tar.gz) = 75743

Added Link Here

(-)pkg-plist (+9 lines)
1	bin/ohphone
2	%%EXAMPLESDIR%%/%%PORTNAME%%/check_listen.awk
3	%%EXAMPLESDIR%%/%%PORTNAME%%/regtest
4	%%EXAMPLESDIR%%/%%PORTNAME%%/stresstest
5	@dirrm %%EXAMPLESDIR%%/%%PORTNAME%%
6	@dirrmtry %%EXAMPLESDIR%%
7	%%PORTDOCS%%%%DOCSDIR%%/%%PORTNAME%%/ReadMe.txt
8	%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%PORTNAME%%
9	%%PORTDOCS%%@dirrmtry %%DOCSDIR%%




*** 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;

Return to bug 95424

Lines 6-43 Link Here

(-)Makefile (-22 / +27 lines)
6	#	6	#
7		7
8	PORTNAME= ohphone	8	PORTNAME= ohphone
9	PORTVERSION= 1.4.1	9	PORTVERSION= 1.4.5
10	PORTREVISION= 2
11	CATEGORIES= net	10	CATEGORIES= net
12	MASTER_SITES= http://www.openh323.org/bin/ \	11	MASTER_SITES= ftp://ftp.frm2.tum..de/pub/jpulz/FreeBSD/distfiles
13	http://www.de.openh323.org/bin/ \
14	http://www.ru.openh323.org/bin/
15	DISTNAME= ${PORTNAME}_${PORTVERSION}
16		12
17	MAINTAINER= ports@FreeBSD.org	13	MAINTAINER= Joerg.Pulz@frm2.tum.de
18	COMMENT= H323 Video Conferencing Program, compatible with NetMeeting	14	COMMENT= H323 Video Conferencing Program, compatible with NetMeeting
19		15
20	BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/net/openh323-112:build	16	LIB_DEPENDS= h323_r.1:${PORTSDIR}/net/openh323
21
22	BROKEN= Incomplete dependency list
23
24	WRKSRC= ${WRKDIR}/${PORTNAME}
25
26	NOCLEANDEPENDS= yes
27		17
28	USE_BISON= yes	18	USE_BISON= yes
29	USE_XLIB= yes	19	USE_XLIB= yes
30	USE_GMAKE= yes	20	USE_GMAKE= yes
31	ALL_TARGET= optnoshared	21	ALL_TARGET= optshared
32	MAKE_ENV= PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib152/work/pwlib \	22	MAKE_ENV= PWLIBDIR=${LOCALBASE}/share/pwlib \
33	OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323-112/work/openh323	23	OPENH323DIR=${LOCALBASE}/share/openh323 \
34	THE_MACHTYPE= ${ARCH:S/i386/x86/}	24	SYSLIBDIR=${LOCALBASE}/lib
35	MAKE_ARGS= OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX}	25	MAKE_ARGS= OSTYPE=${OPSYS} MACHTYPE=${ARCH:S/i386/x86/} \
		26	OSRELEASE=${OSVERSION} CPLUS=${CXX}
		27
36	MAN1= ohphone.1	28	MAN1= ohphone.1
37	PLIST_FILES= bin/ohphone	29
		30	PLIST_SUB= PORTNAME=${PORTNAME}
		31	DOCSDIR= ${PREFIX}/share/doc/openh323
		32	EXAMPLESDIR= ${PREFIX}/share/examples/openh323
		33
		34	.include <bsd.port.pre.mk>
38		35
39	do-install:	36	do-install:
40	${INSTALL_PROGRAM} ${WRKSRC}/obj_${OPSYS}_${THE_MACHTYPE}_r/ohphone ${PREFIX}/bin	37	${INSTALL_PROGRAM} ${WRKSRC}/obj_r/ohphone ${PREFIX}/bin
41	${INSTALL_MAN} ${WRKSRC}/ohphone.1 ${PREFIX}/man/man1	38	${INSTALL_MAN} ${WRKSRC}/ohphone.1 ${PREFIX}/man/man1
		39	.if !defined(NOPORTDOCS)
		40	${MKDIR} ${DOCSDIR}/${PORTNAME}
		41	${INSTALL_DATA} ${WRKSRC}/ReadMe.txt ${DOCSDIR}/${PORTNAME}
		42	.endif
		43	${MKDIR} ${EXAMPLESDIR}/${PORTNAME}
		44	${INSTALL_DATA} ${WRKSRC}/check_listen.awk ${EXAMPLESDIR}/${PORTNAME}
		45	${INSTALL_DATA} ${WRKSRC}/regtest ${EXAMPLESDIR}/${PORTNAME}
		46	${INSTALL_DATA} ${WRKSRC}/stresstest ${EXAMPLESDIR}/${PORTNAME}
42		47
43	.include <bsd.port.mk>	48	.include <bsd.port.post.mk>

Removed Link Here

(-)files/patch-main (-69 lines)
1	*** main.cxx.orig Mon Aug 4 05:07:54 2003
2	--- main.cxx Sat Aug 23 09:17:04 2003
3	***************
4	* 501,507 **
5	#include <speexcodec.h>
6	#include "h261codec.h"
7	#include "h263codec.h"
8	! #include "ffh263codec.h"
9	#include "h323pdu.h"
10	#include "g726codec.h"
11	//#include "h323t120.h"
12	--- 501,507 ----
13	#include <speexcodec.h>
14	#include "h261codec.h"
15	#include "h263codec.h"
16	! //#include "ffh263codec.h"
17	#include "h323pdu.h"
18	#include "g726codec.h"
19	//#include "h323t120.h"
20	*************** BOOL MyH323EndPoint::Initialise(PConfigA
21	* 1519,1530 **
22	} \
23	} \
24
25	! #if H323_AVCODEC
26	! ADD_VIDEO_CAPAB (H323_FFH263Capability);
27	! #endif
28	! #if H323_VICH263
29	! ADD_VIDEO_CAPAB (H323_H263Capability);
30	! #endif
31
32	if (!videoReceiveDevice.IsEmpty()) {
33	if (videoSize == 1) {
34	--- 1519,1530 ----
35	} \
36	} \
37
38	! //#if H323_AVCODEC
39	! // ADD_VIDEO_CAPAB (H323_FFH263Capability);
40	! //#endif
41	! //#if H323_VICH263
42	! // ADD_VIDEO_CAPAB (H323_H263Capability);
43	! //#endif
44
45	if (!videoReceiveDevice.IsEmpty()) {
46	if (videoSize == 1) {
47	*************** void MyH323EndPoint::TestVideoGrabber(PC
48	* 3609,3618 **
49
50	if (cap->IsDescendant(H323_H261Capability::Class()))
51	frame.SetPayloadType(RTP_DataFrame::H261);
52	! #if H323_AVCODEC
53	! else if (cap->IsDescendant(H323_FFH263Capability::Class()))
54	! frame.SetPayloadType(RTP_DataFrame::DynamicBase);
55	! #endif
56	frameCount = 0;
57	skipCount = 0;
58	PINDEX bitsEncoded = 0;
59	--- 3609,3618 ----
60
61	if (cap->IsDescendant(H323_H261Capability::Class()))
62	frame.SetPayloadType(RTP_DataFrame::H261);
63	! //#if H323_AVCODEC
64	! // else if (cap->IsDescendant(H323_FFH263Capability::Class()))
65	! // frame.SetPayloadType(RTP_DataFrame::DynamicBase);
66	! //#endif
67	frameCount = 0;
68	skipCount = 0;
69	PINDEX bitsEncoded = 0;