From nobody Thu Apr 27 12:04:13 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 4Q6ZCf0Xn8z474Rh; Thu, 27 Apr 2023 12:04:14 +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 4Q6ZCd5zK8z3lsb; Thu, 27 Apr 2023 12:04:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597053; 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=YG6lbv7FqaXMJB8egJXty+rfEAXchMqN0oAXHh8mNrE=; b=mm6V2oZTTrye3Og6H25cHgOpNJqvRZJcBE/jsjClTD26h+oTQv7hJQxVyFhc6Ww/t7WFUR pCxAB0Se3rvufJwLQgkOsIxjdYR+XWMVeUBspTX4Oh/lgiPolkqN9hUEDtCodSoSHrqXKh FQZ13BEi0pMdwiNo92eHui3JEUQ3YcBczrQYAbyhfNJv4AYiO8F1JV77Otoxxx1IbA7/OE Ew2NdlfZcwEuI76AASMP3p5UwYw5pjEQuCDS/uTXxlgNmGzNwt0vob3Whmy4BdfC4S++Eg PFNICJBWiFeZjGWn57q64Oe8zR/K4P5ZSvQrhONpmQa0UNFGN0GGfZvbI6ou1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597053; 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=YG6lbv7FqaXMJB8egJXty+rfEAXchMqN0oAXHh8mNrE=; b=XDIUxh5sYYw99B9gjVv391dVqQbUUIrI9aoAp70G5P6SgPHFhfU+0w5uXdvCoaSZT0Wsar bCH6ZwoTxSeBTSCkJQ8eAs3FF5wHnUXovsPBkg4/1TKAmXPrISZfLXQYxS5XEU1PgVuv4Z FlebHqCm5mPGENDivKXNLADa+A4mAfB3pmpz3Vpk52iVcS9i87i1jtK8bTE7f2lTmu6Jxs M04bmsaZmMadSlO+NHD/CCq1z1rJO6sBQ7niFaocYcX7UhPQqqZQH9VJumKT7Zf9RQ/iJ/ 0SYlGTc1SZPVx3DDD3j6KWseVfitiDCkTc/uaIRls22ZzTHuI+KAPee9kFanUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682597053; a=rsa-sha256; cv=none; b=d/wahFM81ElIOep6RCaicHVRAaKYWZzjEU0VCpOuPcg4UprmgtkudMqkTMW56xR5GZnhwX n2jTcX0ldSxBdv1N3gc7cqzz+McCYC/v/8FKHcPCeSVsOgc0JPJ8tFPK4jaNeYpioTtrSn lWkLX/afIfNyvEBB+NDxDeUW21srDIehXWqj44u6iMrTk6GQFB5TVF+Ait7BaQMUpvSlQx +yfo5+41y9hREJQTMGQMPsV/zZUXgrS4Bogngr5SK6cWb+WWONbKuUif+fZYvQg5yTeIfo fhQTLrurNmOS9GQir7YaMOq+ShdBumLKzD9y0QNZD2KMnY3kdTE0IPWYJeUUlg== 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 4Q6ZCd54fhzG67; Thu, 27 Apr 2023 12:04:13 +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 33RC4DhR046427; Thu, 27 Apr 2023 12:04:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RC4DiU046426; Thu, 27 Apr 2023 12:04:13 GMT (envelope-from git) Date: Thu, 27 Apr 2023 12:04:13 GMT Message-Id: <202304271204.33RC4DiU046426@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: c46e6a05c6cb - main - net/mediastreamer: 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: c46e6a05c6cbb14f740a04718bbfc3249a01765b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=c46e6a05c6cbb14f740a04718bbfc3249a01765b commit c46e6a05c6cbb14f740a04718bbfc3249a01765b Author: Daniel Engberg AuthorDate: 2023-04-27 10:24:46 +0000 Commit: Daniel Engberg CommitDate: 2023-04-27 12:01:44 +0000 net/mediastreamer: Move to FFmpeg 4 Fails to build with FFmpeg 6 PR: 270314 Approved by: portmgr (blanket, build fix) Sponsored by: Blinkinblox --- net/mediastreamer/Makefile | 4 +++- net/mediastreamer/files/patch-CMakeLists.txt | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/net/mediastreamer/Makefile b/net/mediastreamer/Makefile index fd0c9636b10a..2d57e2201d46 100644 --- a/net/mediastreamer/Makefile +++ b/net/mediastreamer/Makefile @@ -54,7 +54,7 @@ VIDEOOPT_DESC= Video options QTGL_DESC= Qt OpenGL rendering support FFMPEG_IMPLIES= VIDEO -FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg +FFMPEG_LIB_DEPENDS= libavcodec.so.58:multimedia/ffmpeg4 FFMPEG_CMAKE_BOOL= ENABLE_FFMPEG G726_LIB_DEPENDS= libspandsp.so:comms/spandsp G726_CMAKE_BOOL= ENABLE_G726 @@ -98,6 +98,8 @@ XVIDEO_LDFLAGS= -L${LOCALBASE}/lib -lX11 post-patch: @${REINPLACE_CMD} 's,gsm/gsm\.h,gsm.h,' \ ${WRKSRC}/cmake/FindGSM.cmake ${WRKSRC}/src/audiofilters/gsm.c + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${PATCH_WRKSRC}/CMakeLists.txt .if ${CHOSEN_COMPILER_TYPE} == gcc @${REINPLACE_CMD} '/-Wno-format-truncation/d' ${WRKSRC}/CMakeLists.txt .endif diff --git a/net/mediastreamer/files/patch-CMakeLists.txt b/net/mediastreamer/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..af4f8c14d640 --- /dev/null +++ b/net/mediastreamer/files/patch-CMakeLists.txt @@ -0,0 +1,10 @@ +--- CMakeLists.txt.orig 2023-04-25 11:15:51 UTC ++++ CMakeLists.txt +@@ -260,6 +260,7 @@ if(ENABLE_VIDEO) + add_definitions(-DVIDEO_ENABLED) + endif() + if(ENABLE_FFMPEG) ++ set(CMAKE_PREFIX_PATH "%%LOCALBASE%%/ffmpeg4;%%LOCALBASE%%/ffmpeg4/libexec") + find_package(FFMpeg REQUIRED) + else() + add_definitions(-DNO_FFMPEG)