Date: Thu, 27 Apr 2023 12:04:05 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: f1a196b59cb5 - main - multimedia/nordlicht: Move to FFmpeg 4 Message-ID: <202304271204.33RC45Gk046281@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=f1a196b59cb5d07606ce3dd7da8d54aaef74b9aa commit f1a196b59cb5d07606ce3dd7da8d54aaef74b9aa Author: Daniel Engberg <diizzy@FreeBSD.org> AuthorDate: 2023-04-27 10:04:36 +0000 Commit: Daniel Engberg <diizzy@FreeBSD.org> CommitDate: 2023-04-27 12:01:43 +0000 multimedia/nordlicht: 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 --- multimedia/nordlicht/Makefile | 11 ++++++----- multimedia/nordlicht/files/patch-cmake_FindFFmpeg.cmake | 11 +++++++++++ 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/multimedia/nordlicht/Makefile b/multimedia/nordlicht/Makefile index 3429d9c8f1ec..83bc12696932 100644 --- a/multimedia/nordlicht/Makefile +++ b/multimedia/nordlicht/Makefile @@ -12,13 +12,13 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.md BUILD_DEPENDS= help2man:misc/help2man -LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ +LIB_DEPENDS= libavcodec.so.58:multimedia/ffmpeg4 \ libpopt.so:devel/popt \ libpng.so:graphics/png USE_GITHUB= yes -USES= cmake pkgconfig shebangfix +USES= cmake pathfix pkgconfig shebangfix USE_LDCONFIG= yes PLIST_SUB= PORTVERSION=${PORTVERSION} @@ -28,9 +28,10 @@ SHEBANG_FILES= utils/mpv-nordlicht OPTIONS_DEFINE= EXAMPLES post-patch: - @${REINPLACE_CMD} \ - -e 's|$${CMAKE_INSTALL_LIBDIR}/pkgconfig|libdata/pkgconfig|' \ - -e 's|share/man/man1|man/man1|' ${WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} -e 's|share/man/man1|man/man1|' \ + ${PATCH_WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${PATCH_WRKSRC}/cmake/FindFFmpeg.cmake post-install: @cd ${WRKSRC}/utils && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} diff --git a/multimedia/nordlicht/files/patch-cmake_FindFFmpeg.cmake b/multimedia/nordlicht/files/patch-cmake_FindFFmpeg.cmake new file mode 100644 index 000000000000..9972f1ada037 --- /dev/null +++ b/multimedia/nordlicht/files/patch-cmake_FindFFmpeg.cmake @@ -0,0 +1,11 @@ +--- cmake/FindFFmpeg.cmake.orig 2023-04-25 07:25:17 UTC ++++ cmake/FindFFmpeg.cmake +@@ -26,6 +26,8 @@ + # Redistribution and use is allowed according to the terms of the BSD license. + # For details see the accompanying COPYING-CMAKE-SCRIPTS file. + ++set(CMAKE_PREFIX_PATH "%%LOCALBASE%%/ffmpeg4;%%LOCALBASE%%/ffmpeg4/libexec") ++ + include(FindPackageHandleStandardArgs) + + # The default components were taken from a survey over other FindFFMPEG.cmake files
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304271204.33RC45Gk046281>