Attachment 235190 Details for Bug 261035 – audio/re audio/rem audio/baresip upgraded to 2.3.0

[patch] audio/re audio/rem audio/baresip upgraded to 2.3.0

0001-audio-re-audio-rem-audio-baresip-upgraded-to-2.3.0.patch (text/plain), 19.82 KB, created by Denis Polygalov on 2022-07-11 13:05:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Denis Polygalov

Created: 2022-07-11 13:05:37 UTC

Size: 19.82 KB

patch

obsolete

>From 1c6afa3fd0c6dc15484138eed31b6ea0187fc6ec Mon Sep 17 00:00:00 2001
>From: Denis Polygalov <dpolyg@gmail.com>
>Date: Mon, 11 Jul 2022 21:41:53 +0900
>Subject: [PATCH] audio/re audio/rem audio/baresip upgraded to 2.3.0
>
>---
> audio/baresip/Makefile                        | 148 ++++++++++++------
> audio/baresip/Makefile.depends                |  26 ---
> audio/baresip/distinfo                        |   6 +-
> audio/baresip/files/patch-modules_alsa_alsa.c |  11 ++
> .../files/patch-modules_alsa_alsa__play.c     |  11 ++
> .../files/patch-modules_alsa_alsa__src.c      |  11 ++
> audio/baresip/files/patch-modules_gst_gst.c   |  11 ++
> audio/baresip/files/patch-src_audio.c         |  11 ++
> audio/re/Makefile                             |  24 ++-
> audio/re/distinfo                             |   6 +-
> audio/re/files/patch-Makefile                 |  12 ++
> audio/re/files/patch-mk_re.mk                 |  13 +-
> audio/re/pkg-plist                            |  12 +-
> audio/rem/Makefile                            |  22 ++-
> audio/rem/distinfo                            |   6 +-
> audio/rem/files/patch-Makefile                |  12 ++
> audio/rem/pkg-plist                           |  10 ++
> 17 files changed, 253 insertions(+), 99 deletions(-)
> delete mode 100644 audio/baresip/Makefile.depends
> create mode 100644 audio/baresip/files/patch-modules_alsa_alsa.c
> create mode 100644 audio/baresip/files/patch-modules_alsa_alsa__play.c
> create mode 100644 audio/baresip/files/patch-modules_alsa_alsa__src.c
> create mode 100644 audio/baresip/files/patch-modules_gst_gst.c
> create mode 100644 audio/baresip/files/patch-src_audio.c
> create mode 100644 audio/re/files/patch-Makefile
> create mode 100644 audio/rem/files/patch-Makefile
>
>diff --git a/audio/baresip/Makefile b/audio/baresip/Makefile
>index 5b217a00e579..f937a17ec731 100644
>--- a/audio/baresip/Makefile
>+++ b/audio/baresip/Makefile
>@@ -1,8 +1,7 @@
> PORTNAME=	baresip
>-PORTVERSION=	0.5.8
>-PORTREVISION=	9
>+DISTVERSIONPREFIX=	v
>+DISTVERSION=	2.3.0
> CATEGORIES=	audio
>-MASTER_SITES=	http://www.creytiv.com/pub/
> 
> MAINTAINER=	crees@FreeBSD.org
> COMMENT=	Small SIP client
>@@ -10,11 +9,13 @@ COMMENT=	Small SIP client
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/docs/COPYING
> 
>-BUILD_DEPENDS=	re>=0.5.8:audio/re \
>-		rem>=0.5.3:audio/rem
>+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
>@@ -22,79 +23,128 @@ PORTDATA=	*
> PORTDOCS=	*
> PORTEXAMPLES=	*
> 
>-#OPTIONS_NOT_YET_WORKING=	ALSA BV32 G722_1 PLC ISAC OPENGLES
>-OPTIONS_DEFINE=	CONS DOCS EXAMPLES FFMPEG G711 G722 G726 GSM GSTREAMER ILBC \
>-	L16 OPUS OSS PORTAUDIO PULSEAUDIO SDL SNDFILE SPEEX STDIO UUID V4L V4L2 X11 \
>-	DTLS_SRTP AUBRIDGE VIDBRIDGE HTTPD DSHOW DIRECTFB ACCOUNT \
>-	NATPMP SDL MIW SNAPSHOT SELFVIEW VUMETER AULOOP CONTACT \
>-	MENU PRESENCE SYSLOG VIDLOOP
>-OPTIONS_DEFAULT=CONS G711 G722 G726 L16 OSS STDIO
>-
>-AULOOP_DESC=	Audio-loop test module
>-BV32_DESC=	BroadVoice32 Wideband Audio codec
>-CONTACT_DESC=	Contacts module
>-CONS_DESC=	Console input driver
>-DTLS_SRTP_DESC=	DTLS Secure RTP module [broken]
>+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
>-ILBC_DESC=	iLBC audio codec
>-L16_DESC=	L16 audio codec
>-MENU_DESC=	Interactive menu
>-OPENGLES_DESC=	OpenGL ES video output
>+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
>-PRESENCE_DESC=	Presence module
>-STDIO_DESC=	stdio input driver
>+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
>-UUID_DESC=	UUID module
>-V4L_DESC=	Video4Linux module [broken]
>-V4L2_DESC=	Video4Linux2 module [broken]
>-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
>+V4L2_DESC=	Video4Linux2 module
>+VPX_DESC=	VP8/VP9 video codecs
>+X11_DESC=	X11 video output
> 
> .include <bsd.port.options.mk>
> 
>-.include "${.CURDIR}/Makefile.depends"
>+.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=	sdl sound
>+USE_SDL=	sdl2
> .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
>-MAKE_ARGS+=	HAVE_SPEEXDSP=yes
>+.if ${PORT_OPTIONS:MSNAPSHOT}
>+LIB_DEPENDS+=	libpng16.so:graphics/png
> .endif
> 
>-.for o in V4L DTLS_SRTP V4L2 X11
>-.  if ${PORT_OPTIONS:M$o}
>-BROKEN=	OPTIONS marked as BROKEN have not been updated to the new Baresip API
>-.  endif
>-.endfor
>+.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}
>diff --git a/audio/baresip/Makefile.depends b/audio/baresip/Makefile.depends
>deleted file mode 100644
>index 55efe72ad5d7..000000000000
>--- a/audio/baresip/Makefile.depends
>+++ /dev/null
>@@ -1,26 +0,0 @@
>-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
>diff --git a/audio/baresip/distinfo b/audio/baresip/distinfo
>index 7352ccad00ab..6e114b737b21 100644
>--- a/audio/baresip/distinfo
>+++ b/audio/baresip/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1524574857
>-SHA256 (baresip-0.5.8.tar.gz) = d9f11da50fd6c9359ab478618b5d3c132474a838fe9f668c249f9d5a07f26662
>-SIZE (baresip-0.5.8.tar.gz) = 584406
>+TIMESTAMP = 1657283119
>+SHA256 (baresip-baresip-v2.3.0_GH0.tar.gz) = eeb3189733cd4a727204268c216ca4656a0ac24b761169692d241ea887059a95
>+SIZE (baresip-baresip-v2.3.0_GH0.tar.gz) = 1114250
>diff --git a/audio/baresip/files/patch-modules_alsa_alsa.c b/audio/baresip/files/patch-modules_alsa_alsa.c
>new file mode 100644
>index 000000000000..9eb3682f568a
>--- /dev/null
>+++ b/audio/baresip/files/patch-modules_alsa_alsa.c
>@@ -0,0 +1,11 @@
>+--- modules/alsa/alsa.c.orig	2022-05-01 07:27:33 UTC
>++++ modules/alsa/alsa.c
>+@@ -4,7 +4,7 @@
>+  * Copyright (C) 2010 Alfred E. Heggestad
>+  */
>+ #define _DEFAULT_SOURCE 1
>+-#define _POSIX_SOURCE 1
>++#define _POSIX_C_SOURCE 200112L
>+ #include <sys/types.h>
>+ #include <sys/time.h>
>+ #include <stdlib.h>
>diff --git a/audio/baresip/files/patch-modules_alsa_alsa__play.c b/audio/baresip/files/patch-modules_alsa_alsa__play.c
>new file mode 100644
>index 000000000000..3a606138c8f0
>--- /dev/null
>+++ b/audio/baresip/files/patch-modules_alsa_alsa__play.c
>@@ -0,0 +1,11 @@
>+--- modules/alsa/alsa_play.c.orig	2022-05-01 07:27:33 UTC
>++++ modules/alsa/alsa_play.c
>+@@ -4,7 +4,7 @@
>+  * Copyright (C) 2010 Alfred E. Heggestad
>+  */
>+ #define _DEFAULT_SOURCE 1
>+-#define _POSIX_SOURCE 1
>++#define _POSIX_C_SOURCE 200112L
>+ #include <sys/types.h>
>+ #include <sys/time.h>
>+ #include <stdlib.h>
>diff --git a/audio/baresip/files/patch-modules_alsa_alsa__src.c b/audio/baresip/files/patch-modules_alsa_alsa__src.c
>new file mode 100644
>index 000000000000..c8b28a8859c0
>--- /dev/null
>+++ b/audio/baresip/files/patch-modules_alsa_alsa__src.c
>@@ -0,0 +1,11 @@
>+--- modules/alsa/alsa_src.c.orig	2022-05-01 07:27:33 UTC
>++++ modules/alsa/alsa_src.c
>+@@ -4,7 +4,7 @@
>+  * Copyright (C) 2010 Alfred E. Heggestad
>+  */
>+ #define _DEFAULT_SOURCE 1
>+-#define _POSIX_SOURCE 1
>++#define _POSIX_C_SOURCE 200112L
>+ #include <sys/types.h>
>+ #include <sys/time.h>
>+ #include <stdlib.h>
>diff --git a/audio/baresip/files/patch-modules_gst_gst.c b/audio/baresip/files/patch-modules_gst_gst.c
>new file mode 100644
>index 000000000000..2234a57a8148
>--- /dev/null
>+++ b/audio/baresip/files/patch-modules_gst_gst.c
>@@ -0,0 +1,11 @@
>+--- modules/gst/gst.c.orig	2021-04-21 09:34:08 UTC
>++++ modules/gst/gst.c
>+@@ -4,7 +4,7 @@
>+  * Copyright (C) 2010 - 2015 Alfred E. Heggestad
>+  */
>+ #define _DEFAULT_SOURCE 1
>+-#define _POSIX_C_SOURCE 199309L
>++#define _POSIX_C_SOURCE 200112L
>+ #include <stdlib.h>
>+ #include <string.h>
>+ #include <time.h>
>diff --git a/audio/baresip/files/patch-src_audio.c b/audio/baresip/files/patch-src_audio.c
>new file mode 100644
>index 000000000000..5570c157d213
>--- /dev/null
>+++ b/audio/baresip/files/patch-src_audio.c
>@@ -0,0 +1,11 @@
>+--- src/audio.c.orig	2022-07-01 08:52:02 UTC
>++++ src/audio.c
>+@@ -6,7 +6,7 @@
>+  */
>+ #define _DEFAULT_SOURCE 1
>+ #define _BSD_SOURCE 1
>+-#define _POSIX_C_SOURCE 199309L
>++#define _POSIX_C_SOURCE 200112L
>+ #include <string.h>
>+ #include <stdlib.h>
>+ #ifdef HAVE_UNISTD_H
>diff --git a/audio/re/Makefile b/audio/re/Makefile
>index 1218a8deea69..0c0ef28ae772 100644
>--- a/audio/re/Makefile
>+++ b/audio/re/Makefile
>@@ -1,25 +1,41 @@
> PORTNAME=	re
>-PORTVERSION=	0.5.8
>+DISTVERSIONPREFIX=	v
>+DISTVERSION=	2.3.0
> CATEGORIES=	audio devel
>-MASTER_SITES=	http://www.creytiv.com/pub/
> 
> MAINTAINER=	crees@FreeBSD.org
> COMMENT=	Library for real-time comms with async IO support
> 
> LICENSE=	BSD3CLAUSE
>-LICENSE_FILE=	${WRKSRC}/docs/COPYING
>+LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> USES=		gmake ssl
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	baresip
> USE_LDCONFIG=	yes
> MAKE_ARGS+=	SYSROOT_ALT=${OPENSSLBASE}
> 
> PORTDATA=	re.mk
>+# FIXME values of the next 3 variables taken from source code Makefile
>+ABI_MAJOR=	5
>+ABI_AGE=	3
>+ABI_REV=	0
>+PLIST_SUB=	ABI_MAJOR=${ABI_MAJOR}
>+PLIST_SUB+=	ABI_AGE=${ABI_AGE}
>+PLIST_SUB+=	ABI_REV=${ABI_REV}
> 
> do-install:
> 	${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME} ${STAGEDIR}${DATADIR}
> 	(cd ${WRKSRC}/include && \
> 	    ${COPYTREE_SHARE} \*.h ${STAGEDIR}${PREFIX}/include/${PORTNAME})
> 	${INSTALL_DATA} ${WRKSRC}/mk/${PORTNAME}.mk ${STAGEDIR}${DATADIR}
>-	${INSTALL_LIB} ${WRKSRC}/lib${PORTNAME}.[sa]* ${STAGEDIR}${PREFIX}/lib
>+	${INSTALL_DATA} ${WRKSRC}/lib${PORTNAME}.a ${STAGEDIR}${PREFIX}/lib
>+	${INSTALL_DATA} ${WRKSRC}/lib${PORTNAME}.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig
>+	${INSTALL_LIB} ${WRKSRC}/lib${PORTNAME}.so \
>+	       ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${ABI_MAJOR}.${ABI_AGE}.${ABI_REV}
>+	${RLN} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${ABI_MAJOR}.${ABI_AGE}.${ABI_REV} \
>+	       ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${ABI_MAJOR}
>+	${RLN} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${ABI_MAJOR}.${ABI_AGE}.${ABI_REV} \
>+	       ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so
> 
> .include <bsd.port.mk>
>diff --git a/audio/re/distinfo b/audio/re/distinfo
>index af6bda923778..bb7b8f3481b1 100644
>--- a/audio/re/distinfo
>+++ b/audio/re/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1524574824
>-SHA256 (re-0.5.8.tar.gz) = 190fd652da167d8d6351b7a26fa0aef2ddab75fe5e8d5de77edf023988440e70
>-SIZE (re-0.5.8.tar.gz) = 301351
>+TIMESTAMP = 1657114025
>+SHA256 (baresip-re-v2.3.0_GH0.tar.gz) = 5ffcb354d09e416fe6ce12d7245d567c21b396894240c2e137a2a009a6472f83
>+SIZE (baresip-re-v2.3.0_GH0.tar.gz) = 362945
>diff --git a/audio/re/files/patch-Makefile b/audio/re/files/patch-Makefile
>new file mode 100644
>index 000000000000..dfcf0adc60c2
>--- /dev/null
>+++ b/audio/re/files/patch-Makefile
>@@ -0,0 +1,12 @@
>+--- 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
>+ 
>diff --git a/audio/re/files/patch-mk_re.mk b/audio/re/files/patch-mk_re.mk
>index 1e77f47ec8f5..8f2d0cdc7b98 100644
>--- a/audio/re/files/patch-mk_re.mk
>+++ b/audio/re/files/patch-mk_re.mk
>@@ -1,12 +1,11 @@
>---- mk/re.mk.orig	2016-04-15 07:09:59 UTC
>+--- mk/re.mk.orig	2022-05-01 07:02:43 UTC
> +++ mk/re.mk
>-@@ -75,9 +75,6 @@ endif
>- ifeq ($(CC),)
>+@@ -95,7 +95,7 @@ ifeq ($(CC),)
>  	CC := gcc
>  endif
>--ifeq ($(CC),cc)
>+ ifeq ($(CC),cc)
> -	CC := gcc
>--endif
>++	CC := clang
>+ endif
>  LD := $(CC)
>- CC_LONGVER := $(shell if $(CC) -v 2>/dev/null; then \
>- 						$(CC) -v 2>&1 ;\
>+ 
>diff --git a/audio/re/pkg-plist b/audio/re/pkg-plist
>index 4769ba8a6d13..c8594f83b642 100644
>--- a/audio/re/pkg-plist
>+++ b/audio/re/pkg-plist
>@@ -1,9 +1,12 @@
> 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
>@@ -24,13 +27,15 @@ include/re/re_mem.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
>@@ -42,6 +47,8 @@ include/re/re_tcp.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
>@@ -49,3 +56,6 @@ include/re/re_uri.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
>diff --git a/audio/rem/Makefile b/audio/rem/Makefile
>index bfd9f4a357f7..4b0a8309ba09 100644
>--- a/audio/rem/Makefile
>+++ b/audio/rem/Makefile
>@@ -1,7 +1,7 @@
> PORTNAME=	rem
>-PORTVERSION=	0.5.3
>+DISTVERSIONPREFIX=	v
>+DISTVERSION=	2.3.0
> CATEGORIES=	audio devel
>-MASTER_SITES=	http://www.creytiv.com/pub/
> 
> MAINTAINER=	crees@FreeBSD.org
> COMMENT=	Library for real-time audio and video processing
>@@ -13,13 +13,29 @@ BUILD_DEPENDS=	${LOCALBASE}/share/re/re.mk:audio/re
> RUN_DEPENDS:=	${BUILD_DEPENDS}
> 
> USES=		gmake ssl
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	baresip
> USE_LDCONFIG=	yes
> 
>+# FIXME values of the next 3 variables taken from source code Makefile
>+ABI_MAJOR=	2
>+ABI_AGE=	0
>+ABI_REV=	0
>+PLIST_SUB=	ABI_MAJOR=${ABI_MAJOR}
>+PLIST_SUB+=	ABI_AGE=${ABI_AGE}
>+PLIST_SUB+=	ABI_REV=${ABI_REV}
>+
> do-install:
> 	${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
> 	(cd ${WRKSRC}/include && \
> 	    ${COPYTREE_SHARE} \*.h ${STAGEDIR}${PREFIX}/include/${PORTNAME})
>-	${INSTALL_LIB} ${WRKSRC}/lib${PORTNAME}.so ${STAGEDIR}${PREFIX}/lib
> 	${INSTALL_DATA} ${WRKSRC}/lib${PORTNAME}.a ${STAGEDIR}${PREFIX}/lib
>+	${INSTALL_DATA} ${WRKSRC}/lib${PORTNAME}.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig
>+	${INSTALL_LIB} ${WRKSRC}/lib${PORTNAME}.so \
>+	       ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${ABI_MAJOR}.${ABI_AGE}.${ABI_REV}
>+	${RLN} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${ABI_MAJOR}.${ABI_AGE}.${ABI_REV} \
>+	       ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${ABI_MAJOR}
>+	${RLN} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${ABI_MAJOR}.${ABI_AGE}.${ABI_REV} \
>+	       ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so
> 
> .include <bsd.port.mk>
>diff --git a/audio/rem/distinfo b/audio/rem/distinfo
>index 4d8166d4e5fd..df8b5890631e 100644
>--- a/audio/rem/distinfo
>+++ b/audio/rem/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1524574809
>-SHA256 (rem-0.5.3.tar.gz) = 9f98a79947d4709282a5791ac30f0eda03d5d34086f36df74bff4f8aac0e8050
>-SIZE (rem-0.5.3.tar.gz) = 40417
>+TIMESTAMP = 1657114345
>+SHA256 (baresip-rem-v2.3.0_GH0.tar.gz) = a80a1dc2b30233cd4012de8b58ac9c7e87e17676e6026629d8b66d8a01600a83
>+SIZE (baresip-rem-v2.3.0_GH0.tar.gz) = 59590
>diff --git a/audio/rem/files/patch-Makefile b/audio/rem/files/patch-Makefile
>new file mode 100644
>index 000000000000..8dac2f24363e
>--- /dev/null
>+++ b/audio/rem/files/patch-Makefile
>@@ -0,0 +1,12 @@
>+--- 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
>+ 
>diff --git a/audio/rem/pkg-plist b/audio/rem/pkg-plist
>index 4c93e0151351..4c98e5daf3e6 100644
>--- a/audio/rem/pkg-plist
>+++ b/audio/rem/pkg-plist
>@@ -1,20 +1,30 @@
> include/rem/rem.h
>+include/rem/rem_aac.h
> include/rem/rem_au.h
> include/rem/rem_aubuf.h
> include/rem/rem_auconv.h
> include/rem/rem_audio.h
> include/rem/rem_aufile.h
>+include/rem/rem_auframe.h
>+include/rem/rem_aulevel.h
> include/rem/rem_aumix.h
> include/rem/rem_auresamp.h
> include/rem/rem_autone.h
>+include/rem/rem_avc.h
> include/rem/rem_dsp.h
> include/rem/rem_dtmf.h
> include/rem/rem_fir.h
>+include/rem/rem_flv.h
> include/rem/rem_g711.h
> include/rem/rem_goertzel.h
>+include/rem/rem_h264.h
>+include/rem/rem_h265.h
> include/rem/rem_vid.h
> include/rem/rem_vidconv.h
> include/rem/rem_video.h
> include/rem/rem_vidmix.h
> lib/librem.a
> lib/librem.so
>+lib/librem.so.%%ABI_MAJOR%%
>+lib/librem.so.%%ABI_MAJOR%%.%%ABI_AGE%%.%%ABI_REV%%
>+libdata/pkgconfig/librem.pc
>-- 
>2.37.0
>

Actions: View | Diff

Attachments on bug 261035: 230820 | 230859 | 235169 | 235170 | 235171 | 235190 | 237173 | 237832 | 241082