diff options
author | pav <pav@FreeBSD.org> | 2006-05-07 13:10:55 +0000 |
---|---|---|
committer | pav <pav@FreeBSD.org> | 2006-05-07 13:10:55 +0000 |
commit | f30afaad87b6027a4366b38a9c65bb8644ec0e77 (patch) | |
tree | fd9e2f01002680b341f6fe9a711dc16ac24b7779 /net/openh323 | |
parent | 4d201a4ae37f6f71979d11e7672154d40aeb4573 (diff) | |
download | FreeBSD-ports-f30afaad87b6027a4366b38a9c65bb8644ec0e77.zip FreeBSD-ports-f30afaad87b6027a4366b38a9c65bb8644ec0e77.tar.gz |
- Enable RFC2190 codec support using ffmpeg, knob WITH_FFMPEG
- Support external speex, knob WITH_SPEEX
- Remove indirect dependencies on expat and openldap (via pwlib)
PR: ports/95423
Submitted by: Joerg Pulz <Joerg.Pulz@frm2.tum.de>
Approved by: Steve Ames <steve@energistic.com> (maintainer)
Diffstat (limited to 'net/openh323')
-rw-r--r-- | net/openh323/Makefile | 18 | ||||
-rw-r--r-- | net/openh323/files/patch-plugins-audio-Speex-Makefile.in | 19 | ||||
-rw-r--r-- | net/openh323/pkg-plist | 2 |
3 files changed, 34 insertions, 5 deletions
diff --git a/net/openh323/Makefile b/net/openh323/Makefile index 320d374..fda8237 100644 --- a/net/openh323/Makefile +++ b/net/openh323/Makefile @@ -7,7 +7,7 @@ PORTNAME= openh323 PORTVERSION= 1.18.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://www.voxgratia.org/releases/ DISTNAME= ${PORTNAME}-v${PORTVERSION:S/./_/g}-src- @@ -16,14 +16,12 @@ EXTRACT_SUFX= tar.gz MAINTAINER= steve@energistic.com COMMENT= A H323 Video Conferencing library -LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \ - pt_r.1:${PORTSDIR}/devel/pwlib +LIB_DEPENDS= pt_r.1:${PORTSDIR}/devel/pwlib WRKSRC= ${WRKDIR}/${PORTNAME}_v${PORTVERSION:S/./_/g} USE_BISON= yes USE_GMAKE= yes -USE_OPENLDAP= yes USE_AUTOTOOLS= autoconf:259 GNU_CONFIGURE= yes INSTALLS_SHLIB= yes @@ -36,6 +34,18 @@ NO_FILTER_SHLIBS= yes .include <bsd.port.pre.mk> +.ifdef (WITH_FFMPEG) +LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg +CONFIGURE_ARGS+= --enable-rfc2190avcodec=${LOCALBASE}/include/ffmpeg +.endif + +.ifdef (WITH_SPEEX) +LIB_DEPENDS+= speex.3:${PORTSDIR}/audio/speex +CONFIGURE_ARGS+= --enable-localspeex=no +.else +CONFIGURE_ARGS+= --enable-localspeex=yes +.endif + .if (${ARCH} == "amd64") || (${ARCH} == "ia64") || (${ARCH} == "sparc64") CFLAGS+= -fPIC .endif diff --git a/net/openh323/files/patch-plugins-audio-Speex-Makefile.in b/net/openh323/files/patch-plugins-audio-Speex-Makefile.in new file mode 100644 index 0000000..f634b0f --- /dev/null +++ b/net/openh323/files/patch-plugins-audio-Speex-Makefile.in @@ -0,0 +1,19 @@ +--- plugins/audio/Speex/Makefile.in.orig Wed Apr 5 23:40:27 2006 ++++ plugins/audio/Speex/Makefile.in Wed Apr 5 23:41:12 2006 +@@ -59,6 +59,7 @@ + CC=@CC@ + CXX=@CXX@ + LDSO=@LDSO@ ++LDFLAGS=@LDFLAGS@ + + ifndef PREFIX + PREFIX=/usr/local +@@ -101,7 +102,7 @@ + OBJECTS = $(addprefix $(OBJDIR)/,$(patsubst %.cxx,%.o,$(patsubst %.c,%.o,$(notdir $(SRCS))))) + + $(PLUGIN): $(OBJECTS) +- $(CC) $(LDSO)$(SONAME) -o $@ $^ $(EXTRALIBS) ++ $(CC) $(LDSO)$(SONAME) -o $@ $^ $(LDFLAGS) $(EXTRALIBS) + + install: + mkdir -p $(DESTDIR)$(LIBDIR)/pwlib/codecs/audio/ diff --git a/net/openh323/pkg-plist b/net/openh323/pkg-plist index 567d108..b382cc6 100644 --- a/net/openh323/pkg-plist +++ b/net/openh323/pkg-plist @@ -79,7 +79,7 @@ include/openh323/x224.h include/openh323/x880.h @dirrm include/openh323 %%DATADIR%%/openh323u.mak -@dirrm %%DATADIR%% +@dirrmtry %%DATADIR%% lib/pwlib/codecs/audio/g726_audio_pwplugin.so lib/pwlib/codecs/audio/gsm0610_audio_pwplugin.so lib/pwlib/codecs/audio/ilbc_audio_pwplugin.so |