diff -ruN net/openh323/Makefile.orig net/openh323/Makefile --- net/openh323/Makefile.orig Fri Jun 10 21:30:34 2005 +++ net/openh323/Makefile Tue Jul 12 11:09:38 2005 @@ -6,60 +6,49 @@ # PORTNAME= openh323 -PORTVERSION= 1.12.2 +PORTVERSION= 1.15.3 CATEGORIES= net -MASTER_SITES= http://www.openh323.org/bin/ \ - http://www.de.openh323.org/bin/ \ - http://www.gnomemeeting.org/downloads/0.98.0/sources/ -DISTNAME= ${PORTNAME}_${PORTVERSION} +MASTER_SITES= http://www.gnomemeeting.org/admin/downloads/latest/sources/sources/ MAINTAINER= ports@FreeBSD.org COMMENT= A H323 Video Conferencing library -BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build -LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 +LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 \ + pt_FreeBSD_x86_r.1:${PORTSDIR}/devel/pwlib -.include -.if ${OSVERSION} < 500000 +# if comms/ixj worked in 5.X it'd be useful to include it for telephony.h # Check for telephony.h in the two places the source is hard coded to check # /usr/include/sys and /usr/local/include/sys # If it is not present, extract it from the comms/ixj port -.if !exists(/usr/include/sys/telephony.h) -.if !exists(/usr/local/include/sys/telephony.h) -PATCH_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/comms/ixj:patch -.endif -.endif -.endif -WRKSRC= ${WRKDIR}/${PORTNAME} +# multimedia/ffmpeg - 0.4.7 was the last version for which there were patches +# to get it working with openh323. There has been some recent (6/14/05) +# discussion on the openh323 mailing list about this. One guy said he'll try +# to get it working and, once again, submit patches to ffmpeg group so its +# possible we'll be seeing a version that works again. +# All necessary source code is available here: +# http://sourceforge.net/projects/openh323 +# +# And further details is available here: +# http://www.salyens.com/mingw/ +# http://www.salyens.com/ffcodec/ +# +# ffmpeg is required to get a good RFC2190 complaint H.263 codec but it +# also support Mpeg1 MPEG4 Real Video and DIVX + +# audio/speex - port currently uses its own internal version but linking +# the audio/speex port would be nicer from an upgrading standpoint -PLIST_FILES= bin/simph323 -USE_BISON= yes +USE_BISON= yes USE_GMAKE= yes -USE_OPENLDAP= yes USE_AUTOCONF_VER= 259 GNU_CONFIGURE= yes -PWLIBDIR!= cd ${PORTSDIR}/devel/pwlib && make -V WRKSRC -CONFIGURE_ENV= PWLIBDIR=${PWLIBDIR} OPENH323DIR=${WRKSRC} -ALL_TARGET= optnoshared -MAKE_ENV= PWLIBDIR=${PWLIBDIR} OPENH323DIR=${WRKSRC} -THE_MACHTYPE= ${ARCH:S/i386/x86/} -MAKE_ARGS= OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX} - -post-patch: -.if ${OSVERSION} < 500000 -.if !exists(/usr/include/sys/telephony.h) -.if !exists(/usr/local/include/sys/telephony.h) - # Copy ixj driver include files into OpenH323 include directory - ${MKDIR} ${WRKDIR}/openh323/include/sys - ${CP} ${WRKDIRPREFIX}${.CURDIR}/../../comms/ixj/work/ixj_freebsd/telephony.h ${WRKDIR}/openh323/include/sys - ${CP} ${WRKDIRPREFIX}${.CURDIR}/../../comms/ixj/work/ixj_freebsd/ixjuser.h ${WRKDIR}/openh323/include/sys -.endif -.endif -.endif -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/samples/simple/obj_${OPSYS}_${THE_MACHTYPE}_r/simph323 ${PREFIX}/bin +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" BUILDTIME="YES" +NO_FILTER_SHLIBS= yes +ALL_TARGET= optshared +MAKE_ENV= BUILDTIME="YES" + +.include -.include diff -ruN net/openh323/distinfo.orig net/openh323/distinfo --- net/openh323/distinfo.orig Fri Jun 10 21:30:34 2005 +++ net/openh323/distinfo Tue Jul 12 10:38:58 2005 @@ -1,2 +1,2 @@ -MD5 (openh323_1.12.2.tar.gz) = 15f0b12b60769d03eca9e498050776f3 -SIZE (openh323_1.12.2.tar.gz) = 2343354 +MD5 (openh323-1.15.3.tar.gz) = f9d25921281843fd2304da494b2e04e2 +SIZE (openh323-1.15.3.tar.gz) = 3754056 diff -ruN net/openh323/files/patch-Makefile.in.orig net/openh323/files/patch-Makefile.in --- net/openh323/files/patch-Makefile.in.orig Thu Jan 1 00:00:00 1970 +++ net/openh323/files/patch-Makefile.in Tue Jul 12 11:11:15 2005 @@ -0,0 +1,11 @@ +--- Makefile.in.orig Wed May 25 10:26:09 2005 ++++ Makefile.in Wed May 25 10:28:55 2005 +@@ -297,7 +297,7 @@ + endif + + ifneq (,$(wildcard openphone)) +-ifneq (,$(wildcard $(PWLIBDIR)/src/pwlib)) ++ifneq (,$(wildcard $(PW_PREFIX)/src/pwlib)) + SUBDIRS += openphone + endif + endif diff -ruN net/openh323/files/patch-configure.ac.orig net/openh323/files/patch-configure.ac --- net/openh323/files/patch-configure.ac.orig Thu Jan 1 00:00:00 1970 +++ net/openh323/files/patch-configure.ac Tue Jul 12 11:18:25 2005 @@ -0,0 +1,103 @@ +--- configure.ac.orig Fri Nov 26 09:47:00 2004 ++++ configure.ac Wed May 25 11:06:01 2005 +@@ -50,51 +50,25 @@ + if test "${PWLIBDIR:-unset}" != "unset" ; then + AC_CHECK_FILE(${PWLIBDIR}/version.h, HAS_PTLIB=1) + fi +-if test "${HAS_PTLIB:-unset}" = "unset" ; then +- AC_CHECK_FILE(${OPENH323DIR}/../pwlib/version.h, HAS_PTLIB=1) +- if test "${HAS_PTLIB:-unset}" != "unset" ; then +- PWLIBDIR="${OPENH323DIR}/../pwlib" +- else +- AC_CHECK_FILE(${HOME}/pwlib/include/ptlib.h, HAS_PTLIB=1) +- if test "${HAS_PTLIB:-unset}" != "unset" ; then +- PWLIBDIR="${HOME}/pwlib" +- else +- AC_CHECK_FILE(/usr/local/include/ptlib.h, HAS_PTLIB=1) +- if test "${HAS_PTLIB:-unset}" != "unset" ; then +- AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/local/bin) +- else +- AC_CHECK_FILE(/usr/include/ptlib.h, HAS_PTLIB=1) +- if test "${HAS_PTLIB:-unset}" != "unset" ; then +- AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/share/pwlib/make/) +- fi +- fi +- fi +- fi +-fi +- +-if test "${HAS_PTLIB:-unset}" = "unset" ; then +- echo "Cannot find pwlib - please install or set PWLIBDIR and try again" +- exit ++if test "x${HAS_PTLIB}" = "x" ; then ++ AC_PATH_PROG(PTLIB_CONFIG, ptlib-config) + fi + +-if test "${PWLIBDIR:-unset}" = "unset" ; then +- if test "${PTLIB_CONFIG:-unset}" = "unset" ; then ++if test "x${PWLIBDIR}" = "x" ; then ++ if test "x${PTLIB_CONFIG}" = "x" ; then + echo "Cannot find ptlib-config - please install and try again" + exit + fi +- PWLIBDIR=`$PTLIB_CONFIG --prefix` +-fi +- +-if test "x$PWLIBDIR" = "x/usr" -o "x$PWLIBDIR" = "x/usr/"; then +- PWLIBDIR="/usr/share/pwlib/" +-fi +-if test "x$PWLIBDIR" = "x/usr/local" -o "x$PWLIBDIR" = "x/usr/"; then +- PWLIBDIR="/usr/local/share/pwlib/" ++ PW_PREFIX=`$PTLIB_CONFIG --prefix` ++ PWLIBDIR=`$PTLIB_CONFIG --pwlibdir` ++ PW_LIBDIR=$PW_PREFIX/lib + fi + +-echo "PWLib prefix set to.... $PWLIBDIR" ++echo "PWLib set to.... $PW_PREFIX" + +-AC_SUBST(PWLIBDIR) ++AC_SUBST(PW_PREFIX) ++AC_SUBST(PWLIBDIR) ++AC_SUBST(PW_LIBDIR) + + + dnl ######################################################################## +@@ -178,7 +152,7 @@ + else + AC_MSG_NOTICE(Checking for RFC2190 H.263 codec) + AC_CHECK_HEADER(${H323_RFC2190_AVCODEC_DIR}/avcodec.h, H323_RFC2190_AVCODEC=1) +- if test "${H323_RFC2190_AVCODEC}" == "1" ; then ++ if test "${H323_RFC2190_AVCODEC}" = "1" ; then + AC_DEFINE(H323_RFC2190_AVCODEC) + AC_SUBST(H323_RFC2190_AVCODEC, 1) + AC_SUBST(H323_RFC2190_AVCODEC_DIR, ${H323_RFC2190_AVCODEC_DIR}) +@@ -210,7 +184,7 @@ + dnl MSWIN_CHECK_DIR avcodec,\ffmpeg\libavcodec\ + dnl MSWIN_CHECK_DIR avcodec,c:\ffmpeg\libavcodec\ + +- AC_CHECK_HEADERS(avcodec.h, H323_AVCODEC=1) ++ AC_CHECK_HEADERS(ffmpeg/avcodec.h, H323_AVCODEC=1) + + if test "${H323_AVCODEC:-unset}" != "unset" ; then + AC_CHECK_LIB(avcodec, avcodec_open, H323_AVCODEC=1, H323_AVCODEC=) +@@ -223,9 +197,9 @@ + if test "${H323_AVCODEC:-unset}" != "unset" ; then + AC_SUBST(H323_AVCODEC, 1) + AC_DEFINE(H323_AVCODEC, 1, "ffmpeg based avodec found") +- AVCODECINCLUDEDIR=/usr/local/include/ffmpeg ++ AVCODECINCLUDEDIR=/usr/local/include + AVCODECLIBDIR=/usr/local/lib +- STDCCFLAGS="$STDCCFLAGS -I${AVCODECINCLUDEDIR}" ++ STDCCFLAGS="$STDCCFLAGS -I${AVCODECINCLUDEDIR} -L${AVCODECLIBDIR}" + + echo " H263 codec on FFmpeg library enabled" + fi +@@ -282,6 +256,7 @@ + dnl make directives + + AC_SUBST(STDCCFLAGS) ++AC_SUBST(CPPFLAGS) + AC_SUBST(LDFLAGS) + AC_SUBST(ENDLDLIBS) + AC_PROG_INSTALL diff -ruN net/openh323/files/patch-configurein.orig net/openh323/files/patch-configurein --- net/openh323/files/patch-configurein.orig Fri Jun 10 21:30:34 2005 +++ net/openh323/files/patch-configurein Thu Jan 1 00:00:00 1970 @@ -1,19 +0,0 @@ -*** configure.in.orig Mon Jun 6 14:34:14 2005 ---- configure.in Mon Jun 6 14:41:03 2005 -*************** -*** 109,115 **** - if test "${H323_AVCODEC:-unset}" != "unset" ; then - AC_SUBST(H323_AVCODEC, 1) - AC_DEFINE(H323_AVCODEC, 1, "ffmpeg based avodec found") -! AVCODECINCLUDEDIR=/usr/local/include/ffmpeg - AVCODECLIBDIR=/usr/local/lib - STDCCFLAGS="$STDCCFLAGS -I${AVCODECINCLUDEDIR}" - ---- 109,115 ---- - if test "${H323_AVCODEC:-unset}" != "unset" ; then - AC_SUBST(H323_AVCODEC, 1) - AC_DEFINE(H323_AVCODEC, 1, "ffmpeg based avodec found") -! AVCODECINCLUDEDIR=/usr/local/include - AVCODECLIBDIR=/usr/local/lib - STDCCFLAGS="$STDCCFLAGS -I${AVCODECINCLUDEDIR}" - diff -ruN net/openh323/files/patch-include-ffh263codec.h.orig net/openh323/files/patch-include-ffh263codec.h --- net/openh323/files/patch-include-ffh263codec.h.orig Fri Jun 10 21:30:34 2005 +++ net/openh323/files/patch-include-ffh263codec.h Thu Jan 1 00:00:00 1970 @@ -1,12 +0,0 @@ -*** include/ffh263codec.h.orig Mon Aug 4 00:03:16 2003 ---- include/ffh263codec.h Mon Jun 6 14:54:31 2005 -*************** -*** 96,101 **** ---- 96,102 ---- - struct AVCodec; - struct AVCodecContext; - struct AVFrame; -+ struct AVCodecParserContext; - - /////////////////////////////////////////////////////////////////////////////// - diff -ruN net/openh323/files/patch-include-h263codec.h.orig net/openh323/files/patch-include-h263codec.h --- net/openh323/files/patch-include-h263codec.h.orig Fri Jun 10 21:30:34 2005 +++ net/openh323/files/patch-include-h263codec.h Thu Jan 1 00:00:00 1970 @@ -1,19 +0,0 @@ -*** include/h263codec.h.orig Mon Aug 4 00:03:22 2003 ---- include/h263codec.h Mon Jun 6 14:57:16 2005 -*************** -*** 426,432 **** - send. Note that for every encode thread, this 1 method is called. Consequently, - code is required to separate out packets from different encode threads. - */ -! static void RtpCallback(void *data, int size, int packetNumber); - - protected: - BOOL Resize(int width, int height); ---- 426,432 ---- - send. Note that for every encode thread, this 1 method is called. Consequently, - code is required to separate out packets from different encode threads. - */ -! static void RtpCallback(AVCodecContext *s, void *data, int size, int packet Number); - - protected: - BOOL Resize(int width, int height); diff -ruN net/openh323/files/patch-include::ffh263codec.h.orig net/openh323/files/patch-include::ffh263codec.h --- net/openh323/files/patch-include::ffh263codec.h.orig Thu Jan 1 00:00:00 1970 +++ net/openh323/files/patch-include::ffh263codec.h Tue Jul 12 11:20:03 2005 @@ -0,0 +1,11 @@ +*** include/ffh263codec.h.orig Mon Aug 4 00:03:16 2003 +--- include/ffh263codec.h Mon Jun 6 14:54:31 2005 +*************** +*** 96,101 **** +--- 96,102 ---- + struct AVCodec; + struct AVCodecContext; + struct AVFrame; ++ struct AVCodecParserContext; + + /////////////////////////////////////////////////////////////////////////////// diff -ruN net/openh323/files/patch-include::gkserver.h.orig net/openh323/files/patch-include::gkserver.h --- net/openh323/files/patch-include::gkserver.h.orig Sat Aug 28 17:41:20 2004 +++ net/openh323/files/patch-include::gkserver.h Thu Jan 1 00:00:00 1970 @@ -1,10 +0,0 @@ ---- include/gkserver.h 2004/08/28 17:16:13 1.1 -+++ include/gkserver.h 2004/08/28 17:16:24 -@@ -404,7 +404,6 @@ - H225_RegistrationConfirm & rcf; - H225_RegistrationReject & rrj; - -- protected: - virtual Response OnHandlePDU(); - }; - diff -ruN net/openh323/files/patch-include::h263codec.h.orig net/openh323/files/patch-include::h263codec.h --- net/openh323/files/patch-include::h263codec.h.orig Thu Jan 1 00:00:00 1970 +++ net/openh323/files/patch-include::h263codec.h Tue Jul 12 11:19:27 2005 @@ -0,0 +1,19 @@ +*** include/h263codec.h.orig Mon Aug 4 00:03:22 2003 +--- include/h263codec.h Mon Jun 6 14:57:16 2005 +*************** +*** 426,432 **** + send. Note that for every encode thread, this 1 method is called. Consequently, + code is required to separate out packets from different encode threads. + */ +! static void RtpCallback(void *data, int size, int packetNumber); + + protected: + BOOL Resize(int width, int height); +--- 426,432 ---- + send. Note that for every encode thread, this 1 method is called. Consequently, + code is required to separate out packets from different encode threads. + */ +! static void RtpCallback(AVCodecContext *s, void *data, int size, int packet Number); + + protected: + BOOL Resize(int width, int height); diff -ruN net/openh323/files/patch-ixjlid.orig net/openh323/files/patch-ixjlid --- net/openh323/files/patch-ixjlid.orig Tue Sep 2 17:40:23 2003 +++ net/openh323/files/patch-ixjlid Thu Jan 1 00:00:00 1970 @@ -1,21 +0,0 @@ -*** include/ixjlid.h.orig Tue Sep 2 17:32:20 2003 ---- include/ixjlid.h Tue Sep 2 17:32:37 2003 -*************** -*** 253,260 **** - #include - #endif - #ifdef P_FREEBSD -! #include -! #include - #endif - #endif - ---- 253,260 ---- - #include - #endif - #ifdef P_FREEBSD -! #include "sys/telephony.h" -! #include "sys/ixjuser.h" - #endif - #endif - diff -ruN net/openh323/files/patch-openh323u.mak.in.orig net/openh323/files/patch-openh323u.mak.in --- net/openh323/files/patch-openh323u.mak.in.orig Thu Jan 1 00:00:00 1970 +++ net/openh323/files/patch-openh323u.mak.in Tue Jul 12 11:20:18 2005 @@ -0,0 +1,34 @@ +--- openh323u.mak.in.orig Thu Jun 10 13:16:30 2004 ++++ openh323u.mak.in Thu Jun 16 15:16:36 2005 +@@ -156,10 +156,18 @@ + # Added auto inclusion of ptlib make rules + # + ++PW_PREFIX = @PW_PREFIX@ + PWLIBDIR = @PWLIBDIR@ +-OPENH323DIR = @OPENH323DIR@ ++PW_LIBDIR = @PW_LIBDIR@ ++ifndef BUILDTIME ++OH323_INCDIR = $(PREFIX)/include/openh323 ++else ++OPENH323DIR = @OPENH323DIR@ ++OH323_INCDIR = $(OPENH323DIR)/include ++endif + STDCCFLAGS += @STDCCFLAGS@ + LDFLAGS += @LDFLAGS@ ++CPPFLAGS += @CPPFLAGS@ + ENDLDLIBS := @ENDLDLIBS@ $(ENDLDLIBS) + + H323_AVCODEC = @H323_AVCODEC@ +@@ -183,11 +191,6 @@ + #OH323_SUPPRESS_H235 = 1 + + OH323_SRCDIR = $(OPENH323DIR)/src +-ifdef PREFIX +-OH323_INCDIR = $(PREFIX)/include/openh323 +-else +-OH323_INCDIR = $(OPENH323DIR)/include +-endif + ifndef OH323_LIBDIR + OH323_LIBDIR = $(OPENH323DIR)/lib + endif diff -ruN net/openh323/files/patch-openh323uin.orig net/openh323/files/patch-openh323uin --- net/openh323/files/patch-openh323uin.orig Mon Sep 1 05:29:21 2003 +++ net/openh323/files/patch-openh323uin Thu Jan 1 00:00:00 1970 @@ -1,53 +0,0 @@ -*** openh323u.mak.in.orig Wed May 14 20:52:44 2003 ---- openh323u.mak.in Sun Aug 31 21:26:51 2003 -*************** LIBDIRS += $(OPENH323DIR) -*** 142,152 **** - - - OH323_SRCDIR = $(OPENH323DIR)/src -! ifdef PREFIX -! OH323_INCDIR = $(PREFIX)/include/openh323 -! else - OH323_INCDIR = $(OPENH323DIR)/include -! endif - OH323_LIBDIR = $(OPENH323DIR)/lib - - ---- 142,152 ---- - - - OH323_SRCDIR = $(OPENH323DIR)/src -! #ifdef PREFIX -! #OH323_INCDIR = $(PREFIX)/include/openh323 -! #else - OH323_INCDIR = $(OPENH323DIR)/include -! #endif - OH323_LIBDIR = $(OPENH323DIR)/lib - - -*************** ifdef OH323_SUPPRESS_H235 -*** 184,189 **** ---- 184,190 ---- - STDCCFLAGS += -DOH323_SUPPRESS_H235 - endif - -+ # Check for the ixj/telephony header files on the system. - ifneq (,$(wildcard $(SYSINCDIR)/linux/telephony.h)) - HAS_IXJ = 1 - STDCCFLAGS += -DHAS_IXJ -*************** endif -*** 197,202 **** ---- 198,210 ---- - ifneq (,$(wildcard /usr/local/include/sys/telephony.h)) - HAS_IXJ = 1 - STDCCFLAGS += -DHAS_IXJ -I/usr/local/include -+ endif -+ -+ # In the FreeBSD port, we make a local copy of the ixj header files from -+ # the ixj driver in openh323/include/sys -+ ifneq (,$(wildcard $(OPENH323DIR)/include/sys/telephony.h)) -+ HAS_IXJ = 1 -+ STDCCFLAGS += -DHAS_IXJ - endif - - #Check if we have an OSS soundcard.h diff -ruN net/openh323/files/patch-plugins_audio_G726_g726codec.c.orig net/openh323/files/patch-plugins_audio_G726_g726codec.c --- net/openh323/files/patch-plugins_audio_G726_g726codec.c.orig Thu Jan 1 00:00:00 1970 +++ net/openh323/files/patch-plugins_audio_G726_g726codec.c Tue Jul 12 11:21:03 2005 @@ -0,0 +1,10 @@ +--- ./plugins/audio/G726/g726codec.c.orig Mon Feb 7 01:41:31 2005 ++++ ./plugins/audio/G726/g726codec.c Wed May 25 11:31:30 2005 +@@ -60,7 +60,6 @@ + + PLUGIN_CODEC_IMPLEMENT("G.726") + +-#include + #include + + #include "g726/g72x.h" diff -ruN net/openh323/files/patch-plugins_audio_GSM0610_gsm06_10_codec.c.orig net/openh323/files/patch-plugins_audio_GSM0610_gsm06_10_codec.c --- net/openh323/files/patch-plugins_audio_GSM0610_gsm06_10_codec.c.orig Thu Jan 1 00:00:00 1970 +++ net/openh323/files/patch-plugins_audio_GSM0610_gsm06_10_codec.c Tue Jul 12 11:21:57 2005 @@ -0,0 +1,10 @@ +--- plugins/audio/GSM0610/gsm06_10_codec.c.orig Wed May 25 11:26:04 2005 ++++ plugins/audio/GSM0610/gsm06_10_codec.c Wed May 25 11:26:23 2005 +@@ -72,7 +72,6 @@ + + PLUGIN_CODEC_IMPLEMENT(GSM_0610) + +-#include + #include + #include + diff -ruN net/openh323/files/patch-plugins_audio_GSM0610_src_gsm_create.c.orig net/openh323/files/patch-plugins_audio_GSM0610_src_gsm_create.c --- net/openh323/files/patch-plugins_audio_GSM0610_src_gsm_create.c.orig Thu Jan 1 00:00:00 1970 +++ net/openh323/files/patch-plugins_audio_GSM0610_src_gsm_create.c Tue Jul 12 11:22:05 2005 @@ -0,0 +1,10 @@ +--- ./plugins/audio/GSM0610/src/gsm_create.c.orig Sun Apr 4 16:16:42 2004 ++++ ./plugins/audio/GSM0610/src/gsm_create.c Wed May 25 11:31:30 2005 +@@ -20,7 +20,6 @@ + # include + #else + # ifdef HAS_MALLOC_H +-# include + # else + extern char * malloc(); + # endif diff -ruN net/openh323/files/patch-plugins_audio_GSM0610_src_gsm_destroy.c.orig net/openh323/files/patch-plugins_audio_GSM0610_src_gsm_destroy.c --- net/openh323/files/patch-plugins_audio_GSM0610_src_gsm_destroy.c.orig Thu Jan 1 00:00:00 1970 +++ net/openh323/files/patch-plugins_audio_GSM0610_src_gsm_destroy.c Tue Jul 12 11:22:17 2005 @@ -0,0 +1,10 @@ +--- ./plugins/audio/GSM0610/src/gsm_destroy.c.orig Sun Apr 4 16:16:42 2004 ++++ ./plugins/audio/GSM0610/src/gsm_destroy.c Wed May 25 11:31:30 2005 +@@ -15,7 +15,6 @@ + # include + #else + # ifdef HAS_MALLOC_H +-# include + # else + extern void free(); + # endif diff -ruN net/openh323/files/patch-plugins_audio_IMA_ADPCM_ima_adpcm.c.orig net/openh323/files/patch-plugins_audio_IMA_ADPCM_ima_adpcm.c --- net/openh323/files/patch-plugins_audio_IMA_ADPCM_ima_adpcm.c.orig Thu Jan 1 00:00:00 1970 +++ net/openh323/files/patch-plugins_audio_IMA_ADPCM_ima_adpcm.c Tue Jul 12 11:22:25 2005 @@ -0,0 +1,10 @@ +--- ./plugins/audio/IMA_ADPCM/ima_adpcm.c.orig Mon Feb 7 01:41:32 2005 ++++ ./plugins/audio/IMA_ADPCM/ima_adpcm.c Wed May 25 11:31:30 2005 +@@ -45,7 +45,6 @@ + + PLUGIN_CODEC_IMPLEMENT("IMA-ADPCM") + +-#include + #include + #include + diff -ruN net/openh323/files/patch-plugins_audio_LPC_10_lpc_10_codec.c.orig net/openh323/files/patch-plugins_audio_LPC_10_lpc_10_codec.c --- net/openh323/files/patch-plugins_audio_LPC_10_lpc_10_codec.c.orig Thu Jan 1 00:00:00 1970 +++ net/openh323/files/patch-plugins_audio_LPC_10_lpc_10_codec.c Tue Jul 12 11:22:29 2005 @@ -0,0 +1,10 @@ +--- ./plugins/audio/LPC_10/lpc_10_codec.c.orig Mon Feb 7 01:41:32 2005 ++++ ./plugins/audio/LPC_10/lpc_10_codec.c Wed May 25 11:31:30 2005 +@@ -37,7 +37,6 @@ + + #include + +-#include + #include + #include + diff -ruN net/openh323/files/patch-plugins_audio_LPC_10_src_lpcini.c.orig net/openh323/files/patch-plugins_audio_LPC_10_src_lpcini.c --- net/openh323/files/patch-plugins_audio_LPC_10_src_lpcini.c.orig Thu Jan 1 00:00:00 1970 +++ net/openh323/files/patch-plugins_audio_LPC_10_src_lpcini.c Tue Jul 12 11:22:34 2005 @@ -0,0 +1,10 @@ +--- ./plugins/audio/LPC_10/src/lpcini.c.orig Tue May 4 13:16:43 2004 ++++ ./plugins/audio/LPC_10/src/lpcini.c Wed May 25 11:31:30 2005 +@@ -42,7 +42,6 @@ + # include + #else + # ifdef HAS_MALLOC_H +-# include + # else + extern char * malloc(); + # endif diff -ruN net/openh323/files/patch-plugins_audio_Speex_speexodec.cxx.orig net/openh323/files/patch-plugins_audio_Speex_speexodec.cxx --- net/openh323/files/patch-plugins_audio_Speex_speexodec.cxx.orig Thu Jan 1 00:00:00 1970 +++ net/openh323/files/patch-plugins_audio_Speex_speexodec.cxx Tue Jul 12 11:22:49 2005 @@ -0,0 +1,10 @@ +--- plugins/audio/Speex/speexcodec.cxx.orig Wed May 25 11:27:49 2005 ++++ plugins/audio/Speex/speexcodec.cxx Wed May 25 11:27:58 2005 +@@ -78,7 +78,6 @@ + PLUGIN_CODEC_IMPLEMENT("Speex") + }; + +-#include + #include + #include + diff -ruN net/openh323/files/patch-plugins_audio_VoiceAgeG729_g729codec.c.orig net/openh323/files/patch-plugins_audio_VoiceAgeG729_g729codec.c --- net/openh323/files/patch-plugins_audio_VoiceAgeG729_g729codec.c.orig Thu Jan 1 00:00:00 1970 +++ net/openh323/files/patch-plugins_audio_VoiceAgeG729_g729codec.c Tue Jul 12 11:22:53 2005 @@ -0,0 +1,10 @@ +--- ./plugins/audio/VoiceAgeG729/g729codec.c.orig Fri Jun 18 00:04:56 2004 ++++ ./plugins/audio/VoiceAgeG729/g729codec.c Wed May 25 11:31:30 2005 +@@ -38,7 +38,6 @@ + #pragma comment(linker, "/NODEFAULTLIB:libcmt.lib") + + #include +-#include + #include "va_g729/va_g729a.h" + + #define SAMPLES_PER_FRAME L_FRAME diff -ruN net/openh323/files/patch-plugins_audio_iLBC_ilbccodec.c.orig net/openh323/files/patch-plugins_audio_iLBC_ilbccodec.c --- net/openh323/files/patch-plugins_audio_iLBC_ilbccodec.c.orig Thu Jan 1 00:00:00 1970 +++ net/openh323/files/patch-plugins_audio_iLBC_ilbccodec.c Tue Jul 12 11:22:57 2005 @@ -0,0 +1,10 @@ +--- ./plugins/audio/iLBC/ilbccodec.c.orig Mon Feb 7 01:41:32 2005 ++++ ./plugins/audio/iLBC/ilbccodec.c Wed May 25 11:31:30 2005 +@@ -47,7 +47,6 @@ + + PLUGIN_CODEC_IMPLEMENT("iLBC") + +-#include + #include + + #include "iLBC/iLBC_encode.h" diff -ruN net/openh323/files/patch-src+OpenH323.dtf.orig net/openh323/files/patch-src+OpenH323.dtf --- net/openh323/files/patch-src+OpenH323.dtf.orig Tue Mar 8 14:14:10 2005 +++ net/openh323/files/patch-src+OpenH323.dtf Thu Jan 1 00:00:00 1970 @@ -1,11 +0,0 @@ ---- src/OpenH323.dtf.orig Sat Feb 19 11:23:59 2005 -+++ src/OpenH323.dtf Sat Feb 19 11:25:00 2005 -@@ -23073,7 +23073,7 @@ - ?RingLine@OpalLineInterfaceDevice@@UAEHIK@Z @12182 NONAME ;public: virtual int __thiscall OpalLineInterfaceDevice::RingLine(unsigned int,unsigned long) - ?RingLine@OpalVoipBlasterDevice@@UAEHIK@Z @20048 NONAME ;public: virtual int __thiscall OpalVoipBlasterDevice::RingLine(unsigned int,unsigned long) - ?ROWZAG@@3QBEB @12183 NONAME ;unsigned char const * const ROWZAG -- ?RtpCallback@H323_H263Codec@@SAXPAXHH@Z @26507 NONAME ;public: static void __cdecl H323_H263Codec::RtpCallback(void *,int,int) -+ ?RtpCallback@H323_H263Codec@@SAXPAXHH@Z @26507 NONAME ;public: static void __cdecl H323_H263Codec::RtpCallback(AVCodecContext *,void *,int,int) - ?saveblks@Pre_Vid_Coder@@IAEXPAE@Z @12184 NONAME ;protected: void __thiscall Pre_Vid_Coder::saveblks(unsigned char *) - ?SelectDefaultLogicalChannel@H323Connection@@UAEXI@Z @12185 NONAME ;public: virtual void __thiscall H323Connection::SelectDefaultLogicalChannel(unsigned int) - ?SelectFastStartChannels@H323Connection@@UAEXIHH@Z @12791 NONAME ;public: virtual void __thiscall H323Connection::SelectFastStartChannels(unsigned int,int,int) diff -ruN net/openh323/files/patch-src+OpenH323d.dtf.orig net/openh323/files/patch-src+OpenH323d.dtf --- net/openh323/files/patch-src+OpenH323d.dtf.orig Tue Mar 8 14:14:10 2005 +++ net/openh323/files/patch-src+OpenH323d.dtf Thu Jan 1 00:00:00 1970 @@ -1,11 +0,0 @@ ---- src/OpenH323d.dtf.orig Sat Feb 19 11:25:40 2005 -+++ src/OpenH323d.dtf Sat Feb 19 11:26:27 2005 -@@ -29709,7 +29709,7 @@ - ?RingLine@OpalLineInterfaceDevice@@UAEHIK@Z @16774 NONAME ;public: virtual int __thiscall OpalLineInterfaceDevice::RingLine(unsigned int,unsigned long) - ?RingLine@OpalVoipBlasterDevice@@UAEHIK@Z @29808 NONAME ;public: virtual int __thiscall OpalVoipBlasterDevice::RingLine(unsigned int,unsigned long) - ?ROWZAG@@3QBEB @16775 NONAME ;unsigned char const * const ROWZAG -- ?RtpCallback@H323_H263Codec@@SAXPAXHH@Z @38109 NONAME ;public: static void __cdecl H323_H263Codec::RtpCallback(void *,int,int) -+ ?RtpCallback@H323_H263Codec@@SAXPAXHH@Z @38109 NONAME ;public: static void __cdecl H323_H263Codec::RtpCallback(AVCodecContext *,void *,int,int) - ?SameSize@Encoder@@IAEHPBVVideoFrame@@@Z @16776 NONAME ;protected: int __thiscall Encoder::SameSize(class VideoFrame const *) - ?save@Pre_Vid_Coder@@IAEXPAE0H@Z @16777 NONAME ;protected: void __thiscall Pre_Vid_Coder::save(unsigned char *,unsigned char *,int) - ?saveblks@Pre_Vid_Coder@@IAEXPAE@Z @16778 NONAME ;protected: void __thiscall Pre_Vid_Coder::saveblks(unsigned char *) diff -ruN net/openh323/files/patch-src+OpenH323n.dtf.orig net/openh323/files/patch-src+OpenH323n.dtf --- net/openh323/files/patch-src+OpenH323n.dtf.orig Tue Mar 8 14:14:10 2005 +++ net/openh323/files/patch-src+OpenH323n.dtf Thu Jan 1 00:00:00 1970 @@ -1,11 +0,0 @@ ---- src/OpenH323n.dtf.orig Sat Feb 19 11:25:47 2005 -+++ src/OpenH323n.dtf Sat Feb 19 11:26:53 2005 -@@ -15904,7 +15904,7 @@ - ?RingLine@OpalLineInterfaceDevice@@UAEHIK@Z @8723 NONAME ;public: virtual int __thiscall OpalLineInterfaceDevice::RingLine(unsigned int,unsigned long) - ?RingLine@OpalVoipBlasterDevice@@UAEHIK@Z @13722 NONAME ;public: virtual int __thiscall OpalVoipBlasterDevice::RingLine(unsigned int,unsigned long) - ?ROWZAG@@3QBEB @8724 NONAME ;unsigned char const * const ROWZAG -- ?RtpCallback@H323_H263Codec@@SAXPAXHH@Z @18805 NONAME ;public: static void __cdecl H323_H263Codec::RtpCallback(void *,int,int) -+ ?RtpCallback@H323_H263Codec@@SAXPAXHH@Z @18805 NONAME ;public: static void __cdecl H323_H263Codec::RtpCallback(AVCodecContext *,void *,int,int) - ?saveblks@Pre_Vid_Coder@@IAEXPAE@Z @8725 NONAME ;protected: void __thiscall Pre_Vid_Coder::saveblks(unsigned char *) - ?SelectDefaultLogicalChannel@H323Connection@@UAEXI@Z @8726 NONAME ;public: virtual void __thiscall H323Connection::SelectDefaultLogicalChannel(unsigned int) - ?SelectFastStartChannels@H323Connection@@UAEXIHH@Z @9303 NONAME ;public: virtual void __thiscall H323Connection::SelectFastStartChannels(unsigned int,int,int) diff -ruN net/openh323/files/patch-src-ffh263codec.cxx.orig net/openh323/files/patch-src-ffh263codec.cxx --- net/openh323/files/patch-src-ffh263codec.cxx.orig Fri Jun 10 21:30:34 2005 +++ net/openh323/files/patch-src-ffh263codec.cxx Thu Jan 1 00:00:00 1970 @@ -1,19 +0,0 @@ -*** src/ffh263codec.cxx.orig Fri Aug 8 01:52:14 2003 ---- src/ffh263codec.cxx Mon Jun 6 15:28:05 2005 -*************** -*** 140,146 **** - #define MSVC_OPENH323 1 - - extern "C" { -! #include - }; - - ---- 140,146 ---- - #define MSVC_OPENH323 1 - - extern "C" { -! #include - }; - - diff -ruN net/openh323/files/patch-src::ffh263codec.cxx.orig net/openh323/files/patch-src::ffh263codec.cxx --- net/openh323/files/patch-src::ffh263codec.cxx.orig Thu Jan 1 00:00:00 1970 +++ net/openh323/files/patch-src::ffh263codec.cxx Tue Jul 12 11:23:11 2005 @@ -0,0 +1,19 @@ +*** src/ffh263codec.cxx.orig Fri Aug 8 01:52:14 2003 +--- src/ffh263codec.cxx Mon Jun 6 15:28:05 2005 +*************** +*** 140,146 **** + #define MSVC_OPENH323 1 + + extern "C" { +! #include + }; + + +--- 140,146 ---- + #define MSVC_OPENH323 1 + + extern "C" { +! #include + }; + + diff -ruN net/openh323/files/patch-src_Makefile.orig net/openh323/files/patch-src_Makefile --- net/openh323/files/patch-src_Makefile.orig Thu Jan 1 00:00:00 1970 +++ net/openh323/files/patch-src_Makefile Tue Jul 12 11:23:23 2005 @@ -0,0 +1,46 @@ +--- src/Makefile.orig Thu Jun 10 15:16:31 2004 ++++ src/Makefile Wed May 25 12:23:21 2005 +@@ -343,7 +343,7 @@ + # make sure pwlib is in the list of external libraries + # this ensures pwlib is not statically linked + LDFLAGS += -L$(PW_LIBDIR) +-SYSLIBS += -l$(PTLIB_BASE)$(LIB_TYPE) ++SYSLIBS += ${LDFLAGS} -l$(PTLIB_BASE)$(LIB_TYPE) + + LIB_BASENAME=$(OH323_BASE) + LIB_FILENAME=$(OH323_FILE) +@@ -357,7 +357,7 @@ + + # Use a different variable here to support cross compiling + ifndef HOSTPWLIBDIR +-HOSTPWLIBDIR=$(PWLIBDIR) ++HOSTPWLIBDIR=$(PW_PREFIX) + endif + + ifndef HOST_PLATFORM_TYPE +@@ -439,21 +439,21 @@ + + $(OH323_OBJDIR)/%.o : $(VIC_DIR)/%.cxx + @if [ ! -d $(OH323_OBJDIR) ] ; then mkdir -p $(OH323_OBJDIR) ; fi +- $(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@ ++ $(CPLUS) -I$(OH323_INCDIR) $(CPPFLAGS) -I$(VIC_DIR) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@ + + $(OH323_OBJDIR)/%.o : $(VIC_DIR)/%.c + @if [ ! -d $(OH323_OBJDIR) ] ; then mkdir -p $(OH323_OBJDIR) ; fi +- $(CC) -I$(VIC_DIR) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@ ++ $(CC) -I$(OH323_INCDIR) $(CPPFLAGS) -I$(VIC_DIR) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@ + + $(DEPDIR)/%.dep : $(VIC_DIR)/%.c + @if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi + @printf %s $(OH323_OBJDIR)/ > $@ +- $(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS:-g=) $(CFLAGS) -M $< >> $@ ++ $(CPLUS) -I$(OH323_INCDIR) $(CPPFLAGS) -I$(VIC_DIR) $(STDCCFLAGS:-g=) $(CFLAGS) -M $< >> $@ + + $(DEPDIR)/%.dep : $(VIC_DIR)/%.cxx + @if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi + @printf %s $(OH323_OBJDIR)/ > $@ +- $(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS:-g=) $(CFLAGS) -M $< >> $@ ++ $(CPLUS) -I$(OH323_INCDIR) $(CPPFLAGS) -I$(VIC_DIR) $(STDCCFLAGS:-g=) $(CFLAGS) -M $< >> $@ + + notrace:: + $(MAKE) NOTRACE=1 opt