Attachment #235190 for bug #261035




PORTNAME=	baresip
DISTVERSIONPREFIX=	v
DISTVERSION=	2.3.0
CATEGORIES=	audio
MASTER_SITES=	http://www.creytiv.com/pub/

MAINTAINER=	crees@FreeBSD.org
COMMENT=	Small SIP client

LICENSE=	BSD3CLAUSE
LICENSE_FILE=	${WRKSRC}/docs/COPYING

BUILD_DEPENDS=	re>=${DISTVERSION}:audio/re \
		rem>=${DISTVERSION}:audio/rem
RUN_DEPENDS:=	${BUILD_DEPENDS}

USES=		gmake pkgconfig ssl
USE_GITHUB=	yes
GH_ACCOUNT=	baresip
CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/ilbc
MAKE_ARGS=	MOD_AUTODETECT=""
PLIST_FILES=	bin/baresip

PORTDOCS=	*
PORTEXAMPLES=	*

OPTIONS_DEFINE=	\
	ALSA \
	DOCS \
	EXAMPLES \
	G711 G722 G726 GSM GST GST_VIDEO \
	MQTT \
	OPUS OPUS_MS \
	PLC PORTAUDIO PULSEAUDIO \
	SDL SNAPSHOT SNDFILE \
	V4L2 VPX \
	X11
OPTIONS_DEFAULT=CONS DOCS EVDEV EXAMPLES G711 G722 G726 HTTPREQ L16 NETROAM STDIO SYSLOG

ALSA_DESC=	ALSA audio driver
G711_DESC=	G.711 audio codec
G722_DESC=	G.722 audio codec
G722_1_DESC=	G.722.1 audio codec
G726_DESC=	G.726 audio codec
GSM_DESC=	GSM audio codec
GST_DESC=	Gstreamer audio module
GST_VIDEO_DESC=	Gstreamer video module
MQTT_DESC=	Message Queue Telemetry Transport (MQTT) client
OPUS_DESC=	Opus audio codec
OPUS_MS_DESC=	Opus Multistream audio codec
PLC_DESC=	Packet Loss Concealment
PORTAUDIO_DESC=	Portaudio audio driver
PULSEAUDIO_DESC=	Pulseaudio audio driver
SDL_DESC=	libSDL2 video output
SNAPSHOT_DESC=	Snapshot video module
SNDFILE_DESC=	sndfile wav dumper
SYSLOG_DESC=	Syslog module
V4L2_DESC=	Video4Linux2 module
VPX_DESC=	VP8/VP9 video codecs
X11_DESC=	X11 video output
VIDLOOP_DESC=	Video-loop test module
X11_DESC=	X11 module [broken]

.for o in ${OPTIONS_DEFINE}
.  ifndef $o_DESC
$o_DESC=	${o:C,^(.).*,\1,}${o:C,^.,,:tl} module
.  endif
.endfor

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MALSA}
ALSA_DEPEND=	${LOCALBASE}/include/alsa/asoundlib.h:audio/alsa-lib
.endif

.if ${PORT_OPTIONS:MG711}
G711_DEPEND=	${LOCALBASE}/include/spandsp/g711.h:comms/spandsp
.endif

.if ${PORT_OPTIONS:MG722}
G722_DEPEND=	${LOCALBASE}/include/spandsp/g722.h:comms/spandsp
.endif

.if ${PORT_OPTIONS:MG726}
G726_DEPEND=	${LOCALBASE}/include/spandsp/g726.h:comms/spandsp
.endif

.if ${PORT_OPTIONS:MGSM}
GSM_DEPEND=	${LOCALBASE}/include/gsm.h:audio/gsm
.endif

# Port used to call it GST, if it's set in make.conf let's not annoy people
.if ${PORT_OPTIONS:MGST}
PORT_OPTIONS+=	GSTREAMER
USES+=		gnome
USE_GNOME+=	glib20
USE_GSTREAMER1+=	yes
.endif

.if ${PORT_OPTIONS:MGST_VIDEO}
PORT_OPTIONS+=	GSTREAMER_VIDEO
USES+=		gnome
USE_GNOME+=	glib20
USE_GSTREAMER1+=	yes
.endif

.if ${PORT_OPTIONS:MMQTT}
LIB_DEPENDS+=	libmosquitto.so:net/mosquitto
.endif

.if ${PORT_OPTIONS:MOPUS}
OPUS_DEPEND=	${LOCALBASE}/include/opus/opus.h:audio/opus
.endif

.if ${PORT_OPTIONS:MOPUS_MS}
OPUS_MS_DEPEND=	${LOCALBASE}/include/opus/opus.h:audio/opus
.endif

.if ${PORT_OPTIONS:MPLC}
PLC_DEPEND=	${LOCALBASE}/include/spandsp/plc.h:comms/spandsp
.endif

.if ${PORT_OPTIONS:MPORTAUDIO}
PORTAUDIO_DEPEND=	${LOCALBASE}/include/portaudio.h:audio/portaudio
.endif

# Port calls it PULSE, standard OPTION is PULSEAUDIO
.if ${PORT_OPTIONS:MPULSEAUDIO}
PORT_OPTIONS+=	PULSE
PULSEAUDIO_DEPEND=	${LOCALBASE}/include/pulse/pulseaudio.h:audio/pulseaudio
.endif

.if ${PORT_OPTIONS:MSDL}
USES+=		sdl
USE_SDL=	sdl2
.endif

.if ${PORT_OPTIONS:MSNAPSHOT}
LIB_DEPENDS+=	libpng16.so:graphics/png
. for s in SPEEX_AEC SPEEX_PP SPEEX_RESAMP
MAKE_ARGS+=	USE_$s=yes
. endfor
MAKE_ARGS+=	HAVE_SPEEXDSP=yes
.endif

.if ${PORT_OPTIONS:MSNDFILE}
SNDFILE_DEPEND=	${LOCALBASE}/include/sndfile.h:audio/libsndfile
.endif

.if ${PORT_OPTIONS:MV4L2}
V4L2_DEPEND=	${LOCALBASE}/include/libv4l2.h:multimedia/libv4l
.endif

.if ${PORT_OPTIONS:MVPX}
VPX_DEPEND=	${LOCALBASE}/include/vpx/vp8.h:multimedia/libvpx
.endif

.if ${PORT_OPTIONS:MX11}
USES+=		xorg
USE_XORG=	x11
USE_XORG+=	xext
.endif

.for o in ${PORT_OPTIONS}




ALSA_DEPEND=	${LOCALBASE}/include/alsa/asoundlib.h:audio/alsa-lib
BV32_DEPEND=	# nonexistent
CONS_DEPEND=	# unnecessary
DTLS_SRTP_DEPEND=	# unnecessary
EVDEV_DEPEND=
FFMPEG_DEPEND=	${LOCALBASE}/include/libavcodec/avcodec.h:multimedia/ffmpeg
G711_DEPEND=	${LOCALBASE}/include/spandsp/g711.h:comms/spandsp
G722_DEPEND=	${LOCALBASE}/include/spandsp/g722.h:comms/spandsp
G722_1_DEPEND=	# nonexistent
GSM_DEPEND=	${LOCALBASE}/include/gsm.h:audio/gsm
GSTREAMER_DEPEND=	gst-launch-1.0:multimedia/gstreamer1
ILBC_DEPEND=	${LOCALBASE}/include/ilbc/iLBC_define.h:net/ilbc
L16_DEPEND=	
OPUS_DEPEND=	${LOCALBASE}/include/opus/opus.h:audio/opus
OSS_DEPEND=	# In base
PLC_DEPEND=	${LOCALBASE}/include/spandsp/plc.h:comms/spandsp
PORTAUDIO_DEPEND=	${LOCALBASE}/include/portaudio.h:audio/portaudio
PULSEAUDIO_DEPEND=	${LOCALBASE}/include/pulse/pulseaudio.h:audio/pulseaudio
SDL_DEPEND=	# Handled with USE_SDL in Makefile
SNDFILE_DEPEND=	${LOCALBASE}/include/sndfile.h:audio/libsndfile
SPEEX_DEPEND=	${LOCALBASE}/include/speex/speex.h:audio/speex
STDIO_DEPEND=	# In base
UUID_DEPEND=	${LOCALBASE}/include/uuid/uuid.h:misc/e2fsprogs-libuuid
V4L_DEPEND=	${LOCALBASE}/include/linux/videodev.h:multimedia/v4l_compat
V4L2_DEPEND=	${LOCALBASE}/include/libv4l2.h:multimedia/libv4l
X11_DEPEND=	# Handled with USE_XORG in Makefile

Lines 1-3 Link Here

(-)b/audio/baresip/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1524574857	1	TIMESTAMP = 1657283119
2	SHA256 (baresip-0.5.8.tar.gz) = d9f11da50fd6c9359ab478618b5d3c132474a838fe9f668c249f9d5a07f26662	2	SHA256 (baresip-baresip-v2.3.0_GH0.tar.gz) = eeb3189733cd4a727204268c216ca4656a0ac24b761169692d241ea887059a95
3	SIZE (baresip-0.5.8.tar.gz) = 584406	3	SIZE (baresip-baresip-v2.3.0_GH0.tar.gz) = 1114250

Added Link Here

(-)b/audio/baresip/files/patch-modules_alsa_alsa.c (+11 lines)
1	--- modules/alsa/alsa.c.orig 2022-05-01 07:27:33 UTC
2	+++ modules/alsa/alsa.c
3	@@ -4,7 +4,7 @@
4	* Copyright (C) 2010 Alfred E. Heggestad
5	*/
6	#define _DEFAULT_SOURCE 1
7	-#define _POSIX_SOURCE 1
8	+#define _POSIX_C_SOURCE 200112L
9	#include <sys/types.h>
10	#include <sys/time.h>
11	#include <stdlib.h>

Added Link Here

(-)b/audio/baresip/files/patch-modules_alsa_alsa__play.c (+11 lines)
1	--- modules/alsa/alsa_play.c.orig 2022-05-01 07:27:33 UTC
2	+++ modules/alsa/alsa_play.c
3	@@ -4,7 +4,7 @@
4	* Copyright (C) 2010 Alfred E. Heggestad
5	*/
6	#define _DEFAULT_SOURCE 1
7	-#define _POSIX_SOURCE 1
8	+#define _POSIX_C_SOURCE 200112L
9	#include <sys/types.h>
10	#include <sys/time.h>
11	#include <stdlib.h>

Added Link Here

(-)b/audio/baresip/files/patch-modules_alsa_alsa__src.c (+11 lines)
1	--- modules/alsa/alsa_src.c.orig 2022-05-01 07:27:33 UTC
2	+++ modules/alsa/alsa_src.c
3	@@ -4,7 +4,7 @@
4	* Copyright (C) 2010 Alfred E. Heggestad
5	*/
6	#define _DEFAULT_SOURCE 1
7	-#define _POSIX_SOURCE 1
8	+#define _POSIX_C_SOURCE 200112L
9	#include <sys/types.h>
10	#include <sys/time.h>
11	#include <stdlib.h>

Added Link Here

(-)b/audio/baresip/files/patch-modules_gst_gst.c (+11 lines)
1	--- modules/gst/gst.c.orig 2021-04-21 09:34:08 UTC
2	+++ modules/gst/gst.c
3	@@ -4,7 +4,7 @@
4	* Copyright (C) 2010 - 2015 Alfred E. Heggestad
5	*/
6	#define _DEFAULT_SOURCE 1
7	-#define _POSIX_C_SOURCE 199309L
8	+#define _POSIX_C_SOURCE 200112L
9	#include <stdlib.h>
10	#include <string.h>
11	#include <time.h>

Added Link Here

(-)b/audio/baresip/files/patch-src_audio.c (+11 lines)
1	--- src/audio.c.orig 2022-07-01 08:52:02 UTC
2	+++ src/audio.c
3	@@ -6,7 +6,7 @@
4	*/
5	#define _DEFAULT_SOURCE 1
6	#define _BSD_SOURCE 1
7	-#define _POSIX_C_SOURCE 199309L
8	+#define _POSIX_C_SOURCE 200112L
9	#include <string.h>
10	#include <stdlib.h>
11	#ifdef HAVE_UNISTD_H

Lines 1-25 Link Here

(-)b/audio/re/Makefile (-4 / +20 lines)
1	PORTNAME= re	1	PORTNAME= re
2	PORTVERSION= 0.5.8	2	DISTVERSIONPREFIX= v
		3	DISTVERSION= 2.3.0
3	CATEGORIES= audio devel	4	CATEGORIES= audio devel
4	MASTER_SITES= http://www.creytiv.com/pub/
5		5
6	MAINTAINER= crees@FreeBSD.org	6	MAINTAINER= crees@FreeBSD.org
7	COMMENT= Library for real-time comms with async IO support	7	COMMENT= Library for real-time comms with async IO support
8		8
9	LICENSE= BSD3CLAUSE	9	LICENSE= BSD3CLAUSE
10	LICENSE_FILE= ${WRKSRC}/docs/COPYING	10	LICENSE_FILE= ${WRKSRC}/LICENSE
11		11
12	USES= gmake ssl	12	USES= gmake ssl
		13	USE_GITHUB= yes
		14	GH_ACCOUNT= baresip
13	USE_LDCONFIG= yes	15	USE_LDCONFIG= yes
14	MAKE_ARGS+= SYSROOT_ALT=${OPENSSLBASE}	16	MAKE_ARGS+= SYSROOT_ALT=${OPENSSLBASE}
15		17
16	PORTDATA= re.mk	18	PORTDATA= re.mk
		19	# FIXME values of the next 3 variables taken from source code Makefile
		20	ABI_MAJOR= 5
		21	ABI_AGE= 3
		22	ABI_REV= 0
		23	PLIST_SUB= ABI_MAJOR=${ABI_MAJOR}
		24	PLIST_SUB+= ABI_AGE=${ABI_AGE}
		25	PLIST_SUB+= ABI_REV=${ABI_REV}
17		26
18	do-install:	27	do-install:
19	${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME} ${STAGEDIR}${DATADIR}	28	${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME} ${STAGEDIR}${DATADIR}
20	(cd ${WRKSRC}/include && \	29	(cd ${WRKSRC}/include && \
21	${COPYTREE_SHARE} \*.h ${STAGEDIR}${PREFIX}/include/${PORTNAME})	30	${COPYTREE_SHARE} \*.h ${STAGEDIR}${PREFIX}/include/${PORTNAME})
22	${INSTALL_DATA} ${WRKSRC}/mk/${PORTNAME}.mk ${STAGEDIR}${DATADIR}	31	${INSTALL_DATA} ${WRKSRC}/mk/${PORTNAME}.mk ${STAGEDIR}${DATADIR}
23	${INSTALL_LIB} ${WRKSRC}/lib${PORTNAME}.[sa]* ${STAGEDIR}${PREFIX}/lib	32	${INSTALL_DATA} ${WRKSRC}/lib${PORTNAME}.a ${STAGEDIR}${PREFIX}/lib
		33	${INSTALL_DATA} ${WRKSRC}/lib${PORTNAME}.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig
		34	${INSTALL_LIB} ${WRKSRC}/lib${PORTNAME}.so \
		35	${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${ABI_MAJOR}.${ABI_AGE}.${ABI_REV}
		36	${RLN} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${ABI_MAJOR}.${ABI_AGE}.${ABI_REV} \
		37	${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${ABI_MAJOR}
		38	${RLN} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${ABI_MAJOR}.${ABI_AGE}.${ABI_REV} \
		39	${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so
24		40
25	.include <bsd.port.mk>	41	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/audio/re/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1524574824	1	TIMESTAMP = 1657114025
2	SHA256 (re-0.5.8.tar.gz) = 190fd652da167d8d6351b7a26fa0aef2ddab75fe5e8d5de77edf023988440e70	2	SHA256 (baresip-re-v2.3.0_GH0.tar.gz) = 5ffcb354d09e416fe6ce12d7245d567c21b396894240c2e137a2a009a6472f83
3	SIZE (re-0.5.8.tar.gz) = 301351	3	SIZE (baresip-re-v2.3.0_GH0.tar.gz) = 362945




--- Makefile.orig	2022-05-01 07:02:43 UTC
+++ Makefile
@@ -73,7 +73,8 @@ SHARED_SONAME  := $(SHARED).$(ABI_MAJOR)
 SHARED_FILE    := $(SHARED).$(ABI_MAJOR).$(ABI_AGE).$(ABI_REV)
 STATIC         := libre.a
 
-ifeq ($(OS),linux)
+ifeq ($(OS),freebsd)
+LFLAGS += -lexecinfo -lstdthreads
 SH_LFLAGS      += -Wl,-soname,$(SHARED_SONAME)
 endif
 

Lines 1-12 Link Here

(-)b/audio/re/files/patch-mk_re.mk (-7 / +6 lines)
1	--- mk/re.mk.orig 2016-04-15 07:09:59 UTC	1	--- mk/re.mk.orig 2022-05-01 07:02:43 UTC
2	+++ mk/re.mk	2	+++ mk/re.mk
3	@@ -75,9 +75,6 @@ endif	3	@@ -95,7 +95,7 @@ ifeq ($(CC),)
4	ifeq ($(CC),)
5	CC := gcc	4	CC := gcc
6	endif	5	endif
7	-ifeq ($(CC),cc)	6	ifeq ($(CC),cc)
8	- CC := gcc	7	- CC := gcc
9	-endif	8	+ CC := clang
		9	endif
10	LD := $(CC)	10	LD := $(CC)
11	CC_LONGVER := $(shell if $(CC) -v 2>/dev/null; then \	11
12	$(CC) -v 2>&1 ;\




include/re/re.h
include/re/re_aes.h
include/re/re_atomic.h
include/re/re_base64.h
include/re/re_bfcp.h
include/re/re_bitv.h
include/re/re_btrace.h
include/re/re_conf.h
include/re/re_convert.h
include/re/re_crc32.h
include/re/re_dbg.h
include/re/re_dns.h

include/re/re_mod.h
include/re/re_mqueue.h
include/re/re_msg.h
include/re/re_natbd.h
include/re/re_net.h
include/re/re_odict.h
include/re/re_pcp.h
include/re/re_rtmp.h
include/re/re_rtp.h
include/re/re_sa.h
include/re/re_sdp.h
include/re/re_sha.h
include/re/re_shim.h
include/re/re_sip.h
include/re/re_sipevent.h
include/re/re_sipreg.h

include/re/re_telev.h
include/re/re_tls.h
include/re/re_tmr.h
include/re/re_trace.h
include/re/re_trice.h
include/re/re_turn.h
include/re/re_types.h
include/re/re_udp.h

include/re/re_websock.h
lib/libre.a
lib/libre.so
lib/libre.so.%%ABI_MAJOR%%
lib/libre.so.%%ABI_MAJOR%%.%%ABI_AGE%%.%%ABI_REV%%
libdata/pkgconfig/libre.pc

Lines 1-7 Link Here

(-)b/audio/rem/Makefile (-3 / +19 lines)
1	PORTNAME= rem	1	PORTNAME= rem
2	PORTVERSION= 0.5.3	2	DISTVERSIONPREFIX= v
		3	DISTVERSION= 2.3.0
3	CATEGORIES= audio devel	4	CATEGORIES= audio devel
4	MASTER_SITES= http://www.creytiv.com/pub/
5		5
6	MAINTAINER= crees@FreeBSD.org	6	MAINTAINER= crees@FreeBSD.org
7	COMMENT= Library for real-time audio and video processing	7	COMMENT= Library for real-time audio and video processing
Lines 13-25 BUILD_DEPENDS= ${LOCALBASE}/share/re/re.mk:audio/re Link Here
13	RUN_DEPENDS:= ${BUILD_DEPENDS}	13	RUN_DEPENDS:= ${BUILD_DEPENDS}
14		14
15	USES= gmake ssl	15	USES= gmake ssl
		16	USE_GITHUB= yes
		17	GH_ACCOUNT= baresip
16	USE_LDCONFIG= yes	18	USE_LDCONFIG= yes
17		19
		20	# FIXME values of the next 3 variables taken from source code Makefile
		21	ABI_MAJOR= 2
		22	ABI_AGE= 0
		23	ABI_REV= 0
		24	PLIST_SUB= ABI_MAJOR=${ABI_MAJOR}
		25	PLIST_SUB+= ABI_AGE=${ABI_AGE}
		26	PLIST_SUB+= ABI_REV=${ABI_REV}
		27
18	do-install:	28	do-install:
19	${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}	29	${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
20	(cd ${WRKSRC}/include && \	30	(cd ${WRKSRC}/include && \
21	${COPYTREE_SHARE} \*.h ${STAGEDIR}${PREFIX}/include/${PORTNAME})	31	${COPYTREE_SHARE} \*.h ${STAGEDIR}${PREFIX}/include/${PORTNAME})
22	${INSTALL_LIB} ${WRKSRC}/lib${PORTNAME}.so ${STAGEDIR}${PREFIX}/lib
23	${INSTALL_DATA} ${WRKSRC}/lib${PORTNAME}.a ${STAGEDIR}${PREFIX}/lib	32	${INSTALL_DATA} ${WRKSRC}/lib${PORTNAME}.a ${STAGEDIR}${PREFIX}/lib
		33	${INSTALL_DATA} ${WRKSRC}/lib${PORTNAME}.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig
		34	${INSTALL_LIB} ${WRKSRC}/lib${PORTNAME}.so \
		35	${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${ABI_MAJOR}.${ABI_AGE}.${ABI_REV}
		36	${RLN} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${ABI_MAJOR}.${ABI_AGE}.${ABI_REV} \
		37	${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${ABI_MAJOR}
		38	${RLN} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${ABI_MAJOR}.${ABI_AGE}.${ABI_REV} \
		39	${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so
24		40
25	.include <bsd.port.mk>	41	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/audio/rem/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1524574809	1	TIMESTAMP = 1657114345
2	SHA256 (rem-0.5.3.tar.gz) = 9f98a79947d4709282a5791ac30f0eda03d5d34086f36df74bff4f8aac0e8050	2	SHA256 (baresip-rem-v2.3.0_GH0.tar.gz) = a80a1dc2b30233cd4012de8b58ac9c7e87e17676e6026629d8b66d8a01600a83
3	SIZE (rem-0.5.3.tar.gz) = 40417	3	SIZE (baresip-rem-v2.3.0_GH0.tar.gz) = 59590




--- Makefile.orig	2022-05-01 07:30:49 UTC
+++ Makefile
@@ -123,7 +123,8 @@ SHARED_SONAME  := $(SHARED).$(ABI_MAJOR)
 SHARED_FILE    := $(SHARED).$(ABI_MAJOR).$(ABI_AGE).$(ABI_REV)
 STATIC	:= librem.a
 
-ifeq ($(OS),linux)
+ifeq ($(OS),freebsd)
+LFLAGS += -lexecinfo -lstdthreads
 SH_LFLAGS      += -Wl,-soname,$(SHARED_SONAME)
 endif
 

Lines 1-20 Link Here

(-)b/audio/rem/pkg-plist (-1 / +10 lines)
1	include/rem/rem.h	1	include/rem/rem.h
		2	include/rem/rem_aac.h
2	include/rem/rem_au.h	3	include/rem/rem_au.h
3	include/rem/rem_aubuf.h	4	include/rem/rem_aubuf.h
4	include/rem/rem_auconv.h	5	include/rem/rem_auconv.h
5	include/rem/rem_audio.h	6	include/rem/rem_audio.h
6	include/rem/rem_aufile.h	7	include/rem/rem_aufile.h
		8	include/rem/rem_auframe.h
		9	include/rem/rem_aulevel.h
7	include/rem/rem_aumix.h	10	include/rem/rem_aumix.h
8	include/rem/rem_auresamp.h	11	include/rem/rem_auresamp.h
9	include/rem/rem_autone.h	12	include/rem/rem_autone.h
		13	include/rem/rem_avc.h
10	include/rem/rem_dsp.h	14	include/rem/rem_dsp.h
11	include/rem/rem_dtmf.h	15	include/rem/rem_dtmf.h
12	include/rem/rem_fir.h	16	include/rem/rem_fir.h
		17	include/rem/rem_flv.h
13	include/rem/rem_g711.h	18	include/rem/rem_g711.h
14	include/rem/rem_goertzel.h	19	include/rem/rem_goertzel.h
		20	include/rem/rem_h264.h
		21	include/rem/rem_h265.h
15	include/rem/rem_vid.h	22	include/rem/rem_vid.h
16	include/rem/rem_vidconv.h	23	include/rem/rem_vidconv.h
17	include/rem/rem_video.h	24	include/rem/rem_video.h
18	include/rem/rem_vidmix.h	25	include/rem/rem_vidmix.h
19	lib/librem.a	26	lib/librem.a
20	lib/librem.so	27	lib/librem.so
21	-	28	lib/librem.so.%%ABI_MAJOR%%
		29	lib/librem.so.%%ABI_MAJOR%%.%%ABI_AGE%%.%%ABI_REV%%
		30	libdata/pkgconfig/librem.pc

Return to bug 261035

Lines 1-8 Link Here

(-)b/audio/baresip/Makefile (-49 / +99 lines)
1	PORTNAME= baresip	1	PORTNAME= baresip
2	PORTVERSION= 0.5.8	2	DISTVERSIONPREFIX= v
3	PORTREVISION= 9	3	DISTVERSION= 2.3.0
4	CATEGORIES= audio	4	CATEGORIES= audio
5	MASTER_SITES= http://www.creytiv.com/pub/
6		5
7	MAINTAINER= crees@FreeBSD.org	6	MAINTAINER= crees@FreeBSD.org
8	COMMENT= Small SIP client	7	COMMENT= Small SIP client
Lines 10-20 COMMENT= Small SIP client Link Here
10	LICENSE= BSD3CLAUSE	9	LICENSE= BSD3CLAUSE
11	LICENSE_FILE= ${WRKSRC}/docs/COPYING	10	LICENSE_FILE= ${WRKSRC}/docs/COPYING
12		11
13	BUILD_DEPENDS= re>=0.5.8:audio/re \	12	BUILD_DEPENDS= re>=${DISTVERSION}:audio/re \
14	rem>=0.5.3:audio/rem	13	rem>=${DISTVERSION}:audio/rem
15	RUN_DEPENDS:= ${BUILD_DEPENDS}	14	RUN_DEPENDS:= ${BUILD_DEPENDS}
16		15
17	USES= gmake pkgconfig ssl	16	USES= gmake pkgconfig ssl
		17	USE_GITHUB= yes
		18	GH_ACCOUNT= baresip
18	CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/ilbc	19	CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/ilbc
19	MAKE_ARGS= MOD_AUTODETECT=""	20	MAKE_ARGS= MOD_AUTODETECT=""
20	PLIST_FILES= bin/baresip	21	PLIST_FILES= bin/baresip
Lines 22-100 PORTDATA= * Link Here
22	PORTDOCS= *	23	PORTDOCS= *
23	PORTEXAMPLES= *	24	PORTEXAMPLES= *
24		25
25	#OPTIONS_NOT_YET_WORKING= ALSA BV32 G722_1 PLC ISAC OPENGLES	26	OPTIONS_DEFINE= \
26	OPTIONS_DEFINE= CONS DOCS EXAMPLES FFMPEG G711 G722 G726 GSM GSTREAMER ILBC \	27	ALSA \
27	L16 OPUS OSS PORTAUDIO PULSEAUDIO SDL SNDFILE SPEEX STDIO UUID V4L V4L2 X11 \	28	DOCS \
28	DTLS_SRTP AUBRIDGE VIDBRIDGE HTTPD DSHOW DIRECTFB ACCOUNT \	29	EXAMPLES \
29	NATPMP SDL MIW SNAPSHOT SELFVIEW VUMETER AULOOP CONTACT \	30	G711 G722 G726 GSM GST GST_VIDEO \
30	MENU PRESENCE SYSLOG VIDLOOP	31	MQTT \
31	OPTIONS_DEFAULT=CONS G711 G722 G726 L16 OSS STDIO	32	OPUS OPUS_MS \
32		33	PLC PORTAUDIO PULSEAUDIO \
33	AULOOP_DESC= Audio-loop test module	34	SDL SNAPSHOT SNDFILE \
34	BV32_DESC= BroadVoice32 Wideband Audio codec	35	V4L2 VPX \
35	CONTACT_DESC= Contacts module	36	X11
36	CONS_DESC= Console input driver	37	OPTIONS_DEFAULT=CONS DOCS EVDEV EXAMPLES G711 G722 G726 HTTPREQ L16 NETROAM STDIO SYSLOG
37	DTLS_SRTP_DESC= DTLS Secure RTP module [broken]	38
		39	ALSA_DESC= ALSA audio driver
38	G711_DESC= G.711 audio codec	40	G711_DESC= G.711 audio codec
39	G722_DESC= G.722 audio codec	41	G722_DESC= G.722 audio codec
40	G722_1_DESC= G.722.1 audio codec
41	G726_DESC= G.726 audio codec	42	G726_DESC= G.726 audio codec
42	ILBC_DESC= iLBC audio codec	43	GSM_DESC= GSM audio codec
43	L16_DESC= L16 audio codec	44	GST_DESC= Gstreamer audio module
44	MENU_DESC= Interactive menu	45	GST_VIDEO_DESC= Gstreamer video module
45	OPENGLES_DESC= OpenGL ES video output	46	MQTT_DESC= Message Queue Telemetry Transport (MQTT) client
		47	OPUS_DESC= Opus audio codec
		48	OPUS_MS_DESC= Opus Multistream audio codec
46	PLC_DESC= Packet Loss Concealment	49	PLC_DESC= Packet Loss Concealment
47	PRESENCE_DESC= Presence module	50	PORTAUDIO_DESC= Portaudio audio driver
48	STDIO_DESC= stdio input driver	51	PULSEAUDIO_DESC= Pulseaudio audio driver
		52	SDL_DESC= libSDL2 video output
		53	SNAPSHOT_DESC= Snapshot video module
		54	SNDFILE_DESC= sndfile wav dumper
49	SYSLOG_DESC= Syslog module	55	SYSLOG_DESC= Syslog module
50	UUID_DESC= UUID module	56	V4L2_DESC= Video4Linux2 module
51	V4L_DESC= Video4Linux module [broken]	57	VPX_DESC= VP8/VP9 video codecs
52	V4L2_DESC= Video4Linux2 module [broken]	58	X11_DESC= X11 video output
53	VIDLOOP_DESC= Video-loop test module
54	X11_DESC= X11 module [broken]
55
56	.for o in ${OPTIONS_DEFINE}
57	. ifndef $o_DESC
58	$o_DESC= ${o:C,^(.).*,\1,}${o:C,^.,,:tl} module
59	. endif
60	.endfor
61		59
62	.include <bsd.port.options.mk>	60	.include <bsd.port.options.mk>
63		61
64	.include "${.CURDIR}/Makefile.depends"	62	.if ${PORT_OPTIONS:MALSA}
		63	ALSA_DEPEND= ${LOCALBASE}/include/alsa/asoundlib.h:audio/alsa-lib
		64	.endif
		65
		66	.if ${PORT_OPTIONS:MG711}
		67	G711_DEPEND= ${LOCALBASE}/include/spandsp/g711.h:comms/spandsp
		68	.endif
		69
		70	.if ${PORT_OPTIONS:MG722}
		71	G722_DEPEND= ${LOCALBASE}/include/spandsp/g722.h:comms/spandsp
		72	.endif
		73
		74	.if ${PORT_OPTIONS:MG726}
		75	G726_DEPEND= ${LOCALBASE}/include/spandsp/g726.h:comms/spandsp
		76	.endif
		77
		78	.if ${PORT_OPTIONS:MGSM}
		79	GSM_DEPEND= ${LOCALBASE}/include/gsm.h:audio/gsm
		80	.endif
65		81
66	# Port used to call it GST, if it's set in make.conf let's not annoy people	82	# Port used to call it GST, if it's set in make.conf let's not annoy people
67	.if ${PORT_OPTIONS:MGST}	83	.if ${PORT_OPTIONS:MGST}
68	PORT_OPTIONS+= GSTREAMER	84	PORT_OPTIONS+= GSTREAMER
		85	USES+= gnome
		86	USE_GNOME+= glib20
		87	USE_GSTREAMER1+= yes
		88	.endif
		89
		90	.if ${PORT_OPTIONS:MGST_VIDEO}
		91	PORT_OPTIONS+= GSTREAMER_VIDEO
		92	USES+= gnome
		93	USE_GNOME+= glib20
		94	USE_GSTREAMER1+= yes
		95	.endif
		96
		97	.if ${PORT_OPTIONS:MMQTT}
		98	LIB_DEPENDS+= libmosquitto.so:net/mosquitto
		99	.endif
		100
		101	.if ${PORT_OPTIONS:MOPUS}
		102	OPUS_DEPEND= ${LOCALBASE}/include/opus/opus.h:audio/opus
		103	.endif
		104
		105	.if ${PORT_OPTIONS:MOPUS_MS}
		106	OPUS_MS_DEPEND= ${LOCALBASE}/include/opus/opus.h:audio/opus
		107	.endif
		108
		109	.if ${PORT_OPTIONS:MPLC}
		110	PLC_DEPEND= ${LOCALBASE}/include/spandsp/plc.h:comms/spandsp
		111	.endif
		112
		113	.if ${PORT_OPTIONS:MPORTAUDIO}
		114	PORTAUDIO_DEPEND= ${LOCALBASE}/include/portaudio.h:audio/portaudio
69	.endif	115	.endif
70		116
71	# Port calls it PULSE, standard OPTION is PULSEAUDIO	117	# Port calls it PULSE, standard OPTION is PULSEAUDIO
72	.if ${PORT_OPTIONS:MPULSEAUDIO}	118	.if ${PORT_OPTIONS:MPULSEAUDIO}
73	PORT_OPTIONS+= PULSE	119	PORT_OPTIONS+= PULSE
		120	PULSEAUDIO_DEPEND= ${LOCALBASE}/include/pulse/pulseaudio.h:audio/pulseaudio
74	.endif	121	.endif
75		122
76	.if ${PORT_OPTIONS:MSDL}	123	.if ${PORT_OPTIONS:MSDL}
77	USES+= sdl	124	USES+= sdl
78	USE_SDL= sdl sound	125	USE_SDL= sdl2
79	.endif	126	.endif
80		127
81	# SPEEX forces install of speex, therefore may as well enable all methods	128	.if ${PORT_OPTIONS:MSNAPSHOT}
82	.if ${PORT_OPTIONS:MSPEEX}	129	LIB_DEPENDS+= libpng16.so:graphics/png
83	. for s in SPEEX_AEC SPEEX_PP SPEEX_RESAMP
84	MAKE_ARGS+= USE_$s=yes
85	. endfor
86	MAKE_ARGS+= HAVE_SPEEXDSP=yes
87	.endif	130	.endif
88		131
89	.for o in V4L DTLS_SRTP V4L2 X11	132	.if ${PORT_OPTIONS:MSNDFILE}
90	. if ${PORT_OPTIONS:M$o}	133	SNDFILE_DEPEND= ${LOCALBASE}/include/sndfile.h:audio/libsndfile
91	BROKEN= OPTIONS marked as BROKEN have not been updated to the new Baresip API	134	.endif
92	. endif	135
93	.endfor	136	.if ${PORT_OPTIONS:MV4L2}
		137	V4L2_DEPEND= ${LOCALBASE}/include/libv4l2.h:multimedia/libv4l
		138	.endif
		139
		140	.if ${PORT_OPTIONS:MVPX}
		141	VPX_DEPEND= ${LOCALBASE}/include/vpx/vp8.h:multimedia/libvpx
		142	.endif
94		143
95	.if ${PORT_OPTIONS:MX11}	144	.if ${PORT_OPTIONS:MX11}
96	USES+= xorg	145	USES+= xorg
97	USE_XORG= x11	146	USE_XORG= x11
		147	USE_XORG+= xext
98	.endif	148	.endif
99		149
100	.for o in ${PORT_OPTIONS}	150	.for o in ${PORT_OPTIONS}

Removed Link Here

(-)a/audio/baresip/Makefile.depends (-26 lines)
1	ALSA_DEPEND= ${LOCALBASE}/include/alsa/asoundlib.h:audio/alsa-lib
2	BV32_DEPEND= # nonexistent
3	CONS_DEPEND= # unnecessary
4	DTLS_SRTP_DEPEND= # unnecessary
5	EVDEV_DEPEND=
6	FFMPEG_DEPEND= ${LOCALBASE}/include/libavcodec/avcodec.h:multimedia/ffmpeg
7	G711_DEPEND= ${LOCALBASE}/include/spandsp/g711.h:comms/spandsp
8	G722_DEPEND= ${LOCALBASE}/include/spandsp/g722.h:comms/spandsp
9	G722_1_DEPEND= # nonexistent
10	GSM_DEPEND= ${LOCALBASE}/include/gsm.h:audio/gsm
11	GSTREAMER_DEPEND= gst-launch-1.0:multimedia/gstreamer1
12	ILBC_DEPEND= ${LOCALBASE}/include/ilbc/iLBC_define.h:net/ilbc
13	L16_DEPEND=
14	OPUS_DEPEND= ${LOCALBASE}/include/opus/opus.h:audio/opus
15	OSS_DEPEND= # In base
16	PLC_DEPEND= ${LOCALBASE}/include/spandsp/plc.h:comms/spandsp
17	PORTAUDIO_DEPEND= ${LOCALBASE}/include/portaudio.h:audio/portaudio
18	PULSEAUDIO_DEPEND= ${LOCALBASE}/include/pulse/pulseaudio.h:audio/pulseaudio
19	SDL_DEPEND= # Handled with USE_SDL in Makefile
20	SNDFILE_DEPEND= ${LOCALBASE}/include/sndfile.h:audio/libsndfile
21	SPEEX_DEPEND= ${LOCALBASE}/include/speex/speex.h:audio/speex
22	STDIO_DEPEND= # In base
23	UUID_DEPEND= ${LOCALBASE}/include/uuid/uuid.h:misc/e2fsprogs-libuuid
24	V4L_DEPEND= ${LOCALBASE}/include/linux/videodev.h:multimedia/v4l_compat
25	V4L2_DEPEND= ${LOCALBASE}/include/libv4l2.h:multimedia/libv4l
26	X11_DEPEND= # Handled with USE_XORG in Makefile

Added Link Here

(-)b/audio/re/files/patch-Makefile (+12 lines)
1	--- Makefile.orig 2022-05-01 07:02:43 UTC
2	+++ Makefile
3	@@ -73,7 +73,8 @@ SHARED_SONAME := $(SHARED).$(ABI_MAJOR)
4	SHARED_FILE := $(SHARED).$(ABI_MAJOR).$(ABI_AGE).$(ABI_REV)
5	STATIC := libre.a
6
7	-ifeq ($(OS),linux)
8	+ifeq ($(OS),freebsd)
9	+LFLAGS += -lexecinfo -lstdthreads
10	SH_LFLAGS += -Wl,-soname,$(SHARED_SONAME)
11	endif
12

Lines 1-9 Link Here

(-)b/audio/re/pkg-plist (-1 / +11 lines)
1	include/re/re.h	1	include/re/re.h
2	include/re/re_aes.h	2	include/re/re_aes.h
		3	include/re/re_atomic.h
3	include/re/re_base64.h	4	include/re/re_base64.h
4	include/re/re_bfcp.h	5	include/re/re_bfcp.h
5	include/re/re_bitv.h	6	include/re/re_bitv.h
		7	include/re/re_btrace.h
6	include/re/re_conf.h	8	include/re/re_conf.h
		9	include/re/re_convert.h
7	include/re/re_crc32.h	10	include/re/re_crc32.h
8	include/re/re_dbg.h	11	include/re/re_dbg.h
9	include/re/re_dns.h	12	include/re/re_dns.h
Lines 24-36 include/re/re_mem.h Link Here
24	include/re/re_mod.h	27	include/re/re_mod.h
25	include/re/re_mqueue.h	28	include/re/re_mqueue.h
26	include/re/re_msg.h	29	include/re/re_msg.h
27	include/re/re_natbd.h
28	include/re/re_net.h	30	include/re/re_net.h
29	include/re/re_odict.h	31	include/re/re_odict.h
		32	include/re/re_pcp.h
		33	include/re/re_rtmp.h
30	include/re/re_rtp.h	34	include/re/re_rtp.h
31	include/re/re_sa.h	35	include/re/re_sa.h
32	include/re/re_sdp.h	36	include/re/re_sdp.h
33	include/re/re_sha.h	37	include/re/re_sha.h
		38	include/re/re_shim.h
34	include/re/re_sip.h	39	include/re/re_sip.h
35	include/re/re_sipevent.h	40	include/re/re_sipevent.h
36	include/re/re_sipreg.h	41	include/re/re_sipreg.h
Lines 42-47 include/re/re_tcp.h Link Here
42	include/re/re_telev.h	47	include/re/re_telev.h
43	include/re/re_tls.h	48	include/re/re_tls.h
44	include/re/re_tmr.h	49	include/re/re_tmr.h
		50	include/re/re_trace.h
		51	include/re/re_trice.h
45	include/re/re_turn.h	52	include/re/re_turn.h
46	include/re/re_types.h	53	include/re/re_types.h
47	include/re/re_udp.h	54	include/re/re_udp.h
Lines 49-51 include/re/re_uri.h Link Here
49	include/re/re_websock.h	56	include/re/re_websock.h
50	lib/libre.a	57	lib/libre.a
51	lib/libre.so	58	lib/libre.so
		59	lib/libre.so.%%ABI_MAJOR%%
		60	lib/libre.so.%%ABI_MAJOR%%.%%ABI_AGE%%.%%ABI_REV%%
		61	libdata/pkgconfig/libre.pc

Added Link Here

(-)b/audio/rem/files/patch-Makefile (+12 lines)
1	--- Makefile.orig 2022-05-01 07:30:49 UTC
2	+++ Makefile
3	@@ -123,7 +123,8 @@ SHARED_SONAME := $(SHARED).$(ABI_MAJOR)
4	SHARED_FILE := $(SHARED).$(ABI_MAJOR).$(ABI_AGE).$(ABI_REV)
5	STATIC := librem.a
6
7	-ifeq ($(OS),linux)
8	+ifeq ($(OS),freebsd)
9	+LFLAGS += -lexecinfo -lstdthreads
10	SH_LFLAGS += -Wl,-soname,$(SHARED_SONAME)
11	endif
12