View | Details | Raw Unified | Return to bug 261035 | Differences between
and this patch

Collapse All | Expand All

(-)b/audio/baresip/Makefile (-52 / +110 lines)
Lines 1-21 Link Here
1
PORTNAME=	baresip
1
PORTNAME=	baresip
2
PORTVERSION=	0.5.8
2
DISTVERSIONPREFIX=	v
3
PORTREVISION=	9
3
DISTVERSION=	2.9.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
9
WWW=		http://www.creytiv.com/baresip.html
8
WWW=		https://github.com/baresip
10
9
11
LICENSE=	BSD3CLAUSE
10
LICENSE=	BSD3CLAUSE
12
LICENSE_FILE=	${WRKSRC}/docs/COPYING
11
LICENSE_FILE=	${WRKSRC}/LICENSE
13
12
14
BUILD_DEPENDS=	re>=0.5.8:audio/re \
13
BUILD_DEPENDS=	re>=2.9.0:audio/re \
15
		rem>=0.5.3:audio/rem
14
		rem>=2.9.0:audio/rem
16
RUN_DEPENDS:=	${BUILD_DEPENDS}
15
RUN_DEPENDS:=	${BUILD_DEPENDS}
17
16
18
USES=		gmake pkgconfig ssl
17
USES=		gmake pkgconfig ssl
18
USE_GITHUB=	yes
19
GH_ACCOUNT=	baresip
19
CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/ilbc
20
CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/ilbc
20
MAKE_ARGS=	MOD_AUTODETECT=""
21
MAKE_ARGS=	MOD_AUTODETECT=""
21
PLIST_FILES=	bin/baresip
22
PLIST_FILES=	bin/baresip
Lines 23-101 PORTDATA= * Link Here
23
PORTDOCS=	*
24
PORTDOCS=	*
24
PORTEXAMPLES=	*
25
PORTEXAMPLES=	*
25
26
26
#OPTIONS_NOT_YET_WORKING=	ALSA BV32 G722_1 PLC ISAC OPENGLES
27
OPTIONS_DEFINE=	\
27
OPTIONS_DEFINE=	CONS DOCS EXAMPLES FFMPEG G711 G722 G726 GSM GSTREAMER ILBC \
28
	AVCODEC AVFILTER AVFORMAT ALSA \
28
	L16 OPUS OSS PORTAUDIO PULSEAUDIO SDL SNDFILE SPEEX STDIO UUID V4L V4L2 X11 \
29
	DOCS \
29
	DTLS_SRTP AUBRIDGE VIDBRIDGE HTTPD DSHOW DIRECTFB ACCOUNT \
30
	EXAMPLES \
30
	NATPMP SDL MIW SNAPSHOT SELFVIEW VUMETER AULOOP CONTACT \
31
	G711 G722 G726 GST \
31
	MENU PRESENCE SYSLOG VIDLOOP
32
	MQTT \
32
OPTIONS_DEFAULT=CONS G711 G722 G726 L16 OSS STDIO
33
	OPUS OPUS_MS \
33
34
	PLC PORTAUDIO PULSEAUDIO \
34
AULOOP_DESC=	Audio-loop test module
35
	SDL SNAPSHOT SNDFILE SNDIO \
35
BV32_DESC=	BroadVoice32 Wideband Audio codec
36
	V4L2 VPX \
36
CONTACT_DESC=	Contacts module
37
	X11
37
CONS_DESC=	Console input driver
38
OPTIONS_DEFAULT=CONS DOCS EVDEV EXAMPLES G711 G722 G726 HTTPREQ L16 NETROAM STDIO SYSLOG
38
DTLS_SRTP_DESC=	DTLS Secure RTP module [broken]
39
40
ALSA_DESC=	ALSA audio driver
41
AVCODEC_DESC=	Video codecs using libavcodec
42
AVFILTER_DESC=	Video filter using libavfilter
43
AVFORMAT_DESC=	libavformat media-source
39
G711_DESC=	G.711 audio codec
44
G711_DESC=	G.711 audio codec
40
G722_DESC=	G.722 audio codec
45
G722_DESC=	G.722 audio codec
41
G722_1_DESC=	G.722.1 audio codec
42
G726_DESC=	G.726 audio codec
46
G726_DESC=	G.726 audio codec
43
ILBC_DESC=	iLBC audio codec
47
GST_DESC=	Gstreamer audio module
44
L16_DESC=	L16 audio codec
48
MQTT_DESC=	Message Queue Telemetry Transport (MQTT) client
45
MENU_DESC=	Interactive menu
49
OPUS_DESC=	Opus audio codec
46
OPENGLES_DESC=	OpenGL ES video output
50
OPUS_MS_DESC=	Opus Multistream audio codec
47
PLC_DESC=	Packet Loss Concealment
51
PLC_DESC=	Packet Loss Concealment
48
PRESENCE_DESC=	Presence module
52
PORTAUDIO_DESC=	Portaudio audio driver
49
STDIO_DESC=	stdio input driver
53
PULSEAUDIO_DESC=	Pulseaudio audio driver
54
SDL_DESC=	libSDL2 video output
55
SNAPSHOT_DESC=	Snapshot video module
56
SNDFILE_DESC=	sndfile wav dumper
57
SNDIO_DESC=	SndIO sound driver
50
SYSLOG_DESC=	Syslog module
58
SYSLOG_DESC=	Syslog module
51
UUID_DESC=	UUID module
59
V4L2_DESC=	Video4Linux2 module
52
V4L_DESC=	Video4Linux module [broken]
60
VPX_DESC=	VP8/VP9 video codecs
53
V4L2_DESC=	Video4Linux2 module [broken]
61
X11_DESC=	X11 video output
54
VIDLOOP_DESC=	Video-loop test module
55
X11_DESC=	X11 module [broken]
56
57
.for o in ${OPTIONS_DEFINE}
58
.  ifndef $o_DESC
59
$o_DESC=	${o:C,^(.).*,\1,}${o:C,^.,,:tl} module
60
.  endif
61
.endfor
62
62
63
.include <bsd.port.options.mk>
63
.include <bsd.port.options.mk>
64
64
65
.include "${.CURDIR}/Makefile.depends"
65
.if ${PORT_OPTIONS:MALSA}
66
ALSA_DEPEND=	${LOCALBASE}/include/alsa/asoundlib.h:audio/alsa-lib
67
.endif
68
69
.if ${PORT_OPTIONS:MAVCODEC}
70
AVCODEC_DEPEND=	${LOCALBASE}/include/libavcodec/avcodec.h:multimedia/ffmpeg
71
.endif
72
73
.if ${PORT_OPTIONS:MAVFILTER}
74
AVFILTER_DEPEND=	${LOCALBASE}/include/libavfilter/avfilter.h:multimedia/ffmpeg
75
.endif
76
77
.if ${PORT_OPTIONS:MAVFORMAT}
78
AVFORMAT_DEPEND=	${LOCALBASE}/include/libavformat/avformat.h:multimedia/ffmpeg
79
.endif
80
81
.if ${PORT_OPTIONS:MG711}
82
G711_DEPEND=	${LOCALBASE}/include/spandsp/g711.h:comms/spandsp
83
.endif
84
85
.if ${PORT_OPTIONS:MG722}
86
G722_DEPEND=	${LOCALBASE}/include/spandsp/g722.h:comms/spandsp
87
.endif
88
89
.if ${PORT_OPTIONS:MG726}
90
G726_DEPEND=	${LOCALBASE}/include/spandsp/g726.h:comms/spandsp
91
.endif
66
92
67
# Port used to call it GST, if it's set in make.conf let's not annoy people
68
.if ${PORT_OPTIONS:MGST}
93
.if ${PORT_OPTIONS:MGST}
94
GST_DEPEND=	${LOCALBASE}/include/gstreamer-1.0/gst/gst.h:multimedia/gstreamer1
69
PORT_OPTIONS+=	GSTREAMER
95
PORT_OPTIONS+=	GSTREAMER
96
USES+=		gnome
97
USE_GNOME+=	glib20
98
USE_GSTREAMER1+=	yes
99
.endif
100
101
.if ${PORT_OPTIONS:MMQTT}
102
LIB_DEPENDS+=	libmosquitto.so:net/mosquitto
103
.endif
104
105
.if ${PORT_OPTIONS:MOPUS}
106
OPUS_DEPEND=	${LOCALBASE}/include/opus/opus.h:audio/opus
107
.endif
108
109
.if ${PORT_OPTIONS:MOPUS_MS}
110
OPUS_MS_DEPEND=	${LOCALBASE}/include/opus/opus.h:audio/opus
111
.endif
112
113
.if ${PORT_OPTIONS:MPLC}
114
PLC_DEPEND=	${LOCALBASE}/include/spandsp/plc.h:comms/spandsp
115
.endif
116
117
.if ${PORT_OPTIONS:MPORTAUDIO}
118
PORTAUDIO_DEPEND=	${LOCALBASE}/include/portaudio.h:audio/portaudio
70
.endif
119
.endif
71
120
72
# Port calls it PULSE, standard OPTION is PULSEAUDIO
121
# Port calls it PULSE, standard OPTION is PULSEAUDIO
73
.if ${PORT_OPTIONS:MPULSEAUDIO}
122
.if ${PORT_OPTIONS:MPULSEAUDIO}
74
PORT_OPTIONS+=	PULSE
123
PORT_OPTIONS+=	PULSE
124
PULSEAUDIO_DEPEND=	${LOCALBASE}/include/pulse/pulseaudio.h:audio/pulseaudio
75
.endif
125
.endif
76
126
77
.if ${PORT_OPTIONS:MSDL}
127
.if ${PORT_OPTIONS:MSDL}
78
USES+=		sdl
128
USES+=		sdl
79
USE_SDL=	sdl sound
129
USE_SDL=	sdl2
80
.endif
130
.endif
81
131
82
# SPEEX forces install of speex, therefore may as well enable all methods
132
.if ${PORT_OPTIONS:MSNAPSHOT}
83
.if ${PORT_OPTIONS:MSPEEX}
133
LIB_DEPENDS+=	libpng16.so:graphics/png
84
. for s in SPEEX_AEC SPEEX_PP SPEEX_RESAMP
85
MAKE_ARGS+=	USE_$s=yes
86
. endfor
87
MAKE_ARGS+=	HAVE_SPEEXDSP=yes
88
.endif
134
.endif
89
135
90
.for o in V4L DTLS_SRTP V4L2 X11
136
.if ${PORT_OPTIONS:MSNDFILE}
91
.  if ${PORT_OPTIONS:M$o}
137
SNDFILE_DEPEND=	${LOCALBASE}/include/sndfile.h:audio/libsndfile
92
BROKEN=	OPTIONS marked as BROKEN have not been updated to the new Baresip API
138
.endif
93
.  endif
139
94
.endfor
140
.if ${PORT_OPTIONS:MSNDIO}
141
SNDIO_DEPEND=	${LOCALBASE}/include/sndio.h:audio/sndio
142
LIB_DEPENDS+=	libsndio.so:audio/sndio
143
.endif
144
145
.if ${PORT_OPTIONS:MV4L2}
146
V4L2_DEPEND=	${LOCALBASE}/include/libv4l2.h:multimedia/libv4l
147
.endif
148
149
.if ${PORT_OPTIONS:MVPX}
150
VPX_DEPEND=	${LOCALBASE}/include/vpx/vp8.h:multimedia/libvpx
151
.endif
95
152
96
.if ${PORT_OPTIONS:MX11}
153
.if ${PORT_OPTIONS:MX11}
97
USES+=		xorg
154
USES+=		xorg
98
USE_XORG=	x11
155
USE_XORG=	x11
156
USE_XORG+=	xext
99
.endif
157
.endif
100
158
101
.for o in ${PORT_OPTIONS}
159
.for o in ${PORT_OPTIONS}
(-)a/audio/baresip/Makefile.depends (-26 lines)
Removed Link Here
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
(-)b/audio/baresip/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1524574857
1
TIMESTAMP = 1667433945
2
SHA256 (baresip-0.5.8.tar.gz) = d9f11da50fd6c9359ab478618b5d3c132474a838fe9f668c249f9d5a07f26662
2
SHA256 (baresip-baresip-v2.9.0_GH0.tar.gz) = b4ca604f47f67b1390c9549768d54c2359ec3e56874db87b47ac6d8a022abcb3
3
SIZE (baresip-0.5.8.tar.gz) = 584406
3
SIZE (baresip-baresip-v2.9.0_GH0.tar.gz) = 1141507
(-)b/audio/baresip/files/patch-Makefile (+11 lines)
Added Link Here
1
--- Makefile.orig	2022-08-01 10:46:55 UTC
2
+++ Makefile
3
@@ -259,7 +259,7 @@ endif
4
 
5
 endif
6
 
7
-LIBS      += -lrem -lm
8
+LIBS      += -lrem -lm -lexecinfo -lstdthreads
9
 #LIBS      += -L$(SYSROOT)/lib
10
 
11
 ifeq ($(OS),win32)
(-)b/audio/baresip/files/patch-modules_alsa_alsa.c (+11 lines)
Added Link Here
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>
(-)b/audio/baresip/files/patch-modules_alsa_alsa__play.c (+11 lines)
Added Link Here
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>
(-)b/audio/baresip/files/patch-modules_alsa_alsa__src.c (+11 lines)
Added Link Here
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>
(-)b/audio/baresip/files/patch-modules_gst_gst.c (+11 lines)
Added Link Here
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>
(-)b/audio/baresip/files/patch-src_audio.c (+11 lines)
Added Link Here
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
(-)b/audio/re/Makefile (-5 / +21 lines)
Lines 1-26 Link Here
1
PORTNAME=	re
1
PORTNAME=	re
2
PORTVERSION=	0.5.8
2
DISTVERSIONPREFIX=	v
3
DISTVERSION=	2.9.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
WWW=		http://www.creytiv.com/re.html
8
WWW=		https://github.com/baresip
9
9
10
LICENSE=	BSD3CLAUSE
10
LICENSE=	BSD3CLAUSE
11
LICENSE_FILE=	${WRKSRC}/docs/COPYING
11
LICENSE_FILE=	${WRKSRC}/LICENSE
12
12
13
USES=		gmake ssl
13
USES=		gmake ssl
14
USE_GITHUB=	yes
15
GH_ACCOUNT=	baresip
14
USE_LDCONFIG=	yes
16
USE_LDCONFIG=	yes
15
MAKE_ARGS+=	SYSROOT_ALT=${OPENSSLBASE}
17
MAKE_ARGS+=	SYSROOT_ALT=${OPENSSLBASE}
16
18
17
PORTDATA=	re.mk
19
PORTDATA=	re.mk
20
# FIXME values of the next 3 variables taken from source code Makefile
21
ABI_MAJOR=	11
22
ABI_AGE=	9
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}
18
27
19
do-install:
28
do-install:
20
	${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME} ${STAGEDIR}${DATADIR}
29
	${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME} ${STAGEDIR}${DATADIR}
21
	(cd ${WRKSRC}/include && \
30
	(cd ${WRKSRC}/include && \
22
	    ${COPYTREE_SHARE} \*.h ${STAGEDIR}${PREFIX}/include/${PORTNAME})
31
	    ${COPYTREE_SHARE} \*.h ${STAGEDIR}${PREFIX}/include/${PORTNAME})
23
	${INSTALL_DATA} ${WRKSRC}/mk/${PORTNAME}.mk ${STAGEDIR}${DATADIR}
32
	${INSTALL_DATA} ${WRKSRC}/mk/${PORTNAME}.mk ${STAGEDIR}${DATADIR}
24
	${INSTALL_LIB} ${WRKSRC}/lib${PORTNAME}.[sa]* ${STAGEDIR}${PREFIX}/lib
33
	${INSTALL_DATA} ${WRKSRC}/lib${PORTNAME}.a ${STAGEDIR}${PREFIX}/lib
34
	${INSTALL_DATA} ${WRKSRC}/lib${PORTNAME}.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig
35
	${INSTALL_LIB} ${WRKSRC}/lib${PORTNAME}.so \
36
	       ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${ABI_MAJOR}.${ABI_AGE}.${ABI_REV}
37
	${RLN} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${ABI_MAJOR}.${ABI_AGE}.${ABI_REV} \
38
	       ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${ABI_MAJOR}
39
	${RLN} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${ABI_MAJOR}.${ABI_AGE}.${ABI_REV} \
40
	       ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so
25
41
26
.include <bsd.port.mk>
42
.include <bsd.port.mk>
(-)b/audio/re/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1524574824
1
TIMESTAMP = 1667433320
2
SHA256 (re-0.5.8.tar.gz) = 190fd652da167d8d6351b7a26fa0aef2ddab75fe5e8d5de77edf023988440e70
2
SHA256 (baresip-re-v2.9.0_GH0.tar.gz) = d820e1bf595b35e5e71f33d131d105aca2c53b05876abfe5e80303aa502583f0
3
SIZE (re-0.5.8.tar.gz) = 301351
3
SIZE (baresip-re-v2.9.0_GH0.tar.gz) = 396207
(-)b/audio/re/files/patch-Makefile (+12 lines)
Added Link Here
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
 
(-)b/audio/re/files/patch-mk_re.mk (-7 / +6 lines)
Lines 1-12 Link Here
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 ;\
(-)b/audio/re/files/patch-src_sip_auth.c (+12 lines)
Added Link Here
1
--- src/sip/auth.c.orig	2022-10-01 08:24:34 UTC
2
+++ src/sip/auth.c
3
@@ -3,6 +3,9 @@
4
  *
5
  * Copyright (C) 2010 Creytiv.com
6
  */
7
+#ifndef ETIME
8
+#define ETIME ETIMEDOUT
9
+#endif
10
 #include <time.h>
11
 #include <string.h>
12
 #include <re_types.h>
(-)b/audio/re/pkg-plist (-3 / +16 lines)
Lines 1-13 Link Here
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_async.h
4
include/re/re_atomic.h
5
include/re/re_av1.h
3
include/re/re_base64.h
6
include/re/re_base64.h
4
include/re/re_bfcp.h
7
include/re/re_bfcp.h
5
include/re/re_bitv.h
8
include/re/re_btrace.h
6
include/re/re_conf.h
9
include/re/re_conf.h
10
include/re/re_convert.h
7
include/re/re_crc32.h
11
include/re/re_crc32.h
8
include/re/re_dbg.h
12
include/re/re_dbg.h
9
include/re/re_dns.h
13
include/re/re_dns.h
10
include/re/re_fmt.h
14
include/re/re_fmt.h
15
include/re/re_h264.h
16
include/re/re_h265.h
11
include/re/re_hash.h
17
include/re/re_hash.h
12
include/re/re_hmac.h
18
include/re/re_hmac.h
13
include/re/re_http.h
19
include/re/re_http.h
Lines 16-22 include/re/re_ice.h Link Here
16
include/re/re_jbuf.h
22
include/re/re_jbuf.h
17
include/re/re_json.h
23
include/re/re_json.h
18
include/re/re_list.h
24
include/re/re_list.h
19
include/re/re_lock.h
20
include/re/re_main.h
25
include/re/re_main.h
21
include/re/re_mbuf.h
26
include/re/re_mbuf.h
22
include/re/re_md5.h
27
include/re/re_md5.h
Lines 24-36 include/re/re_mem.h Link Here
24
include/re/re_mod.h
29
include/re/re_mod.h
25
include/re/re_mqueue.h
30
include/re/re_mqueue.h
26
include/re/re_msg.h
31
include/re/re_msg.h
27
include/re/re_natbd.h
28
include/re/re_net.h
32
include/re/re_net.h
29
include/re/re_odict.h
33
include/re/re_odict.h
34
include/re/re_pcp.h
35
include/re/re_rtmp.h
30
include/re/re_rtp.h
36
include/re/re_rtp.h
31
include/re/re_sa.h
37
include/re/re_sa.h
32
include/re/re_sdp.h
38
include/re/re_sdp.h
33
include/re/re_sha.h
39
include/re/re_sha.h
40
include/re/re_shim.h
34
include/re/re_sip.h
41
include/re/re_sip.h
35
include/re/re_sipevent.h
42
include/re/re_sipevent.h
36
include/re/re_sipreg.h
43
include/re/re_sipreg.h
Lines 40-47 include/re/re_stun.h Link Here
40
include/re/re_sys.h
47
include/re/re_sys.h
41
include/re/re_tcp.h
48
include/re/re_tcp.h
42
include/re/re_telev.h
49
include/re/re_telev.h
50
include/re/re_thread.h
43
include/re/re_tls.h
51
include/re/re_tls.h
44
include/re/re_tmr.h
52
include/re/re_tmr.h
53
include/re/re_trace.h
54
include/re/re_trice.h
45
include/re/re_turn.h
55
include/re/re_turn.h
46
include/re/re_types.h
56
include/re/re_types.h
47
include/re/re_udp.h
57
include/re/re_udp.h
Lines 49-51 include/re/re_uri.h Link Here
49
include/re/re_websock.h
59
include/re/re_websock.h
50
lib/libre.a
60
lib/libre.a
51
lib/libre.so
61
lib/libre.so
62
lib/libre.so.%%ABI_MAJOR%%
63
lib/libre.so.%%ABI_MAJOR%%.%%ABI_AGE%%.%%ABI_REV%%
64
libdata/pkgconfig/libre.pc
(-)b/audio/rem/Makefile (-5 / +21 lines)
Lines 1-26 Link Here
1
PORTNAME=	rem
1
PORTNAME=	rem
2
PORTVERSION=	0.5.3
2
DISTVERSIONPREFIX=	v
3
DISTVERSION=	2.9.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
8
WWW=		http://www.creytiv.com/rem.html
8
WWW=		https://github.com/baresip
9
9
10
LICENSE=	BSD3CLAUSE
10
LICENSE=	BSD3CLAUSE
11
LICENSE_FILE=	${WRKSRC}/docs/COPYING
11
LICENSE_FILE=	${WRKSRC}/LICENSE
12
12
13
BUILD_DEPENDS=	${LOCALBASE}/share/re/re.mk:audio/re
13
BUILD_DEPENDS=	${LOCALBASE}/share/re/re.mk:audio/re
14
RUN_DEPENDS:=	${BUILD_DEPENDS}
14
RUN_DEPENDS:=	${BUILD_DEPENDS}
15
15
16
USES=		gmake ssl
16
USES=		gmake ssl
17
USE_GITHUB=	yes
18
GH_ACCOUNT=	baresip
17
USE_LDCONFIG=	yes
19
USE_LDCONFIG=	yes
18
20
21
# FIXME values of the next 3 variables taken from source code Makefile
22
ABI_MAJOR=	3
23
ABI_AGE=	9
24
ABI_REV=	0
25
PLIST_SUB=	ABI_MAJOR=${ABI_MAJOR}
26
PLIST_SUB+=	ABI_AGE=${ABI_AGE}
27
PLIST_SUB+=	ABI_REV=${ABI_REV}
28
19
do-install:
29
do-install:
20
	${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
30
	${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
21
	(cd ${WRKSRC}/include && \
31
	(cd ${WRKSRC}/include && \
22
	    ${COPYTREE_SHARE} \*.h ${STAGEDIR}${PREFIX}/include/${PORTNAME})
32
	    ${COPYTREE_SHARE} \*.h ${STAGEDIR}${PREFIX}/include/${PORTNAME})
23
	${INSTALL_LIB} ${WRKSRC}/lib${PORTNAME}.so ${STAGEDIR}${PREFIX}/lib
24
	${INSTALL_DATA} ${WRKSRC}/lib${PORTNAME}.a ${STAGEDIR}${PREFIX}/lib
33
	${INSTALL_DATA} ${WRKSRC}/lib${PORTNAME}.a ${STAGEDIR}${PREFIX}/lib
34
	${INSTALL_DATA} ${WRKSRC}/lib${PORTNAME}.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig
35
	${INSTALL_LIB} ${WRKSRC}/lib${PORTNAME}.so \
36
	       ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${ABI_MAJOR}.${ABI_AGE}.${ABI_REV}
37
	${RLN} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${ABI_MAJOR}.${ABI_AGE}.${ABI_REV} \
38
	       ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${ABI_MAJOR}
39
	${RLN} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${ABI_MAJOR}.${ABI_AGE}.${ABI_REV} \
40
	       ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so
25
41
26
.include <bsd.port.mk>
42
.include <bsd.port.mk>
(-)b/audio/rem/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1524574809
1
TIMESTAMP = 1667433591
2
SHA256 (rem-0.5.3.tar.gz) = 9f98a79947d4709282a5791ac30f0eda03d5d34086f36df74bff4f8aac0e8050
2
SHA256 (baresip-rem-v2.9.0_GH0.tar.gz) = ec87deef927c27b2199e652993bdd8d62d6176efc0231ddbe5227f212e27a881
3
SIZE (rem-0.5.3.tar.gz) = 40417
3
SIZE (baresip-rem-v2.9.0_GH0.tar.gz) = 56034
(-)b/audio/rem/files/patch-Makefile (+12 lines)
Added Link Here
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
 
(-)b/audio/rem/pkg-plist (-1 / +8 lines)
Lines 1-15 Link Here
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
15
include/rem/rem_vid.h
20
include/rem/rem_vid.h
Lines 18-20 include/rem/rem_video.h Link Here
18
include/rem/rem_vidmix.h
23
include/rem/rem_vidmix.h
19
lib/librem.a
24
lib/librem.a
20
lib/librem.so
25
lib/librem.so
21
- 
26
lib/librem.so.%%ABI_MAJOR%%
27
lib/librem.so.%%ABI_MAJOR%%.%%ABI_AGE%%.%%ABI_REV%%
28
libdata/pkgconfig/librem.pc

Return to bug 261035