From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jan 6 05:00:02 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 514B416A46C for ; Sun, 6 Jan 2008 05:00:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 2F52813C4DB for ; Sun, 6 Jan 2008 05:00:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m06502Wv072120 for ; Sun, 6 Jan 2008 05:00:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m06502vG072119; Sun, 6 Jan 2008 05:00:02 GMT (envelope-from gnats) Resent-Date: Sun, 6 Jan 2008 05:00:02 GMT Resent-Message-Id: <200801060500.m06502vG072119@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Steve Ames Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7EEE916A418 for ; Sun, 6 Jan 2008 04:55:03 +0000 (UTC) (envelope-from steve@energistic.com) Received: from energistic.com (mail.energistic.com [216.54.148.60]) by mx1.freebsd.org (Postfix) with ESMTP id 3635913C45B for ; Sun, 6 Jan 2008 04:55:03 +0000 (UTC) (envelope-from steve@energistic.com) Received: from energistic.com (localhost [127.0.0.1]) by energistic.com (8.14.2/8.14.2) with ESMTP id m064ToFD095817 for ; Sat, 5 Jan 2008 23:29:50 -0500 (EST) (envelope-from steve@energistic.com) Received: (from steve@localhost) by energistic.com (8.14.2/8.14.2/Submit) id m064Torp095325; Sat, 5 Jan 2008 23:29:50 -0500 (EST) (envelope-from steve) Message-Id: <200801060429.m064Torp095325@energistic.com> Date: Sat, 5 Jan 2008 23:29:50 -0500 (EST) From: Steve Ames To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/119376: Updates net/openh323 from 1.18.0 to 1.19.0.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Steve Ames List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 05:00:02 -0000 >Number: 119376 >Category: ports >Synopsis: Updates net/openh323 from 1.18.0 to 1.19.0.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Jan 06 05:00:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Steve Ames >Release: FreeBSD 7.0-PRERELEASE i386 >Organization: >Environment: System: FreeBSD energistic.com 7.0-PRERELEASE FreeBSD 7.0-PRERELEASE #99: Fri Dec 28 15:25:37 EST 2007 steve@energistic.com:/usr/obj/usr/src/sys/VV i386 >Description: Updates net/openh323 from 1.18.0 to 1.19.0.1 . This patch requires that pwlib be updated to 1.12.0 first. Patch for that update has already been submitted. I believe this to be the final release of openh323 as the project has split and two parties are doig their own thing now (Opal (devel/opal) and H323Plus (no port yet)). >How-To-Repeat: >Fix: Apply the following patch. Also available at: http://steve.energistic.com/h323-ports/openh323-1.18.0-1.19.0.1.patch diff -ruN openh323.orig/Makefile openh323/Makefile --- openh323.orig/Makefile 2007-10-17 06:12:51.000000000 -0400 +++ openh323/Makefile 2007-12-30 20:50:37.000000000 -0500 @@ -6,11 +6,10 @@ # PORTNAME= openh323 -PORTVERSION= 1.18.0 -PORTREVISION= 6 +PORTVERSION= 1.19.0.1 CATEGORIES= net -MASTER_SITES= http://www.voxgratia.org/releases/ -DISTNAME= ${PORTNAME}-v${PORTVERSION:S/./_/g}-src- +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +DISTNAME= openh323/${PORTNAME}-v${PORTVERSION:S/./_/g}-src- EXTRACT_SUFX= tar.gz MAINTAINER= steve@energistic.com diff -ruN openh323.orig/distinfo openh323/distinfo --- openh323.orig/distinfo 2006-04-05 14:17:35.000000000 -0400 +++ openh323/distinfo 2007-12-30 20:52:08.000000000 -0500 @@ -1,3 +1,3 @@ -MD5 (openh323-v1_18_0-src-tar.gz) = d7043ba34b5038f0113b099ede0884fb -SHA256 (openh323-v1_18_0-src-tar.gz) = 26b4c9cf21dc1c92edf1583046670fce6be5b13045ef5d06e11403d36ffff218 -SIZE (openh323-v1_18_0-src-tar.gz) = 3742730 +MD5 (openh323/openh323-v1_19_0_1-src-tar.gz) = e7ba3ae6b50d0d02c5cbe9ed3a3152c4 +SHA256 (openh323/openh323-v1_19_0_1-src-tar.gz) = a4909d8d26a50eec42d3bfb6b88ff53ef0a714e6c6b6cf381b783050a09d31ea +SIZE (openh323/openh323-v1_19_0_1-src-tar.gz) = 3959271 diff -ruN openh323.orig/files/patch-include-h4601.h openh323/files/patch-include-h4601.h --- openh323.orig/files/patch-include-h4601.h 1969-12-31 19:00:00.000000000 -0500 +++ openh323/files/patch-include-h4601.h 2007-12-31 15:21:10.000000000 -0500 @@ -0,0 +1,12 @@ +diff -ruN include/h4601.h.orig include/h4601.h +--- include/h4601.h.orig 2006-06-08 09:26:16.000000000 -0400 ++++ include/h4601.h 2007-12-31 15:10:41.000000000 -0500 +@@ -61,6 +61,7 @@ + + #include "h225.h" + #include "transports.h" ++#include + #include + + + diff -ruN openh323.orig/files/patch-include-mediafmt.h openh323/files/patch-include-mediafmt.h --- openh323.orig/files/patch-include-mediafmt.h 1969-12-31 19:00:00.000000000 -0500 +++ openh323/files/patch-include-mediafmt.h 2008-01-05 23:13:21.000000000 -0500 @@ -0,0 +1,19 @@ +--- ../openh323.orig/work/openh323_v1_18_0/include/mediafmt.h 2005-11-30 08:05:01.000000000 -0500 ++++ work/openh323_v1_19_0_1/include/mediafmt.h 2008-01-05 23:12:39.000000000 -0500 +@@ -163,9 +163,13 @@ + RTP_DataFrame::PayloadTypes GetPayloadType() const { return rtpPayloadType; } + + enum { +- DefaultAudioSessionID = 1, +- DefaultVideoSessionID = 2, +- DefaultDataSessionID = 3 ++ FirstSessionID = 1, ++ DefaultAudioSessionID = 1, ++ DefaultVideoSessionID = 2, ++ DefaultDataSessionID = 3, ++ DefaultH224SessionID = 4, ++ DefaultExtVideoSessionID = 5, ++ LastSessionID = 5 + }; + + /**Get the default session ID for media format. diff -ruN openh323.orig/files/patch-src-h261codec-cxx openh323/files/patch-src-h261codec-cxx --- openh323.orig/files/patch-src-h261codec-cxx 1969-12-31 19:00:00.000000000 -0500 +++ openh323/files/patch-src-h261codec-cxx 2007-12-31 15:24:04.000000000 -0500 @@ -0,0 +1,11 @@ +diff -ruN src/h261codec.cxx.orig src/h261codec.cxx +--- src/h261codec.cxx 2006-06-06 04:05:40.000000000 -0400 ++++ src/h261codec.cxx 2007-12-31 15:17:29.000000000 -0500 +@@ -279,6 +279,7 @@ + #include "h245.h" + #include "rtp.h" + ++#include + #include "vic/p64.h" + #include "vic/p64encoder.h" + diff -ruN openh323.orig/files/patch-src-h323caps.cxx openh323/files/patch-src-h323caps.cxx --- openh323.orig/files/patch-src-h323caps.cxx 1969-12-31 19:00:00.000000000 -0500 +++ openh323/files/patch-src-h323caps.cxx 2007-12-31 15:29:33.000000000 -0500 @@ -0,0 +1,58 @@ +--- src/h323caps.cxx.orig 2006-05-16 07:36:01.000000000 -0400 ++++ src/h323caps.cxx 2007-12-31 15:28:02.000000000 -0500 +@@ -2076,7 +2076,7 @@ + PINDEX simultaneous, + const PString & name) + { +- PINDEX reply = descriptorNum == P_MAX_INDEX ? P_MAX_INDEX : simultaneous; ++/* PINDEX reply = descriptorNum == P_MAX_INDEX ? P_MAX_INDEX : simultaneous; + + PStringArray wildcard = name.Tokenise('*', FALSE); + +@@ -2109,6 +2109,46 @@ + } + + return reply; ++*/ ++ ++ ++ ++ ++ PINDEX reply = descriptorNum == P_MAX_INDEX ? P_MAX_INDEX : simultaneous; ++ ++ PStringArray wildcard = name.Tokenise('*', FALSE); ++ ++ H323CapabilityFactory::KeyList_T stdCaps = H323CapabilityFactory::GetKeyList(); ++ ++ for (unsigned session = OpalMediaFormat::FirstSessionID; session <= OpalMediaFormat::LastSessionID; session++) { ++ for (H323CapabilityFactory::KeyList_T::const_iterator r = stdCaps.begin(); r != stdCaps.end(); ++r) { ++ PString capName(*r); ++ if (MatchWildcard(capName, wildcard) && (FindCapability(capName) == NULL)) { ++ OpalMediaFormat mediaFormat(capName); ++ if (!mediaFormat.IsValid() && (capName.Right(4) == "{sw}") && capName.GetLength() > 4) ++ mediaFormat = OpalMediaFormat(capName.Left(capName.GetLength()-4)); ++ if (mediaFormat.IsValid() && mediaFormat.GetDefaultSessionID() == session) { ++ // add the capability ++ H323Capability * capability = H323Capability::Create(capName); ++ PINDEX num = SetCapability(descriptorNum, simultaneous, capability); ++ if (descriptorNum == P_MAX_INDEX) { ++ reply = num; ++ descriptorNum = num; ++ simultaneous = P_MAX_INDEX; ++ } ++ else if (simultaneous == P_MAX_INDEX) { ++ if (reply == P_MAX_INDEX) ++ reply = num; ++ simultaneous = num; ++ } ++ } ++ } ++ } ++ simultaneous = P_MAX_INDEX; ++ } ++ ++ return reply; ++ + } + + diff -ruN openh323.orig/files/patch-src-h323ep-cxx openh323/files/patch-src-h323ep-cxx --- openh323.orig/files/patch-src-h323ep-cxx 1969-12-31 19:00:00.000000000 -0500 +++ openh323/files/patch-src-h323ep-cxx 2007-12-31 15:25:30.000000000 -0500 @@ -0,0 +1,11 @@ +diff -ruN src/h323ep.cxx.orig src/h323ep.cxx +--- src/h323ep.cxx.orig 2006-06-09 02:30:12.000000000 -0400 ++++ src/h323ep.cxx 2007-12-31 13:11:13.000000000 -0500 +@@ -793,6 +793,7 @@ + #include + #include + #include ++#include + + #if defined(H323_RTP_AGGREGATE) || defined(H323_SIGNAL_AGGREGATE) + #include diff -ruN openh323.orig/files/patch-src-h323pluginmgr-cxx openh323/files/patch-src-h323pluginmgr-cxx --- openh323.orig/files/patch-src-h323pluginmgr-cxx 1969-12-31 19:00:00.000000000 -0500 +++ openh323/files/patch-src-h323pluginmgr-cxx 2007-12-31 15:26:14.000000000 -0500 @@ -0,0 +1,13 @@ +diff -ruN src/h323pluginmgr.cxx.orig src/h323pluginmgr. +cxx +--- src/h323pluginmgr.cxx.orig 2005-08-05 13:11:03.000000000 -0400 ++++ src/h323pluginmgr.cxx 2007-12-31 15:04:53.000000000 -0500 +@@ -1305,7 +1305,7 @@ + PTRACE(4, "H323PLUGIN\tCannot instantiate static codec plugin " << *r); + } else { + PTRACE(4, "H323PLUGIN\tLoading static codec plugin " << *r); +- RegisterStaticCodec(*r, instance->Get_GetAPIFn(), instance->Get_GetCodecFn()); ++ RegisterStaticCodec(r->c_str(), instance->Get_GetAPIFn(), instance->Get_GetCodecFn()); + } + } + } diff -ruN openh323.orig/files/patch-src-mediafmt.cxx openh323/files/patch-src-mediafmt.cxx --- openh323.orig/files/patch-src-mediafmt.cxx 1969-12-31 19:00:00.000000000 -0500 +++ openh323/files/patch-src-mediafmt.cxx 2007-12-31 15:26:56.000000000 -0500 @@ -0,0 +1,12 @@ +diff -ruN src/mediafmt.cxx.orig src/mediafmt.cxx +--- src/mediafmt.cxx.orig 2005-01-11 02:12:13.000000000 -0500 ++++ src/mediafmt.cxx 2007-12-31 14:48:26.000000000 -0500 +@@ -395,7 +395,7 @@ + OpalMediaFormatFactory::KeyMap_T & keyMap = OpalMediaFormatFactory::GetKeyMap(); + OpalMediaFormatFactory::KeyMap_T::const_iterator r; + for (r = keyMap.begin(); r != keyMap.end(); ++r) { +- if (r->first.Find(search) != P_MAX_INDEX) { ++ if (r->first.find(search) != P_MAX_INDEX) { + *this = *OpalMediaFormatFactory::CreateInstance(r->first); + break; + } diff -ruN openh323.orig/pkg-plist openh323/pkg-plist --- openh323.orig/pkg-plist 2007-07-26 13:31:52.000000000 -0400 +++ openh323/pkg-plist 2007-12-31 18:12:35.000000000 -0500 @@ -46,6 +46,7 @@ include/openh323/h460.h include/openh323/h501.h include/openh323/h501pdu.h +include/openh323/h4601.h include/openh323/hid.h include/openh323/ixjDefs.h include/openh323/ixjidb.h >Release-Note: >Audit-Trail: >Unformatted: