From be119c989e09bfb9fa36f96013bac20b512cc8c3 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Tue, 23 Mar 2010 21:11:57 +0000 Subject: [PATCH] Import h323plus-1.21.0 The H323plus project aims to create a full featured, interoperable, Open Source implementation of the ITU H.323 teleconferencing protocol. --- net/h323plus/Makefile | 74 ++++++++++++ net/h323plus/distinfo | 10 ++ net/h323plus/patches/patch-Makefile_in | 36 ++++++ net/h323plus/patches/patch-openh323u_mak_in | 45 ++++++++ .../patches/patch-plugins_Makefile_in | 13 +++ .../patch-plugins_audio_GSM0610_Makefile_in | 12 ++ .../patch-plugins_audio_Speex_Makefile_in | 12 ++ net/h323plus/patches/patch-plugins_configure | 38 ++++++ ...-plugins_video_H_263-ffmpeg_h263ffmpeg_cxx | 35 ++++++ net/h323plus/pkg/DESCR | 2 + net/h323plus/pkg/PLIST | 108 ++++++++++++++++++ 11 files changed, 385 insertions(+) create mode 100644 net/h323plus/Makefile create mode 100644 net/h323plus/distinfo create mode 100644 net/h323plus/patches/patch-Makefile_in create mode 100644 net/h323plus/patches/patch-openh323u_mak_in create mode 100644 net/h323plus/patches/patch-plugins_Makefile_in create mode 100644 net/h323plus/patches/patch-plugins_audio_GSM0610_Makefile_in create mode 100644 net/h323plus/patches/patch-plugins_audio_Speex_Makefile_in create mode 100644 net/h323plus/patches/patch-plugins_configure create mode 100644 net/h323plus/patches/patch-plugins_video_H_263-ffmpeg_h263ffmpeg_cxx create mode 100644 net/h323plus/pkg/DESCR create mode 100644 net/h323plus/pkg/PLIST diff --git a/net/h323plus/Makefile b/net/h323plus/Makefile new file mode 100644 index 00000000000..728027391e2 --- /dev/null +++ b/net/h323plus/Makefile @@ -0,0 +1,74 @@ +# $OpenBSD: Makefile,v 1.1.1.1 2010/03/23 21:11:57 ajacoutot Exp $ + +SHARED_ONLY= Yes + +COMMENT= H.323 video conferencing library + +V= 1_21_0 +DISTNAME= h323plus-v${V} +PKGNAME= h323plus-${V:S/_/./g} +CATEGORIES= net devel + +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} plugins-v${V}${EXTRACT_SUFX} + +SHARED_LIBS= h323 3.0 # 1.21.0 + +HOMEPAGE= http://www.h323plus.org/ + +MAINTAINER= Antoine Jacoutot + +# MPL (dlopen(3) GPL modules) +PERMIT_PACKAGE_CDROM= Yes +PERMIT_PACKAGE_FTP= Yes +PERMIT_DISTFILES_CDROM= Yes +PERMIT_DISTFILES_FTP= Yes + +MASTER_SITES= ${HOMEPAGE}/source/download/ + +WANTLIB += SDL c crypto expat lber ldap ldap_r m sasl2 +WANTLIB += ssl + +LIB_DEPENDS= pt.>=3::devel/ptlib \ + avutil.>=6::graphics/ffmpeg \ + speex.>=4::audio/speex \ + gsm.>=1::audio/gsm + +WRKDIST= ${WRKDIR}/h323plus + +USE_GMAKE= Yes +ALL_TARGET= opt +NO_REGRESS= Yes + +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/plugins + +CONFIGURE_STYLE=gnu +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -pthread -lavutil" \ + PTLIBDIR="`ptlib-config --prefix`/share/ptlib" +CONFIGURE_ARGS= --disable-localspeex \ + --disable-localgsm \ + --enable-gnugk + +MAKE_ENV= STDCCFLAGS="${STDCCFLAGS} -I${WRKSRC}/include" \ + CC=${CC} CPLUS=${CXX} BUILDSELF="1" + +MAKE_FLAGS= MAJOR_VERSION=${LIBh323_VERSION:R} \ + MINOR_VERSION=${LIBh323_VERSION:E} + +post-extract: + @mv ${WRKDIR}/plugins ${WRKSRC}/plugins + +pre-configure: + ${SUBST_CMD} ${WRKSRC}/Makefile.in \ + ${WRKSRC}/plugins/audio/Speex/Makefile.in \ + ${WRKSRC}/openh323u.mak.in \ + ${WRKSRC}/plugins/video/H.263-ffmpeg/h263ffmpeg.cxx + find ${WRKSRC}/plugins/ -type f -name Makefile.in -exec \ + perl -pi -e 's,pwlib,ptlib,g' {} \; + +post-install: + @cd ${WRKBUILD}/plugins && \ + ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${ALL_FAKE_FLAGS} ${INSTALL_TARGET} + ${INSTALL_DATA} ${WRKSRC}/version.h ${PREFIX}/share/openh323 + +.include diff --git a/net/h323plus/distinfo b/net/h323plus/distinfo new file mode 100644 index 00000000000..7c83a15d0ca --- /dev/null +++ b/net/h323plus/distinfo @@ -0,0 +1,10 @@ +MD5 (h323plus-v1_21_0.tar.gz) = NwUy5XVKCSyXVZMMTx9vYQ== +MD5 (plugins-v1_21_0.tar.gz) = Rm01SA2nvfbLVzehc9Iadw== +RMD160 (h323plus-v1_21_0.tar.gz) = m3pebXaFDSqvfcANYhRdI0SRhXI= +RMD160 (plugins-v1_21_0.tar.gz) = MPoAyqVCBs45xt9aN/bf6375VOE= +SHA1 (h323plus-v1_21_0.tar.gz) = JO/SANjUcTnOV49NWqhfO7GOYcs= +SHA1 (plugins-v1_21_0.tar.gz) = 3k/wa6WHDnJv3EjcBzVOw2vKCN0= +SHA256 (h323plus-v1_21_0.tar.gz) = diChfosOzw+Ofss17e220Jcn034BiTX6ut07ULuKnTw= +SHA256 (plugins-v1_21_0.tar.gz) = WTb4v3n+1+HyvztWKzh2AY2/QprcopW970FwsU0oJSI= +SIZE (h323plus-v1_21_0.tar.gz) = 2183577 +SIZE (plugins-v1_21_0.tar.gz) = 2254318 diff --git a/net/h323plus/patches/patch-Makefile_in b/net/h323plus/patches/patch-Makefile_in new file mode 100644 index 00000000000..bc98e5b2be2 --- /dev/null +++ b/net/h323plus/patches/patch-Makefile_in @@ -0,0 +1,36 @@ +$OpenBSD: patch-Makefile_in,v 1.1.1.1 2010/03/23 21:11:57 ajacoutot Exp $ +--- Makefile.in.orig Wed Apr 8 16:37:56 2009 ++++ Makefile.in Tue Jun 23 12:32:29 2009 +@@ -337,6 +337,7 @@ update: + # standard build command + $(subst tagbuild,,$(STANDARD_TARGETS)) :: + $(MAKE) -C src $@ ++ $(MAKE) -C plugins $@ + + notrace:: + $(MAKE) NOTRACE=1 +@@ -347,23 +348,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).${LIBh323_VERSION} $(DESTDIR)$(LIBDIR) + ( for dir in $(DESTDIR)$(LIBDIR) \ + $(DESTDIR)$(PREFIX)/include/openh323 \ + $(DESTDIR)$(PREFIX)/include/openh323/codec \ diff --git a/net/h323plus/patches/patch-openh323u_mak_in b/net/h323plus/patches/patch-openh323u_mak_in new file mode 100644 index 00000000000..32cde61e00e --- /dev/null +++ b/net/h323plus/patches/patch-openh323u_mak_in @@ -0,0 +1,45 @@ +$OpenBSD: patch-openh323u_mak_in,v 1.1.1.1 2010/03/23 21:11:57 ajacoutot Exp $ +--- openh323u.mak.in.orig Sat Jul 19 03:12:28 2008 ++++ openh323u.mak.in Fri Jun 12 12:11:43 2009 +@@ -193,7 +193,11 @@ + # + + PTLIBDIR = @PTLIBDIR@ ++ifdef BUILDSELF + OPENH323DIR = @OPENH323DIR@ ++else ++OPENH323DIR = ${PREFIX}/share/openh323 ++endif + STDCCFLAGS += @STDCCFLAGS@ + LDFLAGS += @LDFLAGS@ + LDLIBS += @LDLIBS@ +@@ -232,11 +236,12 @@ 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 ++endif + + ifndef OH323_LIBDIR + OH323_LIBDIR = $(OPENH323DIR)/lib +@@ -251,8 +256,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).$(LIB_SUFFIX).${LIBh323_VERSION} ++endif + + LDFLAGS += -L$(OH323_LIBDIR) + LDLIBS := -l$(OH323_BASE) $(LDLIBS) diff --git a/net/h323plus/patches/patch-plugins_Makefile_in b/net/h323plus/patches/patch-plugins_Makefile_in new file mode 100644 index 00000000000..f486618c798 --- /dev/null +++ b/net/h323plus/patches/patch-plugins_Makefile_in @@ -0,0 +1,13 @@ +$OpenBSD: patch-plugins_Makefile_in,v 1.1.1.1 2010/03/23 21:11:57 ajacoutot Exp $ +--- plugins/Makefile.in.orig Tue Nov 13 13:29:44 2007 ++++ plugins/Makefile.in Fri Jun 5 00:18:29 2009 +@@ -4,8 +4,7 @@ SUBDIRS = audio/GSM0610 \ + audio/LPC_10 \ + audio/G726 \ + audio/IMA_ADPCM \ +- audio/gsm-amr \ +- video/H.261-vic ++ audio/gsm-amr + + HAS_H263=@HAS_H263@ + ifeq ($(HAS_H263),1) diff --git a/net/h323plus/patches/patch-plugins_audio_GSM0610_Makefile_in b/net/h323plus/patches/patch-plugins_audio_GSM0610_Makefile_in new file mode 100644 index 00000000000..3317468751d --- /dev/null +++ b/net/h323plus/patches/patch-plugins_audio_GSM0610_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-plugins_audio_GSM0610_Makefile_in,v 1.1.1.1 2010/03/23 21:11:57 ajacoutot Exp $ +--- plugins/audio/GSM0610/Makefile.in.orig Tue Jun 23 11:29:40 2009 ++++ plugins/audio/GSM0610/Makefile.in Tue Jun 23 11:30:11 2009 +@@ -117,7 +117,7 @@ EXTRALIBS = + + else + +-EXTRALIBS = -lgsm ++EXTRALIBS = -L${LOCALBASE}/lib -lgsm + + endif + diff --git a/net/h323plus/patches/patch-plugins_audio_Speex_Makefile_in b/net/h323plus/patches/patch-plugins_audio_Speex_Makefile_in new file mode 100644 index 00000000000..07b233a2611 --- /dev/null +++ b/net/h323plus/patches/patch-plugins_audio_Speex_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-plugins_audio_Speex_Makefile_in,v 1.1.1.1 2010/03/23 21:11:57 ajacoutot Exp $ +--- plugins/audio/Speex/Makefile.in.orig Mon Oct 22 09:40:54 2007 ++++ plugins/audio/Speex/Makefile.in Fri Jun 5 00:32:57 2009 +@@ -131,7 +131,7 @@ SRCS += $(SRCDIR)/bits.c \ + + EXTRALIBS = + else +-EXTRALIBS = -lspeex ++EXTRALIBS = -L${LOCALBASE}/lib -lspeex + endif + + OBJDIR = ./obj diff --git a/net/h323plus/patches/patch-plugins_configure b/net/h323plus/patches/patch-plugins_configure new file mode 100644 index 00000000000..fc386ef3fd5 --- /dev/null +++ b/net/h323plus/patches/patch-plugins_configure @@ -0,0 +1,38 @@ +$OpenBSD: patch-plugins_configure,v 1.1.1.1 2010/03/23 21:11:57 ajacoutot Exp $ +--- plugins/configure.orig Mon Oct 22 09:40:39 2007 ++++ plugins/configure Fri Jun 5 06:39:24 2009 +@@ -5886,13 +5886,13 @@ echo "${ECHO_T}no" >&6 + else + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 ++ echo "$as_me:$LINENO: checking for dlopen" >&5 ++echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 + if test "${ac_cv_lib_dl_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldl $LIBS" ++LIBS="$LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -6101,7 +6101,7 @@ fi + LIBS=$saved_LIBS + if test "x${ffmpeg_libs}" != "xno"; then + +-for ac_header in ffmpeg/avcodec.h ++for ac_header in libavcodec/avcodec.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + if eval "test \"\${$as_ac_Header+set}\" = set"; then +@@ -6262,7 +6262,7 @@ _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include ++#include + #ifdef LIBAVCODEC_VERSION_INT + #if LIBAVCODEC_VERSION_INT >= ((51<<16)+(11<<8)+0) + yes diff --git a/net/h323plus/patches/patch-plugins_video_H_263-ffmpeg_h263ffmpeg_cxx b/net/h323plus/patches/patch-plugins_video_H_263-ffmpeg_h263ffmpeg_cxx new file mode 100644 index 00000000000..b2e2a6f21fb --- /dev/null +++ b/net/h323plus/patches/patch-plugins_video_H_263-ffmpeg_h263ffmpeg_cxx @@ -0,0 +1,35 @@ +$OpenBSD: patch-plugins_video_H_263-ffmpeg_h263ffmpeg_cxx,v 1.1.1.1 2010/03/23 21:11:57 ajacoutot Exp $ +--- plugins/video/H.263-ffmpeg/h263ffmpeg.cxx.orig Tue Nov 25 12:25:41 2008 ++++ plugins/video/H.263-ffmpeg/h263ffmpeg.cxx Fri Jan 29 19:03:14 2010 +@@ -169,7 +169,7 @@ extern "C" { + # define DIR_SEPERATOR "\\" + # define DIR_TOKENISER ";" + # else +-# define P_DEFAULT_PLUGIN_DIR "/usr/lib/ptlib:/usr/lib/pwlib" ++# define P_DEFAULT_PLUGIN_DIR "${TRUEPREFIX}/lib:${TRUEPREFIX}/lib/ptlib:${TRUEPREFIX}/lib/pwlib" + # define DIR_SEPERATOR "/" + # define DIR_TOKENISER ":" + # endif +@@ -337,7 +337,7 @@ class DynaLink + _hDLL = dlopen((const char *)path, RTLD_NOW); + if (_hDLL == NULL) { + fprintf(stderr, "error loading %s", path); +- char * err = dlerror(); ++ const char * err = dlerror(); + if (err != NULL) + fprintf(stderr, " - %s", err); + fprintf(stderr, "\n"); +@@ -470,11 +470,11 @@ bool FFMPEGLibrary::Load() + if (IsLoaded()) + return true; + +- if (!DynaLink::Open("avcodec") ++ if (!DynaLink::Open("libavcodec.so") + #if defined(WIN32) + && !DynaLink::Open("libavcodec") + #else +- && !DynaLink::Open("libavcodec.so") ++ && !DynaLink::Open("avcodec") + #endif + ) { + //cerr << "FFLINK\tFailed to load a library, some codecs won't operate correctly;" << endl; diff --git a/net/h323plus/pkg/DESCR b/net/h323plus/pkg/DESCR new file mode 100644 index 00000000000..9724583f846 --- /dev/null +++ b/net/h323plus/pkg/DESCR @@ -0,0 +1,2 @@ +The H323plus project aims to create a full featured, interoperable, Open +Source implementation of the ITU H.323 teleconferencing protocol. diff --git a/net/h323plus/pkg/PLIST b/net/h323plus/pkg/PLIST new file mode 100644 index 00000000000..d4638434727 --- /dev/null +++ b/net/h323plus/pkg/PLIST @@ -0,0 +1,108 @@ +@comment $OpenBSD: PLIST,v 1.1.1.1 2010/03/23 21:11:57 ajacoutot Exp $ +@conflict openh323-* +@pkgpath net/openh323 +include/openh323/ +include/openh323/channels.h +include/openh323/codec/ +include/openh323/codec/opalplugin.h +include/openh323/codecs.h +include/openh323/dynacodec.h +include/openh323/gccpdu.h +include/openh323/gkclient.h +include/openh323/gkserver.h +include/openh323/gnugknat.h +include/openh323/guid.h +include/openh323/h224.h +include/openh323/h224handler.h +include/openh323/h225.h +include/openh323/h225ras.h +include/openh323/h230/ +include/openh323/h230/OID2.h +include/openh323/h230/h230.h +include/openh323/h235.h +include/openh323/h235auth.h +include/openh323/h235plugin.h +include/openh323/h235pluginmgr.h +include/openh323/h245.h +include/openh323/h248.h +include/openh323/h281.h +include/openh323/h281handler.h +include/openh323/h323.h +include/openh323/h323annexg.h +include/openh323/h323caps.h +include/openh323/h323con.h +include/openh323/h323ep.h +include/openh323/h323filetransfer.h +include/openh323/h323h224.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/h341/ +include/openh323/h341/h341.h +include/openh323/h341/h341_oid.h +include/openh323/h350/ +include/openh323/h350/h350.h +include/openh323/h350/h350_service.h +include/openh323/h450/ +include/openh323/h450/h4501.h +include/openh323/h450/h45010.h +include/openh323/h450/h45011.h +include/openh323/h450/h4502.h +include/openh323/h450/h4503.h +include/openh323/h450/h4504.h +include/openh323/h450/h4505.h +include/openh323/h450/h4506.h +include/openh323/h450/h4507.h +include/openh323/h450/h4508.h +include/openh323/h450/h4509.h +include/openh323/h450/h450pdu.h +include/openh323/h460/ +include/openh323/h460/h460.h +include/openh323/h460/h4601.h +include/openh323/h460/h46018.h +include/openh323/h460/h46019.h +include/openh323/h460/h4609.h +include/openh323/h460/h460p.h +include/openh323/h460/h460pres.h +include/openh323/h460/h460tm.h +include/openh323/h501.h +include/openh323/h501pdu.h +include/openh323/jitter.h +include/openh323/mcspdu.h +include/openh323/mediafmt.h +include/openh323/opalvxml.h +include/openh323/opalwavfile.h +include/openh323/openh323buildopts.h +include/openh323/peclient.h +include/openh323/q922.h +include/openh323/q931.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/x224.h +include/openh323/x880.h +@lib lib/libh323.so.${LIBh323_VERSION} +lib/ptlib/codecs/ +lib/ptlib/codecs/audio/ +lib/ptlib/codecs/audio/g726_audio_pwplugin.so +lib/ptlib/codecs/audio/gsm0610_audio_pwplugin.so +lib/ptlib/codecs/audio/gsmamrcodec_pwplugin.so +lib/ptlib/codecs/audio/ilbc_audio_pwplugin.so +lib/ptlib/codecs/audio/ima_adpcm_audio_pwplugin.so +lib/ptlib/codecs/audio/lpc10_audio_pwplugin.so +lib/ptlib/codecs/audio/speex_audio_pwplugin.so +lib/ptlib/codecs/video/ +lib/ptlib/codecs/video/h263-ffmpeg_video_pwplugin.so +share/openh323/ +share/openh323/openh323u.mak +share/openh323/version.h +@unexec-delete rm -f %D/lib/ptlib/libavcodec.so