diff options
author | mjl <mjl@pkgsrc.org> | 2004-10-09 01:15:56 +0000 |
---|---|---|
committer | mjl <mjl@pkgsrc.org> | 2004-10-09 01:15:56 +0000 |
commit | ab25a403235b917dfd0eac4415039ced761cc87d (patch) | |
tree | 56975d50606e0d441474d7578e38ea99390fa46b /net | |
parent | 5ff14486872f4e025ec95ae79d0672386b8c03f1 (diff) | |
download | pkgsrc-ab25a403235b917dfd0eac4415039ced761cc87d.tar.gz |
Update openh323 to 1.12.2
No changelog available, sorry.
Diffstat (limited to 'net')
-rw-r--r-- | net/openh323/Makefile | 15 | ||||
-rw-r--r-- | net/openh323/PLIST | 21 | ||||
-rw-r--r-- | net/openh323/distinfo | 11 | ||||
-rw-r--r-- | net/openh323/patches/patch-aa | 55 | ||||
-rw-r--r-- | net/openh323/patches/patch-ac | 54 | ||||
-rw-r--r-- | net/openh323/patches/patch-ba | 11 |
6 files changed, 100 insertions, 67 deletions
diff --git a/net/openh323/Makefile b/net/openh323/Makefile index 7de2e452133..56e55f5ad51 100644 --- a/net/openh323/Makefile +++ b/net/openh323/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.23 2004/10/03 00:17:56 tv Exp $ +# $NetBSD: Makefile,v 1.24 2004/10/09 01:15:56 mjl Exp $ # -DISTNAME= openh323_1.10.4 -PKGNAME= openh323-1.10.4 -PKGREVISION= 2 +DISTNAME= openh323_1.12.2 +PKGNAME= ${DISTNAME:S/_/-/} +# PKGREVISION= 2 CATEGORIES= net MASTER_SITES= http://www.openh323.org/bin/ \ http://www.us1.openh323.org/bin/ \ @@ -16,20 +16,21 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.openh323.org/ COMMENT= Open H.323 library -MAKE_ENV+= PWLIBDIR=${PREFIX} OPENH323DIR=${WRKSRC} +MAKE_ENV+= PWLIBDIR=${PREFIX}/share/pwlib OPENH323DIR=${WRKSRC} SYSLIBDIR=$(PREFIX)/lib +CONFIGURE_ARGS+= PWLIBDIR=${PREFIX} WRKSRC= ${WRKDIR}/openh323 USE_BUILDLINK3= yes USE_PKGINSTALL= yes USE_GNU_TOOLS+= make USE_LIBTOOL= yes +GNU_CONFIGURE= yes ALL_TARGET= opt post-patch: - -${MKDIR} ${WRKSRC}/lib; cd ${WRKSRC}/lib; ${LN} -s ${PREFIX}/lib/libpt.la cd ${WRKSRC}/include; ${LN} -s . openh323 ${_PKG_SILENT}cd ${WRKSRC}; \ - for f in openh323u.mak; do \ + for f in openh323u.mak.in; do \ ${SED} ${FILES_SUBST_SED} $$f > $$f.sed;\ ${MV} -f $$f.sed $$f; \ done diff --git a/net/openh323/PLIST b/net/openh323/PLIST index 009d50503c2..c7ccb6ed69d 100644 --- a/net/openh323/PLIST +++ b/net/openh323/PLIST @@ -1,6 +1,22 @@ -@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:48 jlam Exp $ +@comment $NetBSD: PLIST,v 1.4 2004/10/09 01:15:56 mjl Exp $ lib/libh323.la bin/simph323 +include/openh323/dllcodec.h +include/openh323/dynacodec.h +include/openh323/ffh263codec.h +include/openh323/h248.h +include/openh323/h323annexg.h +include/openh323/h323trans.h +include/openh323/h4505.h +include/openh323/h4507.h +include/openh323/h4508.h +include/openh323/h4509.h +include/openh323/h501.h +include/openh323/h501pdu.h +include/openh323/ilbccodec.h +include/openh323/openh323buildopts.h +include/openh323/peclient.h +include/openh323/svcctrl.h include/openh323/QTIoctl.h include/openh323/channels.h include/openh323/codecs.h @@ -40,8 +56,6 @@ include/openh323/ixjDefs.h include/openh323/ixjidb.h include/openh323/ixjlid.h include/openh323/jitter.h -include/openh323/ldap_asn.h -include/openh323/ldapapi.h include/openh323/lid.h include/openh323/lpc10codec.h include/openh323/mcspdu.h @@ -59,7 +73,6 @@ include/openh323/t38.h include/openh323/t38proto.h include/openh323/transports.h include/openh323/vblasterlid.h -include/openh323/videoio.h include/openh323/vpblid.h include/openh323/x224.h include/openh323/x880.h diff --git a/net/openh323/distinfo b/net/openh323/distinfo index d5d1a945929..fd4458bfe4a 100644 --- a/net/openh323/distinfo +++ b/net/openh323/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.5 2002/12/04 04:52:25 dan Exp $ +$NetBSD: distinfo,v 1.6 2004/10/09 01:15:56 mjl Exp $ -SHA1 (openh323_1.10.4.tar.gz) = 2884944d64b6b129ced05a8df2a17bc581e63532 -Size (openh323_1.10.4.tar.gz) = 1881298 bytes -SHA1 (patch-aa) = 9c6ecbbd7fa1a0a8ea51deb2b8b99888f2228a6f -SHA1 (patch-ac) = 985ed16a87ed719d1b768d8d3901c4527f1736e4 +SHA1 (openh323_1.12.2.tar.gz) = 47fd3f5db6936231aeb937c8e70ea956ce7abccd +Size (openh323_1.12.2.tar.gz) = 2343354 bytes +SHA1 (patch-aa) = c3de38c53c815904cc4772a5bb049e058af2f159 +SHA1 (patch-ac) = ea6f53ff5c4185ba99fad0c140be0a419d303713 +SHA1 (patch-ba) = c7701d6aec425fceedb542369b48bc0df70ce055 diff --git a/net/openh323/patches/patch-aa b/net/openh323/patches/patch-aa index bca949d800b..f641521bd18 100644 --- a/net/openh323/patches/patch-aa +++ b/net/openh323/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.4 2002/12/04 04:52:26 dan Exp $ +$NetBSD: patch-aa,v 1.5 2004/10/09 01:15:57 mjl Exp $ ---- src/Makefile.orig Wed Nov 6 23:58:29 2002 -+++ src/Makefile Tue Dec 3 17:11:38 2002 -@@ -704,7 +704,7 @@ +--- src/Makefile.orig 2003-08-04 02:03:29.000000000 +0200 ++++ src/Makefile 2004-10-08 23:20:53.000000000 +0200 +@@ -837,7 +837,7 @@ #################################################### @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.4 2002/12/04 04:52:26 dan Exp $ #################################################### -@@ -717,7 +717,7 @@ +@@ -849,7 +849,7 @@ LIB_BASENAME=$(OH323_BASE) LIB_FILENAME=$(OH323_FILE) @@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.4 2002/12/04 04:52:26 dan Exp $ #################################################### -@@ -746,15 +746,7 @@ +@@ -878,15 +878,7 @@ # If we're cross compiling, we want the host's asnparser # otherwise use the one for the current platform @@ -37,29 +37,29 @@ $NetBSD: patch-aa,v 1.4 2002/12/04 04:52:26 dan Exp $ ifdef ASN_EXCLUDE -@@ -906,68 +898,68 @@ +@@ -1107,79 +1099,79 @@ $(OH323_OBJDIR)/%.o : $(VIC_DIR)/%.cxx @if [ ! -d $(OH323_OBJDIR) ] ; then mkdir -p $(OH323_OBJDIR) ; fi - $(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -c $< -o $@ -+ $(LIBTOOL) --tag=CXX $(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -c $< -o $@ ++ $(LIBTOOL) --tag=CXX --mode=compile $(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -c $< -o $@ $(OH323_OBJDIR)/%.o : $(VIC_DIR)/%.c @if [ ! -d $(OH323_OBJDIR) ] ; then mkdir -p $(OH323_OBJDIR) ; fi - $(CC) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -c $< -o $@ -+ $(LIBTOOL) --tag=CC $(CC) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -c $< -o $@ ++ $(LIBTOOL) --tag=CC --mode=compile $(CC) -I$(VIC_DIR) $(STDCCFLAGS) $(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) $(CFLAGS) -M $< >> $@ -+ $(LIBTOOL) --tag=CXX $(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -M $< >> $@ ++ $(LIBTOOL) --tag=CXX --mode=compile $(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -c $< -o $@ $(DEPDIR)/%.dep : $(VIC_DIR)/%.cxx @if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi @printf %s $(OH323_OBJDIR)/ > $@ - $(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -M $< >> $@ -+ $(LIBTOOL) --tag=CXX $(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -M $< >> $@ ++ $(LIBTOOL) --tag=CXX --mode=compile $(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -M $< >> $@ # Build rules for the GSM codec @@ -67,27 +67,27 @@ $NetBSD: patch-aa,v 1.4 2002/12/04 04:52:26 dan Exp $ $(OH323_OBJDIR)/%.o : $(GSM_SRCDIR)/%.c @if [ ! -d $(OH323_OBJDIR) ] ; then mkdir -p $(OH323_OBJDIR) ; fi - $(CC) -ansi -I$(GSM_INCDIR) -DWAV49 -DNeedFunctionPrototypes=1 $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@ -+ $(LIBTOOL) --tag=CC $(CC) -ansi -I$(GSM_INCDIR) -DWAV49 -DNeedFunctionPrototypes=1 $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@ ++ $(LIBTOOL) --tag=CC --mode=compile $(CC) -ansi -I$(GSM_INCDIR) -DWAV49 -DNeedFunctionPrototypes=1 $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@ $(DEPDIR)/%.dep : $(GSM_SRCDIR)/%.c @if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi @printf %s $(OH323_OBJDIR)/ > $@ - $(CC) -ansi -I$(GSM_INCDIR) -DWAV49 -DNeedFunctionPrototypes=1 $(CFLAGS) -M $< >> $@ -+ $(LIBTOOL) --tag=CC $(CC) -ansi -I$(GSM_INCDIR) -DWAV49 -DNeedFunctionPrototypes=1 $(CFLAGS) -M $< >> $@ ++ $(LIBTOOL) --tag=CC --mode=compile $(CC) -ansi -I$(GSM_INCDIR) -DWAV49 -DNeedFunctionPrototypes=1 $(CFLAGS) -M $< >> $@ # Build rules for the G.726 codec $(OH323_OBJDIR)/%.o : $(G726_DIR)/%.c @if [ ! -d $(OH323_OBJDIR) ] ; then mkdir -p $(OH323_OBJDIR) ; fi -- $(CC) $(CFLAGS) -c $< -o $@ -+ $(LIBTOOL) --tag=CC $(CC) $(CFLAGS) -c $< -o $@ +- $(CC) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@ ++ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@ $(DEPDIR)/%.dep : $(G726_DIR)/%.c @if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi @printf %s $(OH323_OBJDIR)/ > $@ -- $(CC) $(CFLAGS) -M $< >> $@ -+ $(LIBTOOL) --tag=CC $(CC) $(CFLAGS) -M $< >> $@ +- $(CC) $(OPTCCFLAGS) $(CFLAGS) -M $< >> $@ ++ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(OPTCCFLAGS) $(CFLAGS) -M $< >> $@ # Build rules for the LPC10 codec @@ -95,26 +95,39 @@ $NetBSD: patch-aa,v 1.4 2002/12/04 04:52:26 dan Exp $ $(OH323_OBJDIR)/%.o : $(LPC10_SRCDIR)/%.c @if [ ! -d $(OH323_OBJDIR) ] ; then mkdir -p $(OH323_OBJDIR) ; fi - $(CC) -I$(LPC10_INCDIR) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@ -+ $(LIBTOOL) --tag=CC $(CC) -I$(LPC10_INCDIR) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@ ++ $(LIBTOOL) --tag=CC --mode=compile $(CC) -I$(LPC10_INCDIR) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@ $(DEPDIR)/%.dep : $(LPC10_SRCDIR)/%.c @if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi @printf %s $(OH323_OBJDIR)/ > $@ - $(CC) -I$(LPC10_INCDIR) $(CFLAGS) -M $< >> $@ -+ $(LIBTOOL) --tag=CC $(CC) -I$(LPC10_INCDIR) $(CFLAGS) -M $< >> $@ ++ $(LIBTOOL) --tag=CC --mode=compile $(CC) -I$(LPC10_INCDIR) $(CFLAGS) -M $< >> $@ + + # Build rules for the iLBC codec + + $(OH323_OBJDIR)/%.o : $(ILBC_DIR)/%.c + @if [ ! -d $(OH323_OBJDIR) ] ; then mkdir -p $(OH323_OBJDIR) ; fi +- $(CC) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@ ++ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@ + + $(DEPDIR)/%.dep : $(ILBC_DIR)/%.c + @if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi + @printf %s $(OH323_OBJDIR)/ > $@ +- $(CC) $(CFLAGS) -M $< >> $@ ++ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -M $< >> $@ # Build rules for the Speex codec $(OH323_OBJDIR)/%.o : $(SPEEX_SRCDIR)/%.c @if [ ! -d $(OH323_OBJDIR) ] ; then mkdir -p $(OH323_OBJDIR) ; fi - $(CC) $(SPEEX_FLAGS) -I$(SPEEX_INCDIR) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@ -+ $(LIBTOOL) --tag=CC $(CC) $(SPEEX_FLAGS) -I$(SPEEX_INCDIR) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@ ++ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(SPEEX_FLAGS) -I$(SPEEX_INCDIR) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@ $(DEPDIR)/%.dep : $(SPEEX_SRCDIR)/%.c @if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi @printf %s $(OH323_OBJDIR)/ > $@ - $(CC) $(SPEEX_FLAGS) -I$(SPEEX_INCDIR) $(CFLAGS) -M $< >> $@ -+ $(LIBTOOL) --tag=CC $(CC) $(SPEEX_FLAGS) -I$(SPEEX_INCDIR) $(CFLAGS) -M $< >> $@ ++ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(SPEEX_FLAGS) -I$(SPEEX_INCDIR) $(CFLAGS) -M $< >> $@ notrace:: diff --git a/net/openh323/patches/patch-ac b/net/openh323/patches/patch-ac index 17e76340edb..85cfa2e61dc 100644 --- a/net/openh323/patches/patch-ac +++ b/net/openh323/patches/patch-ac @@ -1,17 +1,16 @@ -$NetBSD: patch-ac,v 1.2 2002/12/03 21:48:18 jdolecek Exp $ - ---- openh323u.mak.orig Tue Nov 5 03:18:03 2002 -+++ openh323u.mak Tue Dec 3 22:01:59 2002 -@@ -107,19 +107,19 @@ - ifneq (,$(wildcard $(HOME)/pwlib)) - PWLIBDIR=$(HOME)/pwlib - else --PWLIBDIR=/usr/local/pwlib -+PWLIBDIR= @PREFIX@ - endif - endif - endif - +--- openh323u.mak.in.orig 2003-08-04 02:03:09.000000000 +0200 ++++ openh323u.mak.in 2004-10-08 23:59:36.000000000 +0200 +@@ -126,7 +126,7 @@ + # Added auto inclusion of ptlib make rules + # + +-PWLIBDIR = @PWLIBDIR@ ++PWLIBDIR = /usr/pkg + STDCCFLAGS += @STDCCFLAGS@ + LDFLAGS += @LDFLAGS@ + ENDLDLIBS := @ENDLDLIBS@ $(ENDLDLIBS) +@@ -134,12 +134,12 @@ + H323_VICH263 = @H323_VICH263@ ifdef LIBRARY_MAKEFILE -include $(PWLIBDIR)/make/unix.mak @@ -25,16 +24,23 @@ $NetBSD: patch-ac,v 1.2 2002/12/03 21:48:18 jdolecek Exp $ endif -@@ -129,7 +129,7 @@ +@@ -149,11 +149,11 @@ OH323_SRCDIR = $(OPENH323DIR)/src --OH323_INCDIR = $(OPENH323DIR)/include -+OH323_INCDIR = $(OPENH323DIR)/include/openh323 +-ifdef PREFIX +-OH323_INCDIR = $(PREFIX)/include/openh323 +-else ++#ifdef PREFIX ++#OH323_INCDIR = $(PREFIX)/include/openh323 ++#else + OH323_INCDIR = $(OPENH323DIR)/include +-endif ++#endif OH323_LIBDIR = $(OPENH323DIR)/lib -@@ -152,7 +152,7 @@ +@@ -176,7 +176,7 @@ @@ -43,15 +49,3 @@ $NetBSD: patch-ac,v 1.2 2002/12/03 21:48:18 jdolecek Exp $ OH323_FILE = lib$(OH323_BASE).$(LIB_SUFFIX) LDFLAGS += -L$(OH323_LIBDIR) -@@ -187,6 +187,11 @@ - STDCCFLAGS += -DHAS_OSS - endif - -+ifneq (,$(wildcard $(SYSINCDIR)/soundcard.h)) -+HAS_OSS = 1 -+STDCCFLAGS += -DHAS_OSS -+endif -+ - #Allow disabling of speex codec - ifdef NO_SPEEX - STDCCFLAGS += -DNO_SPEEX diff --git a/net/openh323/patches/patch-ba b/net/openh323/patches/patch-ba new file mode 100644 index 00000000000..e07a1279c8e --- /dev/null +++ b/net/openh323/patches/patch-ba @@ -0,0 +1,11 @@ +--- configure.orig 2004-10-09 00:01:54.000000000 +0200 ++++ configure 2004-10-09 00:02:59.000000000 +0200 +@@ -1825,7 +1825,7 @@ + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 + echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } +-if test -r "${PWLIBDIR}/version.h"; then ++if test -r "${PWLIBDIR}/include/ptlib/version.h"; then + eval "$as_ac_File=yes" + else + eval "$as_ac_File=no" |