From nobody Sun Oct 10 11:36:04 2021 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 D3F9817F712A; Sun, 10 Oct 2021 11:36:04 +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 4HS0HS5cpSz4Whg; Sun, 10 Oct 2021 11:36:04 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 9248B4CEF; Sun, 10 Oct 2021 11:36:04 +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 19ABa46i075952; Sun, 10 Oct 2021 11:36:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19ABa4uR075951; Sun, 10 Oct 2021 11:36:04 GMT (envelope-from git) Date: Sun, 10 Oct 2021 11:36:04 GMT Message-Id: <202110101136.19ABa4uR075951@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 70466702271d - main - net/opal: Disable celt support 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: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 70466702271d30a66dcdf43c48856d46303e1df3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=70466702271d30a66dcdf43c48856d46303e1df3 commit 70466702271d30a66dcdf43c48856d46303e1df3 Author: Daniel Engberg AuthorDate: 2021-10-10 11:32:50 +0000 Commit: Daniel Engberg CommitDate: 2021-10-10 11:32:54 +0000 net/opal: Disable celt support It's been deprecated by upstream (Xiph) and obsolete since 2016 PR: 258657 Approved by: riggs (multimedia), arrowd (mentor) Differential Revision: https://reviews.freebsd.org/D32049 --- net/opal/Makefile | 18 ++++-------------- net/opal/pkg-plist | 1 - 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/net/opal/Makefile b/net/opal/Makefile index eac83cae0f23..b63dc9ffce3b 100644 --- a/net/opal/Makefile +++ b/net/opal/Makefile @@ -2,7 +2,7 @@ PORTNAME= opal PORTVERSION= 3.10.10 -PORTREVISION= 27 +PORTREVISION= 28 CATEGORIES= net MASTER_SITES= GNOME @@ -21,17 +21,16 @@ CXXFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE= JAVA CELT ILBC GSM SPEEX THEORA FFMPEG X264 SIP H323 IAX \ +OPTIONS_DEFINE= JAVA ILBC GSM SPEEX THEORA FFMPEG X264 SIP H323 IAX \ H224 H281 FAX MSRP SIPIM RTPTEXT H450 H460 H501 LID UVIDEO \ AEC DEBUG RUBY # MSRP = plist extra line vpd? # RTPTEXT disable == build fail, so make it default? -OPTIONS_DEFAULT=CELT GSM SPEEX FFMPEG X264 SIP H224 H281 FAX MSRP SIPIM \ +OPTIONS_DEFAULT=GSM SPEEX FFMPEG X264 SIP H224 H281 FAX MSRP SIPIM \ RTPTEXT LID AEC DEBUG_DESC= Install debug library JAVA_DESC= Java JNI support RUBY_DESC= Ruby support -CELT_DESC= Celt codec from ports ILBC_DESC= iLBC codec from ports GSM_DESC= GSM 06.10 codec from ports SPEEX_DESC= SPEEX codec from ports @@ -76,7 +75,7 @@ ALL_TARGET= opt PLIST_SUB+= DEBUG="@comment " .endif -CONFIGURE_ARGS+= --disable-zrtp +CONFIGURE_ARGS+= --disable-celt --disable-zrtp .if ${PORT_OPTIONS:MGSM} LIB_DEPENDS+= libgsm.so:audio/gsm @@ -102,15 +101,6 @@ CONFIGURE_ARGS+= --enable-ruby CONFIGURE_ARGS+= --disable-ruby .endif -.if ${PORT_OPTIONS:MCELT} -LIB_DEPENDS+= libcelt0.so:audio/celt -CONFIGURE_ARGS+= --enable-celt -PLIST_SUB+= CELT="" -.else -CONFIGURE_ARGS+= --disable-celt -PLIST_SUB+= CELT="@comment " -.endif - .if ${PORT_OPTIONS:MILBC} LIB_DEPENDS+= libilbc.so:net/ilbc .else diff --git a/net/opal/pkg-plist b/net/opal/pkg-plist index af79a459f317..f0f23b92f3a5 100644 --- a/net/opal/pkg-plist +++ b/net/opal/pkg-plist @@ -141,7 +141,6 @@ lib/libopal.so.%%VERSION%% %%DEBUG%%lib/libopal_d.so.%%PVERSION_MAJOR%% %%DEBUG%%lib/libopal_d.so.%%PVERSION_MINOR%% %%DEBUG%%lib/libopal_d.so.%%VERSION%% -%%CELT%%lib/opal-%%VERSION%%/codecs/audio/celt_ptplugin.so lib/opal-%%VERSION%%/codecs/audio/g7221_ptplugin.so lib/opal-%%VERSION%%/codecs/audio/g7222_ptplugin.so lib/opal-%%VERSION%%/codecs/audio/g722_ptplugin.so