Index: head/audio/baresip/Makefile =================================================================== --- head/audio/baresip/Makefile (revision 303607) +++ head/audio/baresip/Makefile (revision 303608) @@ -1,99 +1,103 @@ # $FreeBSD$ PORTNAME= baresip PORTVERSION= 0.4.0 CATEGORIES= audio MASTER_SITES= http://www.creytiv.com/pub/ MAINTAINER= crees@FreeBSD.org COMMENT= Small SIP client BUILD_DEPENDS= ${LOCALBASE}/share/re/re.mk:${PORTSDIR}/audio/re \ ${LOCALBASE}/include/rem/rem.h:${PORTSDIR}/audio/rem RUN_DEPENDS:= ${BUILD_DEPENDS} USE_GMAKE= yes CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/ilbc MAKE_ARGS= MOD_AUTODETECT="" 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 CONS_DESC= Console input driver G711_DESC= G.711 audio codec G722_DESC= G.722 audio codec G722_1_DESC= G.722.1 audio codec ILBC_DESC= iLBC audio codec L16_DESC= L16 audio codec OPUS_DESC= Opus audio codec PLC_DESC= Packet Loss Concealment SRTP_DESC= Secure RTP module STDIO_DESC= stdio input driver UUID_DESC= UUID module V4L_DESC= Video4Linux module V4L2_DESC= Video4Linux2 module .include .include "${.CURDIR}/Makefile.depends" # Port calls it GST, standard OPTION is GSTREAMER .if ${PORT_OPTIONS:MGSTREAMER} PORT_OPTIONS+= GST .endif .if ${PORT_OPTIONS:MSDL} USE_SDL= sdl sound .endif # SPEEX forces install of speex, therefore may as well enable all methods .if ${PORT_OPTIONS:MSPEEX} . for s in SPEEX_AEC SPEEX_PP SPEEX_RESAMP MAKE_ARGS+= USE_$s=yes . endfor .endif .if ${PORT_OPTIONS:MX11} USE_XORG= x11 .endif .for o in ${PORT_OPTIONS} MAKE_ARGS+= USE_$o=yes BUILD_DEPENDS+= ${$o_DEPEND} RUN_DEPENDS+= ${$o_DEPEND} .endfor # GNU Make does not do make -V, which makes life difficult post-patch: ${ECHO_CMD} >> ${WRKSRC}/Makefile ${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 ${MKDIR} ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/share/* ${DATADIR} # Install modules and add to plist post-install: ${MKDIR} ${PREFIX}/lib/${PORTNAME}/modules for m in $$(${GMAKE} -sC ${WRKSRC} ${MAKE_ARGS} showmodules); \ do ${INSTALL_LIB} ${WRKSRC}/$$m.so ${PREFIX}/lib/baresip/modules; \ ${ECHO_CMD} lib/${PORTNAME}/modules/$$m.so >> ${TMPPLIST}; \ done ${ECHO_CMD} "@dirrm lib/baresip/modules" >> ${TMPPLIST} ${ECHO_CMD} "@dirrm lib/baresip" >> ${TMPPLIST} .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR} .endif .include Index: head/audio/baresip/Makefile.depends =================================================================== --- head/audio/baresip/Makefile.depends (revision 303607) +++ head/audio/baresip/Makefile.depends (revision 303608) @@ -1,28 +1,28 @@ # $FreeBSD$ ALSA_DEPEND= ${LOCALBASE}/include/alsa/asoundlib.h:${PORTSDIR}/audio/alsa-lib BV32_DEPEND= # nonexistent CELT_DEPEND= ${LOCALBASE}/include/celt/celt.h:${PORTSDIR}/audio/celt CONS_DEPEND= # unneccessary EVDEV_DEPEND= FFMPEG_DEPEND= ${LOCALBASE}/include/libavcodec/avcodec.h:${PORTSDIR}/multimedia/ffmpeg G711_DEPEND= ${LOCALBASE}/include/spandsp/g711.h:${PORTSDIR}/comms/spandsp G722_DEPEND= ${LOCALBASE}/include/spandsp/g722.h:${PORTSDIR}/comms/spandsp G722_1_DEPEND= # nonexistent GSM_DEPEND= ${LOCALBASE}/include/gsm.h:${PORTSDIR}/audio/gsm GST_DEPEND= gst-launch:${PORTSDIR}/multimedia/gstreamer ILBC_DEPEND= ${LOCALBASE}/include/ilbc/iLBC_define.h:${PORTSDIR}/net/ilbc 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 SRTP_DEPEND= ${LOCALBASE}/include/srtp/srtp.h:${PORTSDIR}/net/libsrtp 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 Index: head/audio/baresip/files/patch-modules-portaudio-portaudio-c =================================================================== --- head/audio/baresip/files/patch-modules-portaudio-portaudio-c (nonexistent) +++ head/audio/baresip/files/patch-modules-portaudio-portaudio-c (revision 303608) @@ -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 + Property changes on: head/audio/baresip/files/patch-modules-portaudio-portaudio-c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/baresip/files/patch-modules-v4l2-v4l2-c =================================================================== --- head/audio/baresip/files/patch-modules-v4l2-v4l2-c (nonexistent) +++ head/audio/baresip/files/patch-modules-v4l2-v4l2-c (revision 303608) @@ -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 Property changes on: head/audio/baresip/files/patch-modules-v4l2-v4l2-c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property