Date: Thu, 6 Apr 2006 21:18:57 +0200 (CEST) From: Joerg Pulz <Joerg.Pulz@frm2.tum.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: steve@energistic.com Subject: ports/95423: net/openh323: enable RFC2190 codec and system speex support Message-ID: <200604061918.k36JIvSC094163@hades.admin.frm2> Resent-Message-ID: <200604061920.k36JKJrr038956@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 95423 >Category: ports >Synopsis: net/openh323: enable RFC2190 codec and system speex support >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Apr 06 19:20:19 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Joerg Pulz >Release: FreeBSD 6.1-PRERELEASE i386 >Organization: TU-Munich / ZWE FRM-II >Environment: System: FreeBSD hades.admin.frm2 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #11: Wed Feb 22 19:01:44 CET 2006 root@hades.admin.frm2:/usr/obj/usr/src/sys/HADES i386 >Description: - enable RFC2190 codec support using multimedia/ffmpeg hide this inside a WITH_FFMPEG knob - allow the user to choose between speex from audio/speex or to use the bundled version hide this inside a WITH_SPEEX knob - add a small patch to make the speex plugin buildable with the ports version - remove expat from LIB_DEPENDS and remove USE_OPENLDAP we depend on libexpat and libldap impicit by depending on net/pwlib >How-To-Repeat: >Fix: - apply the patch - add new file to CVS --- net_openh323.diff begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net/openh323/Makefile,v retrieving revision 1.72 diff -u -r1.72 Makefile --- Makefile 5 Apr 2006 18:17:35 -0000 1.72 +++ Makefile 6 Apr 2006 18:34:53 -0000 @@ -7,6 +7,7 @@ PORTNAME= openh323 PORTVERSION= 1.18.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.voxgratia.org/releases/ DISTNAME= ${PORTNAME}-v${PORTVERSION:S/./_/g}-src- @@ -15,14 +16,12 @@ 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 @@ -35,6 +34,18 @@ .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 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/net/openh323/pkg-plist,v retrieving revision 1.7 diff -u -r1.7 pkg-plist --- pkg-plist 5 Apr 2006 18:17:35 -0000 1.7 +++ pkg-plist 6 Apr 2006 18:34:53 -0000 @@ -79,7 +79,7 @@ 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 Index: files/patch-plugins::audio::Speex::Makefile.in =================================================================== RCS file: files/patch-plugins::audio::Speex::Makefile.in diff -N files/patch-plugins::audio::Speex::Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-plugins::audio::Speex::Makefile.in 6 Apr 2006 18:34:53 -0000 @@ -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/ --- net_openh323.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200604061918.k36JIvSC094163>