From nobody Thu Apr 27 12:04:14 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 4Q6ZCg0qL9z474NK; Thu, 27 Apr 2023 12:04:15 +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 4Q6ZCf6zZgz3m1v; Thu, 27 Apr 2023 12:04:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597055; 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=p62bsE+Yp6Hi4o/7BJiQNf8v2tXJiZED3Q39oaAOMhw=; b=So5WckkhNtjHrf5t1N8JO7KeJ6VwMHo3/Blm3vrjV8aoxd3tV8bFdejIP/mFvg2+Qj5Lpz PwWDQMB6z3HJRZQWEjuQsEIDUoECNhJLNmAvg2k00ixwNFxgvzSkuhKecl9I0xB+zEWKry DawAuEQ+PsLWrHE3/2t0SScq7cCg7IDeOygZLVR07XxrPAgDy9d1su/pWd3NNHoiEmDb7W uBDwv0R4Hgnu1mukX66Hcca0hVj6n9kwD3oGZY38PZdv4e1AKkHtmp0b4IGfMJVQtiJ8a/ qgpAk5acahKPEMeJ3N0KlU02djPkHEyZ1F+gN9aAiBY8Jea9HM6oUthzKC9rkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597055; 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=p62bsE+Yp6Hi4o/7BJiQNf8v2tXJiZED3Q39oaAOMhw=; b=kUUz7i7kJo8NKs9KrZFZetm9S0ggSQO5caW8ypDChEO/gAJQkUE0RPH3rR0JvKTphBmNwv 9ZOCLVXHGoSTqlrIIavsjwO1TBjeTzifqpXdRMjDDBLZ+OHa4x4f/gLRxtvghmgC2NlmOY s/IrBk3Qjz/Qox6DgIVknNR9nNsqK4PumBxkn6SFX4FA/B0FTup8QXcaXXcl1eHX827E2M HW/04n0vVhJ0OztEY8itQZJ9OZbkVjBqvS3XV8+kkpqvaZN9ZU256/9hTD9a6WPDHI46iY LMMPapWufs3+EMfEeOSNPn6fKzYmkQzXNNhziOHfBli2NCSSEWpqXcJGebM5hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682597055; a=rsa-sha256; cv=none; b=gHx03YT2JZQkUq0ulqD7ty5GPIF7AUqdB0/J+jWCGWwL7ZNvU3HwhorBSIHmHXIE5gDTFK oZbyJh3LoLA0zsCnI9KYXnc4ydGZsRvhbalTZlyhqNDGceiX1ZFvfPKMbpgCy/NiW+KM4Z ta5MLUs4z4tIcVyKTz4uNoMLjm1Yxjk46TxUyvOBMp0DZ5TTRfDOKunzC6VnZspp6V+B9M WwqqQboFPIHEVL3hU6Iq8JnDkHlwgzOw2IsBRMpUaT+0sUjhlIw43yk94uKM5XfP+Fsr3s uKVrZk04zoS/InK1ZM1UnT4nyR9Fe7hl0s4iPsAhR8ODim7dUAA02AR6rJjeag== 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 4Q6ZCf64R9zGQx; Thu, 27 Apr 2023 12:04:14 +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 33RC4Ept046447; Thu, 27 Apr 2023 12:04:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RC4EI5046446; Thu, 27 Apr 2023 12:04:14 GMT (envelope-from git) Date: Thu, 27 Apr 2023 12:04:14 GMT Message-Id: <202304271204.33RC4EI5046446@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: ad20a02ced61 - main - net/opal: Move to FFmpeg 4 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: ad20a02ced61e01bbe407e3dc2113838a41c21f4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=ad20a02ced61e01bbe407e3dc2113838a41c21f4 commit ad20a02ced61e01bbe407e3dc2113838a41c21f4 Author: Daniel Engberg AuthorDate: 2023-04-27 10:26:52 +0000 Commit: Daniel Engberg CommitDate: 2023-04-27 12:01:44 +0000 net/opal: Move to FFmpeg 4 Fails to build with FFmpeg 6 PR: 270325 Approved by: portmgr (blanket, build fix) Sponsored by: Blinkinblox --- net/opal/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/net/opal/Makefile b/net/opal/Makefile index 6583a6a340cd..4a42cd53f0b6 100644 --- a/net/opal/Makefile +++ b/net/opal/Makefile @@ -16,9 +16,9 @@ USES= compiler:c11 gmake pathfix pkgconfig tar:xz GNU_CONFIGURE= yes USE_LDCONFIG= yes -CXXFLAGS+= -I${LOCALBASE}/include -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +CXXFLAGS+= -I${LOCALBASE}/ffmpeg4/include -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/ffmpeg4/include -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/ffmpeg4/lib -L${LOCALBASE}/lib OPTIONS_DEFINE= JAVA ILBC GSM SPEEX THEORA FFMPEG X264 SIP H323 IAX \ H224 H281 FAX MSRP SIPIM RTPTEXT H450 H460 H501 LID UVIDEO \ @@ -131,9 +131,10 @@ PLIST_SUB+= X264="@comment " .endif .if ${PORT_OPTIONS:MFFMPEG} -BUILD_DEPENDS+= ffmpeg>=2:multimedia/ffmpeg -RUN_DEPENDS+= ffmpeg>=2:multimedia/ffmpeg +LIB_DEPENDS+= libavutil.so.56:multimedia/ffmpeg4 +CONFIGURE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg4/libdata/pkgconfig" CONFIGURE_ARGS+= --enable-libavcodec +MAKE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg4/libdata/pkgconfig" PLIST_SUB+= FFMPEG="" WITH_VIDEO= yes .else