Date: Thu, 27 Apr 2023 12:03:51 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: 6fcbf43cefc8 - main - audio/libgroove: Move to FFmpeg 4 Message-ID: <202304271203.33RC3pOp046004@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=6fcbf43cefc8f75d0ef55ef154e86bc566c6f0dd commit 6fcbf43cefc8f75d0ef55ef154e86bc566c6f0dd Author: Daniel Engberg <diizzy@FreeBSD.org> AuthorDate: 2023-04-27 09:19:36 +0000 Commit: Daniel Engberg <diizzy@FreeBSD.org> CommitDate: 2023-04-27 12:01:41 +0000 audio/libgroove: Move to FFmpeg 4 Fails to build with FFmpeg 6 PR: 261302 Reported by: antoine (via exp-run) Approved by: portmgr (blanket, build fix) Sponsored by: Blinkinblox --- audio/libgroove/Makefile | 6 +++++- audio/libgroove/files/patch-cmake_FindLibAV.cmake | 11 +++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/audio/libgroove/Makefile b/audio/libgroove/Makefile index 981f194809cc..9bb0857f1732 100644 --- a/audio/libgroove/Makefile +++ b/audio/libgroove/Makefile @@ -10,7 +10,7 @@ WWW= https://github.com/andrewrk/libgroove LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ +LIB_DEPENDS= libavcodec.so.58:multimedia/ffmpeg4 \ libchromaprint.so:audio/chromaprint \ libebur128.so:audio/libebur128 \ libspeexdsp.so:audio/speexdsp @@ -26,4 +26,8 @@ CFLAGS+= -Wno-error=deprecated-declarations # ffmpeg 3.1 PLIST_SUB+= VER1=${PORTVERSION:R:R} \ VER3=${PORTVERSION} +post-patch: + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${PATCH_WRKSRC}/cmake/FindLibAV.cmake + .include <bsd.port.mk> diff --git a/audio/libgroove/files/patch-cmake_FindLibAV.cmake b/audio/libgroove/files/patch-cmake_FindLibAV.cmake new file mode 100644 index 000000000000..5fb4bb9d5bd9 --- /dev/null +++ b/audio/libgroove/files/patch-cmake_FindLibAV.cmake @@ -0,0 +1,11 @@ +--- cmake/FindLibAV.cmake.orig 2023-04-25 13:56:57 UTC ++++ cmake/FindLibAV.cmake +@@ -22,6 +22,8 @@ + # AVUTIL_INCLUDE_DIRS + # AVUTIL_LIBRARIES + ++set(CMAKE_PREFIX_PATH "%%LOCALBASE%%/ffmpeg4;%%LOCALBASE%%/ffmpeg4/include;%%LOCALBASE%%/ffmpeg4/libexec") ++ + find_path(AVFILTER_INCLUDE_DIRS NAMES libavfilter/avfilter.h) + find_library(AVFILTER_LIBRARIES NAMES avfilter) + if(AVFILTER_LIBRARIES AND AVFILTER_INCLUDE_DIRS)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304271203.33RC3pOp046004>