From owner-svn-ports-head@FreeBSD.ORG Mon Sep 3 18:43:39 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E452A1065676; Mon, 3 Sep 2012 18:43:38 +0000 (UTC) (envelope-from crees@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CE5C38FC1D; Mon, 3 Sep 2012 18:43:38 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q83Ihc8J027135; Mon, 3 Sep 2012 18:43:38 GMT (envelope-from crees@svn.freebsd.org) Received: (from crees@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q83IhchJ027130; Mon, 3 Sep 2012 18:43:38 GMT (envelope-from crees@svn.freebsd.org) Message-Id: <201209031843.q83IhchJ027130@svn.freebsd.org> From: Chris Rees Date: Mon, 3 Sep 2012 18:43:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r303608 - in head/audio/baresip: . files X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Sep 2012 18:43:39 -0000 Author: crees Date: Mon Sep 3 18:43:38 2012 New Revision: 303608 URL: http://svn.freebsd.org/changeset/ports/303608 Log: Fix the V4L2 and PORTAUDIO options. Submitted by: Matthias Apitz Added: head/audio/baresip/files/patch-modules-portaudio-portaudio-c (contents, props changed) head/audio/baresip/files/patch-modules-v4l2-v4l2-c (contents, props changed) Modified: head/audio/baresip/Makefile head/audio/baresip/Makefile.depends Modified: head/audio/baresip/Makefile ============================================================================== --- head/audio/baresip/Makefile Mon Sep 3 17:40:21 2012 (r303607) +++ head/audio/baresip/Makefile Mon Sep 3 18:43:38 2012 (r303608) @@ -20,9 +20,9 @@ PLIST_FILES= bin/baresip PORTDATA= * PORTDOCS= * -#OPTIONS_NOT_YET_WORKING= ALSA BV32 G722_1 PLC PORTAUDIO V4L2 +#OPTIONS_NOT_YET_WORKING= ALSA BV32 G722_1 PLC OPTIONS_DEFINE= CELT CONS DOCS FFMPEG G711 G722 GSM GSTREAMER ILBC L16 OPUS \ - OSS SDL SNDFILE SPEEX SRTP STDIO UUID V4L X11 + OSS PORTAUDIO SDL SNDFILE SPEEX SRTP STDIO UUID V4L V4L2 X11 OPTIONS_DEFAULT=CONS G711 G722 L16 BV32_DESC= BroadVoice32 Wideband Audio codec @@ -76,6 +76,10 @@ post-patch: ${ECHO_CMD} ".PHONY: showmodules" >> ${WRKSRC}/Makefile ${ECHO_CMD} "showmodules:" >> ${WRKSRC}/Makefile ${ECHO_CMD} ' @${ECHO_CMD} $$(MODULES)' >> ${WRKSRC}/Makefile + ${REINPLACE_CMD} 's,-lcelt[0-9]*,$$(pkg-config --libs celt),' \ + ${WRKSRC}/modules/celt/module.mk + ${REINPLACE_CMD} 's,-lportaudio[0-9]*,-L${LOCALBASE}/lib/portaudio2 -lportaudio,' \ + ${WRKSRC}/modules/portaudio/module.mk do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin Modified: head/audio/baresip/Makefile.depends ============================================================================== --- head/audio/baresip/Makefile.depends Mon Sep 3 17:40:21 2012 (r303607) +++ head/audio/baresip/Makefile.depends Mon Sep 3 18:43:38 2012 (r303608) @@ -16,7 +16,7 @@ L16_DEPEND= OPUS_DEPEND= ${LOCALBASE}/include/opus/opus.h:${PORTSDIR}/audio/opus OSS_DEPEND= # In base PLC_DEPEND= ${LOCALBASE}/include/spandsp/plc.h:${PORTSDIR}/comms/spandsp -PORTAUDIO_DEPEND= ${LOCALBASE}/include/portaudio.h:${PORTSDIR}/audio/portaudio +PORTAUDIO_DEPEND= ${LOCALBASE}/include/portaudio2/portaudio.h:${PORTSDIR}/audio/portaudio2 SDL_DEPEND= # Handled with USE_SDL in Makefile SNDFILE_DEPEND= ${LOCALBASE}/include/sndfile.h:${PORTSDIR}/audio/libsndfile SPEEX_DEPEND= ${LOCALBASE}/include/speex/speex.h:${PORTSDIR}/audio/speex @@ -24,5 +24,5 @@ SRTP_DEPEND= ${LOCALBASE}/include/srtp/s STDIO_DEPEND= # In base UUID_DEPEND= ${LOCALBASE}/include/uuid/uuid.h:${PORTSDIR}/misc/e2fsprogs-libuuid V4L_DEPEND= ${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat -V4L2_DEPEND= # nonexistent +V4L2_DEPEND= ${LOCALBASE}/include/libv4l2.h:${PORTSDIR}/multimedia/libv4l X11_DEPEND= # Handled with USE_XORG in Makefile Added: head/audio/baresip/files/patch-modules-portaudio-portaudio-c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/baresip/files/patch-modules-portaudio-portaudio-c Mon Sep 3 18:43:38 2012 (r303608) @@ -0,0 +1,11 @@ +--- modules/portaudio/portaudio.c.orig 2012-09-03 19:10:56.385452152 +0100 ++++ modules/portaudio/portaudio.c 2012-09-03 19:11:06.160451716 +0100 +@@ -4,7 +4,7 @@ + * Copyright (C) 2010 Creytiv.com + */ + #include +-#include ++#include + #include + #include + Added: head/audio/baresip/files/patch-modules-v4l2-v4l2-c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/baresip/files/patch-modules-v4l2-v4l2-c Mon Sep 3 18:43:38 2012 (r303608) @@ -0,0 +1,10 @@ +--- modules/v4l2/v4l2.c.orig 2012-09-03 19:15:11.128472643 +0100 ++++ modules/v4l2/v4l2.c 2012-09-03 19:15:22.190452621 +0100 +@@ -7,7 +7,6 @@ + #include + #include + #include +-#include + #include + #include + #include