- major upgrade to openh323-1.19.0.1

- install version.h
- H323Capabilities patch from FreeBSD
- make it compile with new pwlib

net/openh323/Makefile

@@ -1,18 +1,19 @@
-# $OpenBSD: Makefile,v 1.14 2007/09/15 22:36:56 merdely Exp $
+# $OpenBSD: Makefile,v 1.15 2008/03/15 17:38:43 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	H.323 video conferencing library
 
-DISTNAME=	openh323-v1_18_0
-PKGNAME=	openh323-1.18.0p2
+V=		1_19_0_1
+DISTNAME=	openh323-v${V}
+PKGNAME=	openh323-${V:S/_/./g}
 CATEGORIES=	net devel
 
 EXTRACT_SUFX=	-src-tar.gz
 
-SHARED_LIBS=	h323	1.18    # 1.18
+SHARED_LIBS=	h323	2.0    # 1.19
 
-HOMEPAGE=	http://www.voxgratia.org/
+HOMEPAGE=	http://openh323.sourceforge.net/
 
 MAINTAINER=	Antoine Jacoutot <ajacoutot@openbsd.org>
 
@@ -22,11 +23,11 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	${HOMEPAGE}/releases/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=openh323/}
 
 WANTLIB=	crypto expat ossaudio ssl
 
-LIB_DEPENDS=	pt.>=1::devel/pwlib \
+LIB_DEPENDS=	pt.>=2::devel/pwlib \
 		speex.>=4::audio/speex \
 		avutil.>=2::graphics/ffmpeg
 
@@ -41,7 +42,8 @@ CONFIGURE_STYLE=gnu
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/ffmpeg" \
 		LDFLAGS="-L${LOCALBASE}/lib -pthread -lavutil"
 CONFIGURE_ARGS=	--enable-h263avcodec \
-		--disable-localspeex
+		--disable-localspeex \
+		--disable-vich263
 
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "sparc64"
 CFLAGS+=	-fPIC
@@ -49,18 +51,20 @@ CFLAGS+=	-fPIC
 
 MAKE_ENV+=	STDCCFLAGS="${STDCCFLAGS} -I${WRKSRC}/include" \
 		CC=${CC} CPLUS=${CXX} BUILDSELF="1"
+MAKE_FLAGS=	LIB_MAJOR_VERSION=${LIBh323_VERSION:R} \
+		LIB_MINOR_VERSION=${LIBh323_VERSION:E}
 
 do-extract:
 	@tar xzf ${FULLDISTDIR}/${DISTNAME}${EXTRACT_SUFX} -C ${WRKDIR}
 
 pre-configure:
-	@perl -pi -e 's,MAJOR_VERSION.*,MAJOR_VERSION ${LIBh323_VERSION:R},g;' \
-		-e 's,MINOR_VERSION.*,MINOR_VERSION ${LIBh323_VERSION:E},g' \
-		${WRKSRC}/version.h
 	@perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},g' \
 		${WRKSRC}/plugins/audio/Speex/Makefile.in
 	@perl -pi -e 's,!!PREFIX!!,${PREFIX},g;' \
 		-e 's,!!SOSUFX!!,so.${LIBh323_VERSION},g' \
 		${WRKSRC}/openh323u.mak.in
 
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/version.h ${PREFIX}/share/openh323
+
 .include <bsd.port.mk>

net/openh323/distinfo

@@ -1,5 +1,5 @@
-MD5 (openh323-v1_18_0-src-tar.gz) = 1wQ7o0tQOPAROwme3giE+w==
-RMD160 (openh323-v1_18_0-src-tar.gz) = H8Kr427veA8Q9Sqi690ZUKpPzrs=
-SHA1 (openh323-v1_18_0-src-tar.gz) = fRDMPjVFD3u96SU3WpnWauNDafo=
-SHA256 (openh323-v1_18_0-src-tar.gz) = JrTJzyHcHJLt8VgwRmcPzmvlsTBF710G4RQD02//8hg=
-SIZE (openh323-v1_18_0-src-tar.gz) = 3742730
+MD5 (openh323-v1_19_0_1-src-tar.gz) = 57o65rUNDQLFy+ntOjFSxA==
+RMD160 (openh323-v1_19_0_1-src-tar.gz) = TPA74PxoswbmCEI22mc9JDVgRkw=
+SHA1 (openh323-v1_19_0_1-src-tar.gz) = xMJuHaSU6tFrYX3ApOpQgW+OMRw=
+SHA256 (openh323-v1_19_0_1-src-tar.gz) = pJCdjSalDuxC07+2uI/1PvCnFObGts84G3gwUKCdMeo=
+SIZE (openh323-v1_19_0_1-src-tar.gz) = 3959271

net/openh323/patches/patch-Makefile_in

@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile_in,v 1.1 2007/04/26 14:10:30 ajacoutot Exp $
+$OpenBSD: patch-Makefile_in,v 1.2 2008/03/15 17:38:43 ajacoutot Exp $
 --- Makefile.in.orig	Thu Aug  4 21:31:59 2005
-+++ Makefile.in	Thu Apr 12 10:10:44 2007
++++ Makefile.in	Tue Mar  4 16:11:46 2008
 @@ -336,24 +336,7 @@ docs: 
  
  install:
@@ -23,7 +23,7 @@ $OpenBSD: patch-Makefile_in,v 1.1 2007/04/26 14:10:30 ajacoutot Exp $
 -		rm -f  libopenh323.@SHAREDLIBEXT@ ; \
 -		ln -sf $(OH323_FILE) libopenh323.@SHAREDLIBEXT@ \
 -	)
-+	$(INSTALL) -m 444 lib/$(OH323_FILE).@MAJOR_VERSION@.@MINOR_VERSION@ $(DESTDIR)$(LIBDIR)
++	$(INSTALL) -m 444 lib/$(OH323_FILE).$(LIB_MAJOR_VERSION).$(LIB_MINOR_VERSION) $(DESTDIR)$(LIBDIR)
  	( for dir in $(DESTDIR)$(LIBDIR) \
  		     $(DESTDIR)$(PREFIX)/include/openh323 \
  		     $(DESTDIR)$(PREFIX)/share/openh323 ;\

net/openh323/patches/patch-configure

@@ -1,12 +0,0 @@
-$OpenBSD: patch-configure,v 1.1 2007/04/30 10:34:47 ajacoutot Exp $
---- configure.orig	Mon Apr 30 10:16:18 2007
-+++ configure	Mon Apr 30 10:16:33 2007
-@@ -3041,7 +3041,7 @@ LIBDIR="${libdir}"
- MAJOR_VERSION=`cat ${OPENH323DIR}/version.h | grep MAJOR_VERSION | cut -f3 -d' '`
- MINOR_VERSION=`cat ${OPENH323DIR}/version.h | grep MINOR_VERSION | cut -f3 -d' '`
- BUILD_NUMBER=`cat ${OPENH323DIR}/version.h | grep BUILD_NUMBER | cut -f3 -d' '`
--OPENH323_VERSION="${MAJOR_VERSION}.${MINOR_VERSION}.${BUILD_NUMBER}"
-+OPENH323_VERSION="${MAJOR_VERSION}.${MINOR_VERSION}"
- 
- 
- 

net/openh323/patches/patch-include_h4601_h

@@ -0,0 +1,11 @@
+$OpenBSD: patch-include_h4601_h,v 1.1 2008/03/15 17:38:43 ajacoutot Exp $
+--- include/h4601.h.orig	Thu Jun  8 15:26:16 2006
++++ include/h4601.h	Tue Mar  4 11:18:32 2008
+@@ -61,6 +61,7 @@
+ 
+ #include "h225.h"
+ #include "transports.h"
++#include <ptlib/pluginmgr.h>
+ #include <ptclib/url.h>
+ 
+ 

net/openh323/patches/patch-include_mediafmt_h

@@ -0,0 +1,20 @@
+$OpenBSD: patch-include_mediafmt_h,v 1.1 2008/03/15 17:38:43 ajacoutot Exp $
+--- include/mediafmt.h.orig	Wed Nov 30 14:05:01 2005
++++ include/mediafmt.h	Mon Mar  3 17:57:12 2008
+@@ -163,9 +163,13 @@ class OpalMediaFormat : public PCaselessString
+     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.

net/openh323/patches/patch-openh323u_mak_in

@@ -1,7 +1,7 @@
-$OpenBSD: patch-openh323u_mak_in,v 1.2 2007/08/02 14:37:31 ajacoutot Exp $
---- openh323u.mak.in.orig	Mon Jan  3 06:25:51 2005
-+++ openh323u.mak.in	Wed Aug  1 18:40:01 2007
-@@ -163,8 +163,12 @@
+$OpenBSD: patch-openh323u_mak_in,v 1.3 2008/03/15 17:38:43 ajacoutot Exp $
+--- openh323u.mak.in.orig	Tue May 30 13:09:24 2006
++++ openh323u.mak.in	Mon Mar  3 12:29:57 2008
+@@ -166,8 +166,12 @@
  #
  
  PWLIBDIR	= @PWLIBDIR@
@@ -14,7 +14,7 @@ $OpenBSD: patch-openh323u_mak_in,v 1.2 2007/08/02 14:37:31 ajacoutot Exp $
  LDFLAGS		+= @LDFLAGS@
  LDLIBS		+= @LDLIBS@
  ENDLDLIBS	:= @ENDLDLIBS@ $(ENDLDLIBS)
-@@ -197,15 +201,13 @@ LIBDIRS += $(OPENH323DIR)
+@@ -201,15 +205,13 @@ LIBDIRS += $(OPENH323DIR)
  #OH323_SUPPRESS_H235	= 1
  
  OH323_SRCDIR = $(OPENH323DIR)/src
@@ -34,7 +34,7 @@ $OpenBSD: patch-openh323u_mak_in,v 1.2 2007/08/02 14:37:31 ajacoutot Exp $
  
  ifeq ($(NOTRACE), 1)
  STDCCFLAGS += -DPASN_NOPRINTON -DPASN_LEANANDMEAN
-@@ -216,8 +218,12 @@ RCFLAGS	   += -DPTRACING
+@@ -220,8 +222,12 @@ RCFLAGS	   += -DPTRACING
  OH323_SUFFIX = $(OBJ_SUFFIX)
  endif # NOTRACE
  

net/openh323/patches/patch-src_ffh263codec_cxx

@@ -1,7 +1,15 @@
-$OpenBSD: patch-src_ffh263codec_cxx,v 1.1 2007/04/26 14:10:30 ajacoutot Exp $
+$OpenBSD: patch-src_ffh263codec_cxx,v 1.2 2008/03/15 17:38:43 ajacoutot Exp $
 --- src/ffh263codec.cxx.orig	Wed Dec  8 03:03:59 2004
-+++ src/ffh263codec.cxx	Sat Apr 14 17:26:09 2007
-@@ -193,7 +193,7 @@ class FfmpgLink : public H323DynaLink
++++ src/ffh263codec.cxx	Tue Mar  4 14:29:13 2008
+@@ -142,6 +142,7 @@
+  *
+  */
+ #include <ptlib.h>
++#include <ptlib/video.h>
+ #include "h263codec.h"
+ 
+ #ifdef __GNUC__
+@@ -193,7 +194,7 @@ class FfmpgLink : public H323DynaLink
  
    AVFrame *AvcodecAllocFrame(void);
  
@@ -10,7 +18,7 @@ $OpenBSD: patch-src_ffh263codec_cxx,v 1.1 2007/04/26 14:10:30 ajacoutot Exp $
  
    int AvcodecClose(AVCodecContext *ctx);
    int AvcodecDecodeVideo(AVCodecContext *ctx, AVFrame *picture, int *got_picture_ptr, BYTE *buf, int buf_size);
-@@ -217,7 +217,9 @@ class FfmpgLink : public H323DynaLink
+@@ -217,7 +218,9 @@ class FfmpgLink : public H323DynaLink
  
    void (*Favcodec_get_context_defaults)(AVCodecContext *s);
    void (*Favcodec_init)(void);
@@ -20,7 +28,7 @@ $OpenBSD: patch-src_ffh263codec_cxx,v 1.1 2007/04/26 14:10:30 ajacoutot Exp $
    void (*Favcodec_register_all)(void);
  };           
  
-@@ -287,17 +289,21 @@ FfmpgLink::FfmpgLink()
+@@ -287,17 +290,21 @@ FfmpgLink::FfmpgLink()
      return;
    }
  
@@ -42,7 +50,7 @@ $OpenBSD: patch-src_ffh263codec_cxx,v 1.1 2007/04/26 14:10:30 ajacoutot Exp $
  
    isLoadedOK = TRUE;
  }
-@@ -388,10 +394,12 @@ void FfmpgLink::AvcodecInit(void)
+@@ -388,10 +395,12 @@ void FfmpgLink::AvcodecInit(void)
    Favcodec_init();
  }
  
@@ -55,7 +63,7 @@ $OpenBSD: patch-src_ffh263codec_cxx,v 1.1 2007/04/26 14:10:30 ajacoutot Exp $
  
  void FfmpgLink::AFavcodecRegisterAll(void)
  {
-@@ -614,9 +622,9 @@ void H323_FFH263Codec::InitialiseCodec()
+@@ -614,9 +623,9 @@ void H323_FFH263Codec::InitialiseCodec()
      }
  
  #ifdef FRAME_RATE_BASE  

net/openh323/patches/patch-src_h261codec_cxx

@@ -0,0 +1,11 @@
+$OpenBSD: patch-src_h261codec_cxx,v 1.1 2008/03/15 17:38:43 ajacoutot Exp $
+--- src/h261codec.cxx.orig	Tue Jun  6 10:05:40 2006
++++ src/h261codec.cxx	Tue Mar  4 11:18:30 2008
+@@ -279,6 +279,7 @@
+ #include "h245.h"
+ #include "rtp.h"
+ 
++#include <ptlib/video.h>
+ #include "vic/p64.h"
+ #include "vic/p64encoder.h"
+ 

net/openh323/patches/patch-src_h323caps_cxx

@@ -0,0 +1,60 @@
+$OpenBSD: patch-src_h323caps_cxx,v 1.1 2008/03/15 17:38:43 ajacoutot Exp $
+--- src/h323caps.cxx.orig	Tue May 16 13:36:01 2006
++++ src/h323caps.cxx	Tue Mar  4 16:35:37 2008
+@@ -2076,7 +2076,7 @@ PINDEX H323Capabilities::AddAllCapabilities(PINDEX des
+                                             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,47 @@ PINDEX H323Capabilities::AddAllCapabilities(PINDEX des
+   }
+ 
+   return reply;
++*/
++
++
++
++
++/* From FreeBSD ports */
++  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;
++
+ }
+ 
+ 

net/openh323/patches/patch-src_h323ep_cxx

@@ -0,0 +1,11 @@
+$OpenBSD: patch-src_h323ep_cxx,v 1.1 2008/03/15 17:38:43 ajacoutot Exp $
+--- src/h323ep.cxx.orig	Mon Mar  3 17:22:25 2008
++++ src/h323ep.cxx	Mon Mar  3 17:22:39 2008
+@@ -793,6 +793,7 @@
+ #include <ptclib/url.h>
+ #include <ptclib/pils.h>
+ #include <ptclib/enum.h>
++#include <ptlib/sound.h>
+ 
+ #if defined(H323_RTP_AGGREGATE) || defined(H323_SIGNAL_AGGREGATE)
+ #include <ptclib/sockagg.h>

net/openh323/patches/patch-src_h323pluginmgr_cxx

@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_h323pluginmgr_cxx,v 1.1 2008/03/15 17:38:43 ajacoutot Exp $
+--- src/h323pluginmgr.cxx.orig	Fri Aug  5 19:11:03 2005
++++ src/h323pluginmgr.cxx	Tue Mar  4 11:18:28 2008
+@@ -1305,7 +1305,7 @@ H323PluginCodecManager::H323PluginCodecManager(PPlugin
+         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());
+       }
+     }
+   }

net/openh323/patches/patch-src_mediafmt_cxx

@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_mediafmt_cxx,v 1.1 2008/03/15 17:38:43 ajacoutot Exp $
+--- src/mediafmt.cxx.orig	Tue Mar  4 10:56:40 2008
++++ src/mediafmt.cxx	Tue Mar  4 10:56:49 2008
+@@ -395,7 +395,7 @@ OpalMediaFormat::OpalMediaFormat(const char * search, 
+     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;
+       }

net/openh323/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2007/04/26 14:10:30 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.3 2008/03/15 17:38:43 ajacoutot Exp $
 include/openh323/
 include/openh323/QTIoctl.h
 include/openh323/channels.h
@@ -43,6 +43,7 @@ include/openh323/h4508.h
 include/openh323/h4509.h
 include/openh323/h450pdu.h
 include/openh323/h460.h
+include/openh323/h4601.h
 include/openh323/h501.h
 include/openh323/h501pdu.h
 include/openh323/hid.h
@@ -85,3 +86,5 @@ lib/pwlib/codecs/audio/lpc10_audio_pwplugin.so
 lib/pwlib/codecs/audio/speex_audio_pwplugin.so
 share/openh323/
 share/openh323/openh323u.mak
+share/openh323/version.h
+@extra rm -f %D/lib/pwlib/libavcodec.so