From nobody Sun Sep 10 09:40:28 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rk4b047KLz4sDnT; Sun, 10 Sep 2023 09:40:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rk4b03Z8hz3Fg4; Sun, 10 Sep 2023 09:40:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694338828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R3G5kWTA3p/9tK3BzH4sqLE3C3eoUXDSIo5lztabwoo=; b=vQ8+hoNWLsLomDJMNSdV9rkid+TYfl3t/PXBUrtuuN4iaHJvFi4lDXfIoYPQwMHLaOHHpg Eb7YgbXBnwJeKM4aFu6fFjHP0nYP6FDHslWl2LOUyPWByDbr7dtdYUY5zESHFXh7LzQ7nC U8qPMTzfuPxR696zEIIMsRMMt/rvxFBXpinmGk9Hwer4qoXz1WiPxHJhlfBnZN1y/P1JDV oT4yYpnzVOnEIQF3DuL2+AwiRW0jd0VAjRBuo4PFppbrxOw1ZlI7EfbcVfYt170i8CFg2t pYaHU+mzL8vZGLFwsigVclUlT7Q1Jeh+j/k7leV8r2HvdCHlnm/yxMlwCDkFnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694338828; a=rsa-sha256; cv=none; b=RDYQT/6o9L8qGGXch2mBuWe+mz7gmefgL0qAxMLDLFWUhe1PXhfhfhO6Y1Ctx0H8aaVv1N R2cMRdZtCMpTQDAGyEI4z82pq7FAw0doNJ1tNTcYDdvclf+2GqjK4S7nIGBpV2MORjxBq/ 4ogvnnjMEVhjocS4p8on7jXM6Gb+Hx3tpQ3QUAACAMGjlfPmRmF7oYVNtduh+IfMj3oarE gS2xKnYE49wmwUGBtNszICnv+8DrygULi+YTL2oqukH46M1RdaoqHR0W1SpzgIwCi2GFUu CJXbTyre9Cqg+WgAmX1Xmepw7xDZp/9ZHilaTRghymxTZuFg3cc9H658dCS1Lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694338828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R3G5kWTA3p/9tK3BzH4sqLE3C3eoUXDSIo5lztabwoo=; b=jl0KiEyzLKfRpLnUAwGxleBYd3/9NZG+rrJtj8c2Glh50WPovkT1sGqbf0h9+ze+MNoKVk 8hXf7QyIQAzBjw6sCrUGiU0U8OHPytpFIFW7nvdgtHV9jHjdeAFk/8DiEJn17ZauZgSgzp cLbjAyGnjl4LDv/MoJxpw2ZfCGnYSIe2TXi5vR4oOiHjNEzSIDC2u2r1dIaTXAveZy4ddy Pzn777wrDr+2ohalH+VJjNOMntPgBwxkizMGCCyGBxtYMwcs3SClF1sLMy8h1J5nMRoBK8 lPsv7UJWp8dN+1vpRvwmT3Tl9b7GHmxB7bz4ngI6AIpVPJdrcs5Ykl8rWcwIsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rk4b02WJBz11sg; Sun, 10 Sep 2023 09:40:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38A9eS0F067624; Sun, 10 Sep 2023 09:40:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38A9eSwm067621; Sun, 10 Sep 2023 09:40:28 GMT (envelope-from git) Date: Sun, 10 Sep 2023 09:40:28 GMT Message-Id: <202309100940.38A9eSwm067621@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rodrigo Osorio Subject: git: fc280dd10523 - main - audio/baresip: remove audio/rem dependency List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rodrigo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc280dd105231af5c0e6f3237cb12c592ad0a400 Auto-Submitted: auto-generated The branch main has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=fc280dd105231af5c0e6f3237cb12c592ad0a400 commit fc280dd105231af5c0e6f3237cb12c592ad0a400 Author: Rodrigo Osorio AuthorDate: 2023-09-10 09:23:21 +0000 Commit: Rodrigo Osorio CommitDate: 2023-09-10 09:39:18 +0000 audio/baresip: remove audio/rem dependency audio/rem is now merged into audio/re [1] [1] https://github.com/baresip/re/pull/683 Reported by: Herbert J. Skuhra (by email) --- audio/baresip/Makefile | 110 ++++++++++++++++++++++--------------------------- 1 file changed, 50 insertions(+), 60 deletions(-) diff --git a/audio/baresip/Makefile b/audio/baresip/Makefile index 850d9852924b..c867820fedab 100644 --- a/audio/baresip/Makefile +++ b/audio/baresip/Makefile @@ -1,6 +1,7 @@ PORTNAME= baresip DISTVERSIONPREFIX= v DISTVERSION= 3.4.0 +PORTREVISION= 1 CATEGORIES= audio MAINTAINER= ports@FreeBSD.org @@ -10,11 +11,10 @@ WWW= https://github.com/baresip LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= re>=${PORTVERSION}:audio/re \ - rem>0:audio/rem +BUILD_DEPENDS= re>=${PORTVERSION}:audio/re RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= cmake ssl pkgconfig +USES= cmake pkgconfig ssl USE_GITHUB= yes GH_ACCOUNT= baresip @@ -23,47 +23,39 @@ ABI_MAJOR= 9 ABI_AGE= 4 ABI_REV= 0 PLIST_SUB= ABI_MAJOR=${ABI_MAJOR} -PLIST_SUB+= ABI_AGE=${ABI_AGE} -PLIST_SUB+= ABI_REV=${ABI_REV} - -OPTIONS_DEFINE= \ - ALSA AV1 AVCODEC AVFILTER AVFORMAT \ - CTRL_DBUS \ - DOCS \ - EXAMPLES \ - G711 G722 G726 GST \ - MQTT \ - OPUS OPUS_MS \ - PLC PORTAUDIO PULSEAUDIO \ - SDL SNAPSHOT SNDFILE SWSCALE \ - V4L2 VPX \ - X11 -OPTIONS_DEFAULT=DOCS EXAMPLES -OPTIONS_SUB= yes - -ALSA_DESC= ALSA audio driver -AV1_DESC= AV1 Video Codec -AVCODEC_DESC= Video codecs using libavcodec -AVFILTER_DESC= Video filter using libavfilter -AVFORMAT_DESC= libavformat media-source -CTRL_DBUS_DESC= [broken] DBUS interface for baresip -G711_DESC= G.711 audio codec -G722_DESC= G.722 audio codec -G726_DESC= G.726 audio codec -GST_DESC= Gstreamer audio 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 +PLIST_SUB+= ABI_AGE=${ABI_AGE} \ + ABI_REV=${ABI_REV} + +OPTIONS_DEFINE= ALSA AV1 AVCODEC AVFILTER AVFORMAT CTRL_DBUS DOCS \ + EXAMPLES G711 G722 G726 GST MQTT OPUS OPUS_MS PLC \ + PORTAUDIO PULSEAUDIO SDL SNAPSHOT SNDFILE SWSCALE V4L2 \ + VPX X11 +OPTIONS_DEFAULT= DOCS EXAMPLES +OPTIONS_SUB= yes + +ALSA_DESC= ALSA audio driver +AV1_DESC= AV1 Video Codec +AVCODEC_DESC= Video codecs using libavcodec +AVFILTER_DESC= Video filter using libavfilter +AVFORMAT_DESC= libavformat media-source +CTRL_DBUS_DESC= [broken] DBUS interface for baresip +G711_DESC= G.711 audio codec +G722_DESC= G.722 audio codec +G726_DESC= G.726 audio codec +GST_DESC= Gstreamer audio 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 -SWSCALE_DESC= Video filter for scaling and pixel conversion -V4L2_DESC= Video4Linux2 module -VPX_DESC= VP8/VP9 video codecs -X11_DESC= X11 video output +SDL_DESC= libSDL2 video output +SNAPSHOT_DESC= Snapshot video module +SNDFILE_DESC= sndfile wav dumper +SWSCALE_DESC= Video filter for scaling and pixel conversion +V4L2_DESC= Video4Linux2 module +VPX_DESC= VP8/VP9 video codecs +X11_DESC= X11 video output MODULES_LIST:= account;aubridge;auconv;aufile;auresamp;ausine MODULES_LIST:= $(MODULES_LIST);cons;contact;ctrl_tcp @@ -89,18 +81,18 @@ MODULES_LIST:= $(MODULES_LIST);av1 .if ${PORT_OPTIONS:MAVCODEC} AVCODEC_DEPEND= ${LOCALBASE}/include/libavcodec/avcodec.h:multimedia/ffmpeg \ - libdrm>0:graphics/libdrm + libdrm>0:graphics/libdrm MODULES_LIST:= $(MODULES_LIST);avcodec .endif .if ${PORT_OPTIONS:MAVFILTER} AVFILTER_DEPEND= ${LOCALBASE}/include/libavfilter/avfilter.h:multimedia/ffmpeg -MODULES_LIST:= $(MODULES_LIST);avfilter +MODULES_LIST:= $(MODULES_LIST);avfilter .endif .if ${PORT_OPTIONS:MAVFORMAT} AVFORMAT_DEPEND= ${LOCALBASE}/include/libavformat/avformat.h:multimedia/ffmpeg -MODULES_LIST:= $(MODULES_LIST);avformat +MODULES_LIST:= $(MODULES_LIST);avformat .endif .if ${PORT_OPTIONS:MG711} @@ -119,10 +111,10 @@ MODULES_LIST:= $(MODULES_LIST);g726 .endif .if ${PORT_OPTIONS:MGST} -GST_DEPEND= ${LOCALBASE}/include/gstreamer-1.0/gst/gst.h:multimedia/gstreamer1 -PORT_OPTIONS+= GSTREAMER -USES+= gnome -USE_GNOME+= glib20 +GST_DEPEND= ${LOCALBASE}/include/gstreamer-1.0/gst/gst.h:multimedia/gstreamer1 +PORT_OPTIONS+= GSTREAMER +USES+= gnome +USE_GNOME+= glib20 USE_GSTREAMER1+= yes .endif @@ -148,14 +140,14 @@ MODULES_LIST:= $(MODULES_LIST);plc .if ${PORT_OPTIONS:MPORTAUDIO} PORTAUDIO_DEPEND= ${LOCALBASE}/include/portaudio.h:audio/portaudio -MODULES_LIST:= $(MODULES_LIST);portaudio +MODULES_LIST:= $(MODULES_LIST);portaudio .endif # Port calls it PULSE, standard OPTION is PULSEAUDIO .if ${PORT_OPTIONS:MPULSEAUDIO} -PORT_OPTIONS+= PULSE +PORT_OPTIONS+= PULSE PULSEAUDIO_DEPEND= ${LOCALBASE}/include/pulse/pulseaudio.h:audio/pulseaudio -MODULES_LIST:= $(MODULES_LIST);pulse +MODULES_LIST:= $(MODULES_LIST);pulse .endif .if ${PORT_OPTIONS:MSDL} @@ -182,7 +174,7 @@ MODULES_LIST:= $(MODULES_LIST);swscale .if ${PORT_OPTIONS:MV4L2} V4L2_DEPEND= ${LOCALBASE}/include/libv4l2.h:multimedia/libv4l \ - v4l_compat>0:multimedia/v4l_compat + v4l_compat>0:multimedia/v4l_compat MODULES_LIST:= $(MODULES_LIST);v4l2 .endif @@ -195,9 +187,7 @@ MODULES_LIST:= $(MODULES_LIST);vp8;vp9 .if ${PORT_OPTIONS:MX11} USES+= xorg USE_XORG= x11 -USE_XORG+= xext -USE_XORG+= sm -USE_XORG+= ice +USE_XORG+= ice sm xext MODULES_LIST:= $(MODULES_LIST);x11 .endif @@ -206,9 +196,9 @@ BUILD_DEPENDS+= ${$o_DEPEND} RUN_DEPENDS+= ${$o_DEPEND} .endfor -CMAKE_ARGS+= -DRE_INCLUDE_DIR:STRING="${LOCALBASE}/include/re" \ - -DREM_INCLUDE_DIR:STRING="${LOCALBASE}/include/rem" \ - -DMODULES="$(MODULES_LIST)" +CMAKE_ARGS+= -DMODULES="$(MODULES_LIST)" \ + -DRE_INCLUDE_DIR:STRING="${LOCALBASE}/include/re" \ + -DREM_INCLUDE_DIR:STRING="${LOCALBASE}/include/rem" post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${EXAMPLESDIR}