git: 020d92f56308 - 2025Q4 - audio/baresip: Update 4.1.0 => 4.2.0, flavorize, take maintainership

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Fri, 17 Oct 2025 20:34:40 UTC
The branch 2025Q4 has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=020d92f5630839cac843313c124a410474b86fdd

commit 020d92f5630839cac843313c124a410474b86fdd
Author:     Marek Zarychta <zarychtam@plan-b.pwste.edu.pl>
AuthorDate: 2025-10-17 20:25:29 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-10-17 20:34:34 +0000

    audio/baresip: Update 4.1.0 => 4.2.0, flavorize, take maintainership
    
    Changelog:
    https://github.com/baresip/baresip/releases/tag/v4.2.0
    
    Improve port:
    - Add JACK audio backend option.
    - Fix Gstreamer audio backend.
    - Introduce flavors:
      * nox11 - minimal console-only build for voice calls;
      * default - full build with X11 and video support.
    - Replace BUILD_DEPENDS+RUN_DEPENDS from audio/re to LIB_DEPENDS.
    - Sort PORTDOCS.
    - Small formatting improvements.
    
    PR:             290307
    Approved by:    Herbert J. Skuhra <herbert@gojira.at> (former maintainer)
    Co-authored-by: Vladimir Druzenko <vvd@FreeBSD.org>
    MFH:            2025Q4
    
    (cherry picked from commit c76e8bd1807e910961ae276f6f5d0227f12cdb7b)
---
 audio/baresip/Makefile                        | 49 +++++++++++++++++++--------
 audio/baresip/distinfo                        |  6 ++--
 audio/baresip/files/patch-cmake_FindGST.cmake | 44 ++++++++++++++++++++++++
 audio/baresip/pkg-plist                       |  4 ++-
 4 files changed, 85 insertions(+), 18 deletions(-)

diff --git a/audio/baresip/Makefile b/audio/baresip/Makefile
index de1658fd029c..ef9b896de476 100644
--- a/audio/baresip/Makefile
+++ b/audio/baresip/Makefile
@@ -1,27 +1,39 @@
 PORTNAME=	baresip
 DISTVERSIONPREFIX=	v
-DISTVERSION=	4.1.0
+DISTVERSION=	4.2.0
 CATEGORIES=	audio
 
-MAINTAINER=	herbert@gojira.at
+MAINTAINER=	zarychtam@plan-b.pwste.edu.pl
 COMMENT=	Small SIP client
 WWW=		https://github.com/baresip
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	re>=${DISTVERSION:R}:audio/re
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+LIB_DEPENDS=	libre.so:audio/re
+
+FLAVORS=			default nox11
+default_CONFLICTS_INSTALL=	barsip-nox11
+nox11_PKGNAMESUFFIX=		-nox11
+nox11_CONFLICTS_INSTALL=	baresip
 
 USES=		cmake pkgconfig ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	baresip
-PORTDOCS=	ChangeLog CONTRIBUTING.md THANKS
+PORTDOCS=	CONTRIBUTING.md ChangeLog THANKS
 
 OPTIONS_DEFINE=		ALSA AV1 AVCODEC AVFILTER AVFORMAT CTRL_DBUS DOCS \
-			EXAMPLES G711 G722 G726 GST GTK3 MQTT OPUS OPUS_MS PLC \
-			PORTAUDIO PULSEAUDIO SDL SNAPSHOT SNDFILE SWSCALE V4L2 \
-			VPX X11
+			EXAMPLES G711 G722 G726 GST GTK3 JACK MQTT OPUS OPUS_MS \
+			PLC PORTAUDIO PULSEAUDIO SDL SNAPSHOT SNDFILE SWSCALE \
+			V4L2 VPX X11
+OPTIONS_DEFAULT=	ALSA AV1 AVCODEC AVFILTER AVFORMAT CTRL_DBUS G711 G722 \
+			G726 GST GTK3 OPUS PLC PORTAUDIO SDL SNAPSHOT SNDFILE \
+			SWSCALE V4L2 VPX X11
+.if ${FLAVOR:U} == nox11
+COMMENT+=		(without X11 and video calls)
+OPTIONS_EXCLUDE=	AV1 AVCODEC AVFILTER AVFORMAT CTRL_DBUS GST GTK3 SDL \
+			SNAPSHOT SWSCALE V4L2 VPX X11
+.endif
 OPTIONS_SUB=		yes
 
 ALSA_DESC=	ALSA audio driver
@@ -34,6 +46,7 @@ G711_DESC=	G.711 audio codec
 G722_DESC=	G.722 audio codec
 G726_DESC=	G.726 audio codec
 GST_DESC=	Gstreamer audio module
+JACK_DESC=	JACK audio module
 MQTT_DESC=	Message Queue Telemetry Transport (MQTT) client
 OPUS_MS_DESC=	Opus Multistream audio codec
 PLC_DESC=	Packet Loss Concealment
@@ -46,10 +59,10 @@ VPX_DESC=	VP8/VP9 video codecs
 X11_DESC=	X11 video output
 
 _MODULES_LIST=	account aubridge auconv aufile auresamp ausine cons contact \
-		ctrl_tcp debug_cmd dtls_srtp echo fakevideo httpd \
-		httpreq ice l16 menu mixausrc mixminus mwi natpmp netroam pcp \
-		presence rtcpsummary selfview serreg srtp stdio stun syslog \
-		turn uuid vidbridge vidinfo vumeter
+		ctrl_tcp debug_cmd dtls_srtp echo fakevideo httpd httpreq ice \
+		l16 menu mixausrc mixminus mwi natpmp netroam pcp presence \
+		rtcpsummary selfview serreg srtp stdio stun syslog turn uuid \
+		vidbridge vidinfo vumeter
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_VARS=		_MODULES_LIST+=alsa
@@ -69,9 +82,13 @@ G722_VARS=		_MODULES_LIST+=g722
 G726_LIB_DEPENDS=	libspandsp.so:comms/spandsp
 G726_VARS=		_MODULES_LIST+=g726
 GST_USES=		gnome gstreamer:1
-GST_VARS=		USE_GNOME+=glib20
+GST_VARS=		_MODULES_LIST+=gst \
+			USE_GNOME+=glib20
 GTK3_USES=		gnome
-GTK3_VARS=		USE_GNOME+=gtk30 _MODULES_LIST+=gtk
+GTK3_VARS=		_MODULES_LIST+=gtk \
+			USE_GNOME+=gtk30
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
+JACK_VARS=		_MODULES_LIST+=jack
 MQTT_LIB_DEPENDS=	libmosquitto.so:net/mosquitto
 MQTT_VARS=		_MODULES_LIST+=mqtt
 OPUS_LIB_DEPENDS=	libopus.so:audio/opus
@@ -109,6 +126,10 @@ CMAKE_ARGS+=	-DMODULES="$(_MODULES_LIST:ts;)" \
 		-DRE_INCLUDE_DIR:STRING="${LOCALBASE}/include/re" \
 		-DREM_INCLUDE_DIR:STRING="${LOCALBASE}/include/rem"
 
+post-patch:
+	${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' \
+		${WRKSRC}/cmake/FindGST.cmake
+
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:C|^|${WRKSRC}/docs/|} ${STAGEDIR}${DOCSDIR}
diff --git a/audio/baresip/distinfo b/audio/baresip/distinfo
index ceb973463746..9fe1957758f4 100644
--- a/audio/baresip/distinfo
+++ b/audio/baresip/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1757536377
-SHA256 (baresip-baresip-v4.1.0_GH0.tar.gz) = ef8663b95caf187edd5062136230be02bd6815090da410b2fe6b7e1341312133
-SIZE (baresip-baresip-v4.1.0_GH0.tar.gz) = 1185261
+TIMESTAMP = 1760646436
+SHA256 (baresip-baresip-v4.2.0_GH0.tar.gz) = 4b9fba7c53cabec4cc702bf47fb421f078d6f31421b7bea8f3f0fdbe1a671674
+SIZE (baresip-baresip-v4.2.0_GH0.tar.gz) = 1181348
diff --git a/audio/baresip/files/patch-cmake_FindGST.cmake b/audio/baresip/files/patch-cmake_FindGST.cmake
new file mode 100644
index 000000000000..51e347e884de
--- /dev/null
+++ b/audio/baresip/files/patch-cmake_FindGST.cmake
@@ -0,0 +1,44 @@
+--- cmake/FindGST.cmake.orig	2025-10-17 17:11:22 UTC
++++ cmake/FindGST.cmake
+@@ -2,14 +2,14 @@ find_path(GST_INCLUDE_DIR
+   NAMES gst/gst.h
+   HINTS
+     "${GST_INCLUDE_DIRS}"
+-  PATHS /usr/include/gstreamer-1.0
++  PATHS %%LOCALBASE%%/include/gstreamer-1.0
+ )
+ 
+ find_path(GL_INCLUDE_DIR
+   NAMES glib.h
+   HINTS
+     "${GL_INCLUDE_DIRS}"
+-  PATHS /usr/include/glib-2.0
++  PATHS %%LOCALBASE%%/include/glib-2.0
+ )
+ 
+ find_path(GLIB_INCLUDE_DIR
+@@ -19,21 +19,21 @@ find_path(GLIB_INCLUDE_DIR
+   PATHS /usr/lib/x86_64-linux-gnu/glib-2.0
+         /usr/lib/x86_64-linux-gnu/glib-2.0/include
+         /usr/lib64/glib-2.0
+-        /usr/lib/glib-2.0
++        %%LOCALBASE%%/lib/glib-2.0/include
+ )
+ 
+ find_library(GST_LIBRARY
+   NAMES gstreamer-1.0
+   HINTS
+     "${GST_LIBRARY_DIRS}"
+-  PATHS /usr/lib/x86_64-linux-gnu
++  PATHS %%LOCALBASE%%/lib
+ )
+ 
+ find_library(GL_LIBRARY
+   NAMES glib-2.0
+   HINTS
+     "${GL_LIBRARY_DIRS}"
+-  PATHS /usr/lib/x86_64-linux-gnu
++  PATHS %%LOCALBASE%%/lib
+ )
+ 
+ include(FindPackageHandleStandardArgs)
diff --git a/audio/baresip/pkg-plist b/audio/baresip/pkg-plist
index ab895ca6e1d9..23c8bc72fd46 100644
--- a/audio/baresip/pkg-plist
+++ b/audio/baresip/pkg-plist
@@ -22,10 +22,12 @@ lib/baresip/modules/fakevideo.so
 %%G711%%lib/baresip/modules/g711.so
 %%G722%%lib/baresip/modules/g722.so
 %%G726%%lib/baresip/modules/g726.so
+%%GST%%lib/baresip/modules/gst.so
 %%GTK3%%lib/baresip/modules/gtk.so
 lib/baresip/modules/httpd.so
 lib/baresip/modules/httpreq.so
 lib/baresip/modules/ice.so
+%%JACK%%lib/baresip/modules/jack.so
 lib/baresip/modules/l16.so
 lib/baresip/modules/menu.so
 lib/baresip/modules/mixausrc.so
@@ -63,7 +65,7 @@ lib/baresip/modules/vumeter.so
 %%X11%%lib/baresip/modules/x11.so
 lib/libbaresip.so
 lib/libbaresip.so.22
-lib/libbaresip.so.22.1.0
+lib/libbaresip.so.22.2.0
 libdata/pkgconfig/libbaresip.pc
 share/applications/com.github.baresip.desktop
 %%DATADIR%%/autoanswer.wav