Fix the V4L2 and PORTAUDIO options.

Submitted by:	Matthias Apitz <guru@unixarea.de>

4 files changed, 29 insertions, 4 deletions

diff --git a/audio/baresip/Makefile b/audio/baresip/Makefile
index 76856ed908da..796e623fe6e4 100644
--- a/audio/baresip/Makefile
+++ b/audio/baresip/Makefile
@@ -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
diff --git a/audio/baresip/Makefile.depends b/audio/baresip/Makefile.depends
index 5a24d242344a..58d6a6dfab86 100644
--- a/audio/baresip/Makefile.depends
+++ b/audio/baresip/Makefile.depends
@@ -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/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
diff --git a/audio/baresip/files/patch-modules-portaudio-portaudio-c b/audio/baresip/files/patch-modules-portaudio-portaudio-c
new file mode 100644
index 000000000000..0a51193a9f10
--- /dev/null
+++ b/audio/baresip/files/patch-modules-portaudio-portaudio-c
@@ -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 <string.h>
+-#include <portaudio.h>
++#include <portaudio2/portaudio.h>
+ #include <re.h>
+ #include <baresip.h>
+ 
diff --git a/audio/baresip/files/patch-modules-v4l2-v4l2-c b/audio/baresip/files/patch-modules-v4l2-v4l2-c
new file mode 100644
index 000000000000..f5beef0aeac8
--- /dev/null
+++ b/audio/baresip/files/patch-modules-v4l2-v4l2-c
@@ -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 <unistd.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <malloc.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/mman.h>