Date: Thu, 27 Apr 2023 12:03:53 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: 4f1ddd2085b3 - main - devel/ignition-cmake: Force usage of FFmpeg 4 Message-ID: <202304271203.33RC3rtl046042@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=4f1ddd2085b3ca2e8bfa20059c0bcdc24747af22 commit 4f1ddd2085b3ca2e8bfa20059c0bcdc24747af22 Author: Daniel Engberg <diizzy@FreeBSD.org> AuthorDate: 2023-04-27 09:29:02 +0000 Commit: Daniel Engberg <diizzy@FreeBSD.org> CommitDate: 2023-04-27 12:01:41 +0000 devel/ignition-cmake: Force usage of FFmpeg 4 Consumers (devel/ignition-common) fails to build with FFmpeg 6 PR: 270198 Approved by: portmgr (blanket, build fix) Sponsored by: Blinkinblox --- devel/ignition-cmake/Makefile | 12 ++++++++++++ devel/ignition-cmake/files/patch-cmake_FindAVCODEC.cmake | 8 ++++++++ devel/ignition-cmake/files/patch-cmake_FindAVDEVICE.cmake | 8 ++++++++ devel/ignition-cmake/files/patch-cmake_FindAVFORMAT.cmake | 8 ++++++++ devel/ignition-cmake/files/patch-cmake_FindAVUTIL.cmake | 8 ++++++++ devel/ignition-cmake/files/patch-cmake_FindSWSCALE.cmake | 8 ++++++++ 6 files changed, 52 insertions(+) diff --git a/devel/ignition-cmake/Makefile b/devel/ignition-cmake/Makefile index 4bafcd4b27ec..1262b4115505 100644 --- a/devel/ignition-cmake/Makefile +++ b/devel/ignition-cmake/Makefile @@ -22,4 +22,16 @@ NO_ARCH= yes PLIST_SUB+= CMAKE_IGN_VER=cmake${DISTVERSION:R:R} +post-patch: + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${PATCH_WRKSRC}/cmake/FindAVCODEC.cmake + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${PATCH_WRKSRC}/cmake/FindAVDEVICE.cmake + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${PATCH_WRKSRC}/cmake/FindAVFORMAT.cmake + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${PATCH_WRKSRC}/cmake/FindAVUTIL.cmake + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${PATCH_WRKSRC}/cmake/FindSWSCALE.cmake + .include <bsd.port.mk> diff --git a/devel/ignition-cmake/files/patch-cmake_FindAVCODEC.cmake b/devel/ignition-cmake/files/patch-cmake_FindAVCODEC.cmake new file mode 100644 index 000000000000..4b9304f922f7 --- /dev/null +++ b/devel/ignition-cmake/files/patch-cmake_FindAVCODEC.cmake @@ -0,0 +1,8 @@ +--- cmake/FindAVCODEC.cmake.orig 2023-04-24 07:29:13 UTC ++++ cmake/FindAVCODEC.cmake +@@ -16,4 +16,5 @@ + ######################################## + # Find avcodec + include(IgnPkgConfig) ++set(CMAKE_PREFIX_PATH "%%LOCALBASE%%/ffmpeg4;%%LOCALBASE%%/ffmpeg4/libexec") + ign_pkg_check_modules(AVCODEC libavcodec) diff --git a/devel/ignition-cmake/files/patch-cmake_FindAVDEVICE.cmake b/devel/ignition-cmake/files/patch-cmake_FindAVDEVICE.cmake new file mode 100644 index 000000000000..640a2079d5dc --- /dev/null +++ b/devel/ignition-cmake/files/patch-cmake_FindAVDEVICE.cmake @@ -0,0 +1,8 @@ +--- cmake/FindAVDEVICE.cmake.orig 2023-04-24 07:29:47 UTC ++++ cmake/FindAVDEVICE.cmake +@@ -20,4 +20,5 @@ set(av_minor ${AVDEVICE_FIND_VERSION_MINOR}) + set(av_patch ${AVDEVICE_FIND_VERSION_PATCH}) + + include(IgnPkgConfig) ++set(CMAKE_PREFIX_PATH "%%LOCALBASE%%/ffmpeg4;%%LOCALBASE%%/ffmpeg4/libexec") + ign_pkg_check_modules(AVDEVICE "libavdevice >= ${av_major}.${av_minor}.${av_patch}") diff --git a/devel/ignition-cmake/files/patch-cmake_FindAVFORMAT.cmake b/devel/ignition-cmake/files/patch-cmake_FindAVFORMAT.cmake new file mode 100644 index 000000000000..60567157f9e8 --- /dev/null +++ b/devel/ignition-cmake/files/patch-cmake_FindAVFORMAT.cmake @@ -0,0 +1,8 @@ +--- cmake/FindAVFORMAT.cmake.orig 2023-04-24 07:30:02 UTC ++++ cmake/FindAVFORMAT.cmake +@@ -16,4 +16,5 @@ + ######################################## + # Find AV format + include(IgnPkgConfig) ++set(CMAKE_PREFIX_PATH "%%LOCALBASE%%/ffmpeg4;%%LOCALBASE%%/ffmpeg4/libexec") + ign_pkg_check_modules(AVFORMAT libavformat) diff --git a/devel/ignition-cmake/files/patch-cmake_FindAVUTIL.cmake b/devel/ignition-cmake/files/patch-cmake_FindAVUTIL.cmake new file mode 100644 index 000000000000..eaacfdf00a22 --- /dev/null +++ b/devel/ignition-cmake/files/patch-cmake_FindAVUTIL.cmake @@ -0,0 +1,8 @@ +--- cmake/FindAVUTIL.cmake.orig 2023-04-24 07:30:38 UTC ++++ cmake/FindAVUTIL.cmake +@@ -16,4 +16,5 @@ + ######################################## + # Find avutil + include(IgnPkgConfig) ++set(CMAKE_PREFIX_PATH "%%LOCALBASE%%/ffmpeg4;%%LOCALBASE%%/ffmpeg4/libexec") + ign_pkg_check_modules(AVUTIL libavutil) diff --git a/devel/ignition-cmake/files/patch-cmake_FindSWSCALE.cmake b/devel/ignition-cmake/files/patch-cmake_FindSWSCALE.cmake new file mode 100644 index 000000000000..79c83b834b34 --- /dev/null +++ b/devel/ignition-cmake/files/patch-cmake_FindSWSCALE.cmake @@ -0,0 +1,8 @@ +--- cmake/FindSWSCALE.cmake.orig 2023-04-25 18:35:25 UTC ++++ cmake/FindSWSCALE.cmake +@@ -16,4 +16,5 @@ + ######################################## + # Find libswscale format + include(IgnPkgConfig) ++set(CMAKE_PREFIX_PATH "%%LOCALBASE%%/ffmpeg4;%%LOCALBASE%%/ffmpeg4/libexec") + ign_pkg_check_modules(SWSCALE libswscale)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304271203.33RC3rtl046042>