Remove openh323, it has been superseded with h323plus.

This commit is contained in:
ajacoutot 2010-03-23 21:28:07 +00:00
parent e111f25a77
commit 9bc76f0fe3
18 changed files with 0 additions and 509 deletions

View File

@ -1,64 +0,0 @@
# $OpenBSD: Makefile,v 1.24 2010/02/07 09:04:15 espie Exp $
SHARED_ONLY= Yes
COMMENT= H.323 video conferencing library
V= 1_19_0_1
DISTNAME= openh323-v${V}
PKGNAME= openh323-${V:S/_/./g}p5
CATEGORIES= net devel
EXTRACT_SUFX= -src-tar.gz
EXTRACT_CASES += *-src-tar.gz) \
${GZIP_CMD} -dc ${FULLDISTDIR}/$$archive | ${TAR} xf -;;
SHARED_LIBS= h323 2.0 # 1.19
HOMEPAGE= http://openh323.sourceforge.net/
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
# MPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openh323/}
WANTLIB= SDL crypto expat lber ldap ldap_r sasl2 ssl
LIB_DEPENDS= pt.>=2::devel/pwlib \
speex.>=4::audio/speex \
avutil.>=2::graphics/ffmpeg \
gsm.>=1::audio/gsm
WRKDIST= ${WRKDIR}/${DISTNAME:S/-/_/}
USE_GMAKE= Yes
ALL_TARGET= optshared
NO_REGRESS= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -pthread -lavutil"
CONFIGURE_ARGS= --enable-h263avcodec \
--disable-localspeex \
--disable-vich263
MAKE_ENV+= STDCCFLAGS="-I${WRKSRC}/include \
-I${LOCALBASE}/include/libavcodec" \
CC=${CC} CPLUS=${CXX} BUILDSELF="1"
MAKE_FLAGS= LIB_MAJOR_VERSION=${LIBh323_VERSION:R} \
LIB_MINOR_VERSION=${LIBh323_VERSION:E}
pre-configure:
${SUBST_CMD} ${WRKSRC}/plugins/audio/GSM0610/Makefile.in \
${WRKSRC}/plugins/audio/Speex/Makefile.in \
${WRKSRC}/openh323u.mak.in
post-install:
${INSTALL_DATA} ${WRKSRC}/version.h ${PREFIX}/share/openh323
.include <bsd.port.mk>

View File

@ -1,5 +0,0 @@
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

View File

@ -1,29 +0,0 @@
$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 Tue Mar 4 16:11:46 2008
@@ -336,24 +336,7 @@ docs:
install:
mkdir -p $(DESTDIR)$(LIBDIR)
- rm -f $(DESTDIR)$(LIBDIR)/libh323_*_r.so*
- $(INSTALL) -m 444 lib/$(OH323_FILE).@MAJOR_VERSION@.@MINOR_VERSION@.@BUILD_NUMBER@ $(DESTDIR)$(LIBDIR)
- (cd $(DESTDIR)$(LIBDIR) ; \
- rm -f $(OH323_FILE).@MAJOR_VERSION@.@MINOR_VERSION@ ; \
- ln -sf $(OH323_FILE).@MAJOR_VERSION@.@MINOR_VERSION@.@BUILD_NUMBER@ $(OH323_FILE).@MAJOR_VERSION@.@MINOR_VERSION@ \
- )
- (cd $(DESTDIR)$(LIBDIR) ; \
- rm -f $(OH323_FILE).@MAJOR_VERSION@ ; \
- ln -sf $(OH323_FILE).@MAJOR_VERSION@.@MINOR_VERSION@.@BUILD_NUMBER@ $(OH323_FILE).@MAJOR_VERSION@ \
- )
- (cd $(DESTDIR)$(LIBDIR) ; \
- rm -f $(OH323_FILE) ; \
- ln -sf $(OH323_FILE).@MAJOR_VERSION@.@MINOR_VERSION@.@BUILD_NUMBER@ $(OH323_FILE) \
- )
- (cd $(DESTDIR)$(LIBDIR); \
- rm -f libopenh323.@SHAREDLIBEXT@ ; \
- ln -sf $(OH323_FILE) libopenh323.@SHAREDLIBEXT@ \
- )
+ $(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 ;\

View File

@ -1,11 +0,0 @@
$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>

View File

@ -1,20 +0,0 @@
$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.

View File

@ -1,50 +0,0 @@
$OpenBSD: patch-openh323u_mak_in,v 1.5 2009/04/16 14:43:36 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@
+ifdef BUILDSELF
OPENH323DIR = @OPENH323DIR@
STDCCFLAGS += @STDCCFLAGS@
+else
+OPENH323DIR = ${PREFIX}/share/openh323
+endif
LDFLAGS += @LDFLAGS@
LDLIBS += @LDLIBS@
ENDLDLIBS := @ENDLDLIBS@ $(ENDLDLIBS)
@@ -201,15 +205,13 @@ LIBDIRS += $(OPENH323DIR)
#OH323_SUPPRESS_H235 = 1
OH323_SRCDIR = $(OPENH323DIR)/src
-ifdef PREFIX
-OH323_INCDIR = $(PREFIX)/include/openh323
+ifndef BUILDSELF
+OH323_INCDIR = ${PREFIX}/include/openh323
+OH323_LIBDIR = ${PREFIX}/lib
else
OH323_INCDIR = $(OPENH323DIR)/include
-endif # PREFIX
-
-ifndef OH323_LIBDIR
OH323_LIBDIR = $(OPENH323DIR)/lib
-endif # OH323_LIBDIR
+endif
ifeq ($(NOTRACE), 1)
STDCCFLAGS += -DPASN_NOPRINTON -DPASN_LEANANDMEAN
@@ -220,8 +222,12 @@ RCFLAGS += -DPTRACING
OH323_SUFFIX = $(OBJ_SUFFIX)
endif # NOTRACE
-OH323_BASE = h323_$(PLATFORM_TYPE)_$(OH323_SUFFIX)$(LIB_TYPE)
+OH323_BASE = h323$(LIB_TYPE)
+ifdef BUILDSELF
OH323_FILE = lib$(OH323_BASE).$(LIB_SUFFIX)
+else
+OH323_FILE = lib$(OH323_BASE).so.${LIBh323_VERSION}
+endif
LDFLAGS += -L$(OH323_LIBDIR)
LDLIBS := -l$(OH323_BASE) $(LDLIBS)

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-plugins_audio_GSM0610_Makefile_in,v 1.1 2009/04/07 21:34:24 ajacoutot Exp $
--- plugins/audio/GSM0610/Makefile.in.orig Tue Apr 7 23:16:34 2009
+++ plugins/audio/GSM0610/Makefile.in Tue Apr 7 23:16:53 2009
@@ -106,7 +106,7 @@ EXTRALIBS =
else
-EXTRALIBS = -lgsm
+EXTRALIBS = -L${LOCALBASE}/lib -lgsm
endif

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-plugins_audio_Speex_Makefile_in,v 1.2 2009/04/07 21:34:24 ajacoutot Exp $
--- plugins/audio/Speex/Makefile.in.orig Wed Apr 11 16:49:42 2007
+++ plugins/audio/Speex/Makefile.in Wed Apr 11 16:49:55 2007
@@ -79,7 +79,7 @@ SRCS += $(SRCDIR)/nb_celp.c $(SRCDIR)/sb_celp.c $(SR
$(SRCDIR)/speex_header.c $(SRCDIR)/speex_callbacks.c
EXTRALIBS =
else
-EXTRALIBS = -lspeex
+EXTRALIBS = -L${LOCALBASE}/lib -lspeex
endif
OBJDIR = ./obj

View File

@ -1,95 +0,0 @@
$OpenBSD: patch-src_ffh263codec_cxx,v 1.3 2008/07/09 02:13:59 jakemsr Exp $
--- src/ffh263codec.cxx.orig Tue Dec 7 18:03:59 2004
+++ src/ffh263codec.cxx Sun Jun 29 16:00:47 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);
- BOOL IsLoaded();
+ //BOOL IsLoaded();
int AvcodecClose(AVCodecContext *ctx);
int AvcodecDecodeVideo(AVCodecContext *ctx, AVFrame *picture, int *got_picture_ptr, BYTE *buf, int buf_size);
@@ -217,7 +218,9 @@ class FfmpgLink : public H323DynaLink
void (*Favcodec_get_context_defaults)(AVCodecContext *s);
void (*Favcodec_init)(void);
+#ifdef H323_RFC2190_AVCODEC
void (*Favcodec_set_print_fn)(void (*print_fn)(char *));
+#endif
void (*Favcodec_register_all)(void);
};
@@ -287,17 +290,21 @@ FfmpgLink::FfmpgLink()
return;
}
+#ifdef H323_RFC2190_AVCODEC
if (!GetFunction("avcodec_set_print_fn", (Function &)Favcodec_set_print_fn)) {
cerr << "Failed to load avcodec_set_print_fn" << endl;
return;
}
+#endif
/* must be called before using avcodec lib */
Favcodec_init();
Favcodec_register_all();
+#ifdef H323_RFC2190_AVCODEC
Favcodec_set_print_fn(h263_ffmpeg_printon);
+#endif
isLoadedOK = TRUE;
}
@@ -357,7 +364,7 @@ int FfmpgLink::AvcodecDecodeVideo(AVCodecContext *ctx,
PWaitAndSignal m(processLock);
PTRACE(6, "Avcodec decode video at " << ::hex << ctx << " frame" << picture
- << " buf" << (int)buf << ::dec << " got picture" << *got_picture_ptr
+ << " buf" << (long)buf << ::dec << " got picture" << *got_picture_ptr
<< " buffer size is" << buf_size);
int res = Favcodec_decode_video(ctx, picture, got_picture_ptr, buf, buf_size);
PTRACE(6, "Avcodec decode video of " <<buf_size << " bytes. result is " << res );
@@ -370,7 +377,7 @@ int FfmpgLink::AvcodecEncodeVideo(AVCodecContext *ctx,
PWaitAndSignal m(processLock);
PTRACE(6, "Avcodec encode video for ctxt " << ::hex << ctx << " picture" << pict
- << " buf" << (int)buf << ::dec << " buffer size is" << buf_size);
+ << " buf" << (long)buf << ::dec << " buffer size is" << buf_size);
int res = Favcodec_encode_video(ctx, buf, buf_size, pict);
PTRACE(6, "Avcodec encode video into " << res << " bytes.");
@@ -388,10 +395,12 @@ void FfmpgLink::AvcodecInit(void)
Favcodec_init();
}
+#ifdef H323_RFC2190_AVCODEC
void FfmpgLink::AvcodecSetPrintFn(void (*print_fn)(char *))
{
Favcodec_set_print_fn(print_fn);
}
+#endif
void FfmpgLink::AFavcodecRegisterAll(void)
{
@@ -614,9 +623,9 @@ void H323_FFH263Codec::InitialiseCodec()
}
#ifdef FRAME_RATE_BASE
- context->frame_rate = framesPerSec * FRAME_RATE_BASE;
+ context->time_base.den = framesPerSec * FRAME_RATE_BASE;
#else
- context->frame_rate = framesPerSec * DEFAULT_FRAME_RATE_BASE;
+ context->time_base.den = framesPerSec * DEFAULT_FRAME_RATE_BASE;
#endif
context->rtp_mode = 0;

View File

@ -1,11 +0,0 @@
$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"

View File

@ -1,60 +0,0 @@
$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;
+
}

View File

@ -1,11 +0,0 @@
$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>

View File

@ -1,12 +0,0 @@
$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());
}
}
}

View File

@ -1,12 +0,0 @@
$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;
}

View File

@ -1,2 +0,0 @@
The OpenH323 project aims to create a full featured, interoperable, Open
Source implementation of the ITU H.323 teleconferencing protocol.

View File

@ -1,9 +0,0 @@
To be able to use the H.263 codec (from FFmpeg), you must create a link
from ${LOCALBASE}/lib/libavcodec.so.X.Y to
${LOCALBASE}/lib/pwlib/libavcodec.so so that it can be loaded as a
run-time module by OpenH323.
To do so run the following command as root:
ln -sf ${LOCALBASE}/lib/libavcodec.so.X.Y ${LOCALBASE}/lib/pwlib/libavcodec.so
where X and Y are the corresponding major and minor version numbers.

View File

@ -1,90 +0,0 @@
@comment $OpenBSD: PLIST,v 1.3 2008/03/15 17:38:43 ajacoutot Exp $
include/openh323/
include/openh323/QTIoctl.h
include/openh323/channels.h
include/openh323/codecs.h
include/openh323/cu30codec.h
include/openh323/dynacodec.h
include/openh323/ffh263codec.h
include/openh323/gccpdu.h
include/openh323/gkclient.h
include/openh323/gkserver.h
include/openh323/guid.h
include/openh323/h225.h
include/openh323/h225ras.h
include/openh323/h235.h
include/openh323/h235auth.h
include/openh323/h245.h
include/openh323/h248.h
include/openh323/h261codec.h
include/openh323/h263codec.h
include/openh323/h323.h
include/openh323/h323annexg.h
include/openh323/h323caps.h
include/openh323/h323con.h
include/openh323/h323ep.h
include/openh323/h323neg.h
include/openh323/h323pdu.h
include/openh323/h323pluginmgr.h
include/openh323/h323rtp.h
include/openh323/h323t120.h
include/openh323/h323t38.h
include/openh323/h323trans.h
include/openh323/h4501.h
include/openh323/h45010.h
include/openh323/h45011.h
include/openh323/h4502.h
include/openh323/h4503.h
include/openh323/h4504.h
include/openh323/h4505.h
include/openh323/h4506.h
include/openh323/h4507.h
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
include/openh323/ixjDefs.h
include/openh323/ixjidb.h
include/openh323/ixjlid.h
include/openh323/jitter.h
include/openh323/lid.h
include/openh323/mcspdu.h
include/openh323/mediafmt.h
include/openh323/opalosp.h
include/openh323/opalplugin.h
include/openh323/opalusbdevice.h
include/openh323/opalvxml.h
include/openh323/opalwavfile.h
include/openh323/openh323buildopts.h
include/openh323/peclient.h
include/openh323/q931.h
include/openh323/rfc2190avcodec.h
include/openh323/rfc2833.h
include/openh323/rtp.h
include/openh323/rtp2wav.h
include/openh323/svcctrl.h
include/openh323/t120proto.h
include/openh323/t38.h
include/openh323/t38proto.h
include/openh323/transports.h
include/openh323/vblasterlid.h
include/openh323/vpblid.h
include/openh323/x224.h
include/openh323/x880.h
@lib lib/libh323.so.${LIBh323_VERSION}
lib/pwlib/codecs/
lib/pwlib/codecs/audio/
lib/pwlib/codecs/audio/g726_audio_pwplugin.so
lib/pwlib/codecs/audio/gsm0610_audio_pwplugin.so
lib/pwlib/codecs/audio/ilbc_audio_pwplugin.so
lib/pwlib/codecs/audio/ima_adpcm_audio_pwplugin.so
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

View File

@ -1,4 +0,0 @@
If you don't intend to use this package anymore, you should remove the
link to libavcodec. To do so run the following command as root:
rm ${LOCALBASE}/lib/pwlib/libavcodec.so