From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Apr 6 19:20:30 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D09816A403 for ; Thu, 6 Apr 2006 19:20:30 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id ABF8343D8C for ; Thu, 6 Apr 2006 19:20:19 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k36JKJ6x038957 for ; Thu, 6 Apr 2006 19:20:19 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k36JKJrr038956; Thu, 6 Apr 2006 19:20:19 GMT (envelope-from gnats) Resent-Date: Thu, 6 Apr 2006 19:20:19 GMT Resent-Message-Id: <200604061920.k36JKJrr038956@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Joerg Pulz Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B729C16A403 for ; Thu, 6 Apr 2006 19:19:25 +0000 (UTC) (envelope-from Joerg.Pulz@frm2.tum.de) Received: from mailhost.frm2.tum.de (mailhost.frm2.tum.de [129.187.179.12]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6416843D8C for ; Thu, 6 Apr 2006 19:19:07 +0000 (GMT) (envelope-from Joerg.Pulz@frm2.tum.de) Received: from localhost (mailhost.frm2.tum.de [129.187.179.12]) by mailhost.frm2.tum.de (8.13.4/8.13.4) with ESMTP id k36JJ4x0013353; Thu, 6 Apr 2006 21:19:04 +0200 (CEST) (envelope-from jpulz@frm2.tum.de) Received: from hades.admin.frm2 (hades.admin.frm2 [172.25.1.10]) by mailhost.frm2.tum.de (8.13.4/8.13.4) with ESMTP id k36JIwR3013346 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Thu, 6 Apr 2006 21:18:58 +0200 (CEST) (envelope-from jpulz@frm2.tum.de) Received: from hades.admin.frm2 (localhost [127.0.0.1]) by hades.admin.frm2 (8.13.4/8.13.4) with ESMTP id k36JIvou094164; Thu, 6 Apr 2006 21:18:57 +0200 (CEST) (envelope-from jpulz@frm2.tum.de) Received: (from jpulz@localhost) by hades.admin.frm2 (8.13.4/8.13.4/Submit) id k36JIvSC094163; Thu, 6 Apr 2006 21:18:57 +0200 (CEST) (envelope-from jpulz) Message-Id: <200604061918.k36JIvSC094163@hades.admin.frm2> Date: Thu, 6 Apr 2006 21:18:57 +0200 (CEST) From: Joerg Pulz To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: steve@energistic.com Subject: ports/95423: net/openh323: enable RFC2190 codec and system speex support X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Joerg Pulz List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Apr 2006 19:20:30 -0000 >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 +.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: