Date: Thu, 27 Apr 2023 12:04:14 GMT From: Daniel Engberg <diizzy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: ad20a02ced61 - main - net/opal: Move to FFmpeg 4 Message-ID: <202304271204.33RC4EI5046446@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=ad20a02ced61e01bbe407e3dc2113838a41c21f4 commit ad20a02ced61e01bbe407e3dc2113838a41c21f4 Author: Daniel Engberg <diizzy@FreeBSD.org> AuthorDate: 2023-04-27 10:26:52 +0000 Commit: Daniel Engberg <diizzy@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304271204.33RC4EI5046446>