From nobody Thu Jan 13 17:27:46 2022 X-Original-To: dev-commits-ports-main@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 06F421949603; Thu, 13 Jan 2022 17:27:47 +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 4JZWbQ6c23z4vDG; Thu, 13 Jan 2022 17:27:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642094867; 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=0sk0usxeoM5PQ82RR0v1I8c69CrgDvRuredlj/Vx3Tk=; b=vE+ScyXdfHvLW69jf+AOoseFYTDb1R9n7oIbuwCmyL176RoAj/JTQevs9e0xqLbA1A9iTB dP9aC+CUmu99TIIOyraySD21WYd0fr4q3an6EnmEwcOd6NSP16PUxfltxqSzczIZeKCnFh bqSrDLzu3hILkPBcN5zvZYukIhLjpmATtz5UyXuHTyPUPZc07CWSPj0ksAQBlKKjmoYXWN dJyCNC2mbP/WrQKeHTJWTiGI8Yv4fO0RtQNkZJTybR3sVQrFjeGnkvW/khbMbUFqQyvfMt 6LmISaiOcOVSIrEZbha6xvIOjfpetcdoPpd2AGJIRn68F2AoS0d36w9ffJJAcQ== 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 BBB4024260; Thu, 13 Jan 2022 17:27:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20DHRkZG009930; Thu, 13 Jan 2022 17:27:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20DHRkw7009929; Thu, 13 Jan 2022 17:27:46 GMT (envelope-from git) Date: Thu, 13 Jan 2022 17:27:46 GMT Message-Id: <202201131727.20DHRkw7009929@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Chris Rees Subject: git: 0741b694b726 - main - audio/baresip: Fix build (and INDEX) with GSTREAMER option List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: crees X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0741b694b726e50bd2709197b58980b47e4b28e2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642094867; 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=0sk0usxeoM5PQ82RR0v1I8c69CrgDvRuredlj/Vx3Tk=; b=ppIMgki05TMu/n5AOA4sRBsREhqn4NENGO37HyGclOGAeatkB+bBgB0vVOQ724E37wuBT4 QIzEM+rWSUZBf+QMFZ+4V5IAha0nxigjpFMf0lGaUcgom+hOwyElST7iDLcw9PmOISa94j TDfJAlde8La0eTyjjSTG8NeiqsQs9QVBGjCZ4imjc7lPKR2QR2MKwXS77xMdudhv8Q+pEK zxCuVVaqdhKiubwtFWJqxvfUaqrFpP1oEb74apXpQRNKFjs/xOFqY+8UrMSDVL9O5Vmjct m2cirW+KKFnEDMAPt+Hrj73qL11WHK52Hfa7ksfT0ZSMHse1ZRxF1CzGabFS9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642094867; a=rsa-sha256; cv=none; b=DmH0p0rt6wvQbEOvZSe8XHN2pmkwXXoFECzmkOwAaXR+pVCpfa8KxcgtZFHje8LZkvfG8y cvCY4sbuQR5IDwLUnAktN2G24xFgrj9/JhwOC6OfV86tede9I5atIqQem6lZElVa2/g0/j 4oxZxx32i+WfgbNISvg8qqaXQvPbIcvxmGgiE+qiw9hr0W9WC8iMUDR5q0qHAPHZX9yPw5 w2bzc26zjHbhA6Ktxm5w+EUYgUboaRKFDi+ecij+h0WqXvFHRGZy/2H4bZ6YucvJ0UQXqj 7TEwny0x6oJXrCSnfggS61F+bwyKyjazJh577aj8jNmM9zCRvLYmLJdsvW/TKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by crees: URL: https://cgit.FreeBSD.org/ports/commit/?id=0741b694b726e50bd2709197b58980b47e4b28e2 commit 0741b694b726e50bd2709197b58980b47e4b28e2 Author: Chris Rees AuthorDate: 2022-01-08 15:20:36 +0000 Commit: Chris Rees CommitDate: 2022-01-13 17:26:37 +0000 audio/baresip: Fix build (and INDEX) with GSTREAMER option PR: ports/256971 --- audio/baresip/Makefile | 6 +++--- audio/baresip/Makefile.depends | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/audio/baresip/Makefile b/audio/baresip/Makefile index 30f8f07fdd83..5b217a00e579 100644 --- a/audio/baresip/Makefile +++ b/audio/baresip/Makefile @@ -63,9 +63,9 @@ $o_DESC= ${o:C,^(.).*,\1,}${o:C,^.,,:tl} module .include "${.CURDIR}/Makefile.depends" -# Port calls it GST, standard OPTION is GSTREAMER -.if ${PORT_OPTIONS:MGSTREAMER} -PORT_OPTIONS+= GST +# 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 .endif # Port calls it PULSE, standard OPTION is PULSEAUDIO diff --git a/audio/baresip/Makefile.depends b/audio/baresip/Makefile.depends index 0ef05c78b25f..55efe72ad5d7 100644 --- a/audio/baresip/Makefile.depends +++ b/audio/baresip/Makefile.depends @@ -8,7 +8,7 @@ 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 -GST_DEPEND= gst-launch:multimedia/gstreamer +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