diff --git a/devel/ignition-cmake/Makefile b/devel/ignition-cmake/Makefile index 245a2582e1ad..d06019853476 100644 --- a/devel/ignition-cmake/Makefile +++ b/devel/ignition-cmake/Makefile @@ -1,37 +1,42 @@ PORTNAME= ignition-cmake -DISTVERSIONPREFIX= ignition-cmake2_ -DISTVERSION= 2.18.0 +DISTVERSIONPREFIX= gz-cmake5_ +DISTVERSION= 5.0.0 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org COMMENT= CMake modules to be used by the Ignition projects WWW= https://gazebosim.org/home \ https://github.com/gazebosim/gz-cmake LICENSE= APACHE20 -USES= cmake pkgconfig ruby +USES= cmake pkgconfig python:build,run ruby shebangfix + +SHEBANG_FILES= benchmark/run_benchmarks.py \ + codecheck/cpplint.py \ + tools/check_test_ran.py \ + tools/print_package_xml_version.py CMAKE_OFF= BUILD_TESTING USE_GITHUB= yes GH_ACCOUNT= gazebosim GH_PROJECT= gz-cmake 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 diff --git a/devel/ignition-cmake/distinfo b/devel/ignition-cmake/distinfo index 31212f07a91a..ffba360a10a5 100644 --- a/devel/ignition-cmake/distinfo +++ b/devel/ignition-cmake/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1779056780 -SHA256 (gazebosim-gz-cmake-ignition-cmake2_2.18.0_GH0.tar.gz) = 06d0f38718e76e5bdf4fe9522d59cefcc4dbf7d4391094b6720512d02a2d5c4e -SIZE (gazebosim-gz-cmake-ignition-cmake2_2.18.0_GH0.tar.gz) = 273579 +TIMESTAMP = 1779173909 +SHA256 (gazebosim-gz-cmake-gz-cmake5_5.0.0_GH0.tar.gz) = 961f72a8af2c76585d7f3bee695c648b885a07f446248c923f4d25ae34b326a3 +SIZE (gazebosim-gz-cmake-gz-cmake5_5.0.0_GH0.tar.gz) = 287962 diff --git a/devel/ignition-cmake/files/patch-cmake_FindAVCODEC.cmake b/devel/ignition-cmake/files/patch-cmake_FindAVCODEC.cmake index 4b9304f922f7..8515b895d45f 100644 --- a/devel/ignition-cmake/files/patch-cmake_FindAVCODEC.cmake +++ b/devel/ignition-cmake/files/patch-cmake_FindAVCODEC.cmake @@ -1,8 +1,9 @@ ---- cmake/FindAVCODEC.cmake.orig 2023-04-24 07:29:13 UTC +-- Help cmake find avcodec from multimedia/ffmpeg4, which installs to %%LOCALBASE%%/ffmpeg4 +--- cmake/FindAVCODEC.cmake.orig 2024-01-01 00:00:00 UTC +++ cmake/FindAVCODEC.cmake @@ -16,4 +16,5 @@ ######################################## # Find avcodec - include(IgnPkgConfig) + include(GzPkgConfig) +set(CMAKE_PREFIX_PATH "%%LOCALBASE%%/ffmpeg4;%%LOCALBASE%%/ffmpeg4/libexec") - ign_pkg_check_modules(AVCODEC libavcodec) + gz_pkg_check_modules_quiet(AVCODEC libavcodec) diff --git a/devel/ignition-cmake/files/patch-cmake_FindAVDEVICE.cmake b/devel/ignition-cmake/files/patch-cmake_FindAVDEVICE.cmake index 640a2079d5dc..bff51a3ccf79 100644 --- a/devel/ignition-cmake/files/patch-cmake_FindAVDEVICE.cmake +++ b/devel/ignition-cmake/files/patch-cmake_FindAVDEVICE.cmake @@ -1,8 +1,9 @@ ---- cmake/FindAVDEVICE.cmake.orig 2023-04-24 07:29:47 UTC +-- Help cmake find avdevice from multimedia/ffmpeg4, which installs to %%LOCALBASE%%/ffmpeg4 +--- cmake/FindAVDEVICE.cmake.orig 2024-01-01 00:00:00 UTC +++ cmake/FindAVDEVICE.cmake @@ -20,4 +20,5 @@ set(av_minor ${AVDEVICE_FIND_VERSION_MINOR}) set(av_patch ${AVDEVICE_FIND_VERSION_PATCH}) - include(IgnPkgConfig) + include(GzPkgConfig) +set(CMAKE_PREFIX_PATH "%%LOCALBASE%%/ffmpeg4;%%LOCALBASE%%/ffmpeg4/libexec") - ign_pkg_check_modules(AVDEVICE "libavdevice >= ${av_major}.${av_minor}.${av_patch}") + gz_pkg_check_modules_quiet(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 index 60567157f9e8..430b0d882970 100644 --- a/devel/ignition-cmake/files/patch-cmake_FindAVFORMAT.cmake +++ b/devel/ignition-cmake/files/patch-cmake_FindAVFORMAT.cmake @@ -1,8 +1,9 @@ ---- cmake/FindAVFORMAT.cmake.orig 2023-04-24 07:30:02 UTC +-- Help cmake find avformat from multimedia/ffmpeg4, which installs to %%LOCALBASE%%/ffmpeg4 +--- cmake/FindAVFORMAT.cmake.orig 2024-01-01 00:00:00 UTC +++ cmake/FindAVFORMAT.cmake @@ -16,4 +16,5 @@ ######################################## # Find AV format - include(IgnPkgConfig) + include(GzPkgConfig) +set(CMAKE_PREFIX_PATH "%%LOCALBASE%%/ffmpeg4;%%LOCALBASE%%/ffmpeg4/libexec") - ign_pkg_check_modules(AVFORMAT libavformat) + gz_pkg_check_modules_quiet(AVFORMAT libavformat) diff --git a/devel/ignition-cmake/files/patch-cmake_FindAVUTIL.cmake b/devel/ignition-cmake/files/patch-cmake_FindAVUTIL.cmake index eaacfdf00a22..107c41191f41 100644 --- a/devel/ignition-cmake/files/patch-cmake_FindAVUTIL.cmake +++ b/devel/ignition-cmake/files/patch-cmake_FindAVUTIL.cmake @@ -1,8 +1,9 @@ ---- cmake/FindAVUTIL.cmake.orig 2023-04-24 07:30:38 UTC +-- Help cmake find avutil from multimedia/ffmpeg4, which installs to %%LOCALBASE%%/ffmpeg4 +--- cmake/FindAVUTIL.cmake.orig 2024-01-01 00:00:00 UTC +++ cmake/FindAVUTIL.cmake @@ -16,4 +16,5 @@ ######################################## # Find avutil - include(IgnPkgConfig) + include(GzPkgConfig) +set(CMAKE_PREFIX_PATH "%%LOCALBASE%%/ffmpeg4;%%LOCALBASE%%/ffmpeg4/libexec") - ign_pkg_check_modules(AVUTIL libavutil) + gz_pkg_check_modules_quiet(AVUTIL libavutil) diff --git a/devel/ignition-cmake/files/patch-cmake_FindSWSCALE.cmake b/devel/ignition-cmake/files/patch-cmake_FindSWSCALE.cmake index 79c83b834b34..94664e34bd78 100644 --- a/devel/ignition-cmake/files/patch-cmake_FindSWSCALE.cmake +++ b/devel/ignition-cmake/files/patch-cmake_FindSWSCALE.cmake @@ -1,8 +1,9 @@ ---- cmake/FindSWSCALE.cmake.orig 2023-04-25 18:35:25 UTC +-- Help cmake find swscale from multimedia/ffmpeg4, which installs to %%LOCALBASE%%/ffmpeg4 +--- cmake/FindSWSCALE.cmake.orig 2024-01-01 00:00:00 UTC +++ cmake/FindSWSCALE.cmake @@ -16,4 +16,5 @@ ######################################## # Find libswscale format - include(IgnPkgConfig) + include(GzPkgConfig) +set(CMAKE_PREFIX_PATH "%%LOCALBASE%%/ffmpeg4;%%LOCALBASE%%/ffmpeg4/libexec") - ign_pkg_check_modules(SWSCALE libswscale) + gz_pkg_check_modules_quiet(SWSCALE libswscale) diff --git a/devel/ignition-cmake/pkg-plist b/devel/ignition-cmake/pkg-plist index eda53b20a110..cc01588fc1b9 100644 --- a/devel/ignition-cmake/pkg-plist +++ b/devel/ignition-cmake/pkg-plist @@ -1,80 +1,87 @@ -include/ignition/cmake2/gz/utilities/ExtraTestMacros.hh -include/ignition/cmake2/gz/utilities/SuppressWarning.hh -include/ignition/cmake2/gz/utilities/detail/ExtraTestMacros.hh -include/ignition/cmake2/gz/utilities/detail/SuppressWarning.hh -include/ignition/cmake2/ignition/utilities/ExtraTestMacros.hh -include/ignition/cmake2/ignition/utilities/SuppressWarning.hh -libdata/pkgconfig/ignition-cmake2.pc -share/cmake/ignition-cmake2/cmake2/Export.hh.in -share/cmake/ignition-cmake2/cmake2/FindAVCODEC.cmake -share/cmake/ignition-cmake2/cmake2/FindAVDEVICE.cmake -share/cmake/ignition-cmake2/cmake2/FindAVFORMAT.cmake -share/cmake/ignition-cmake2/cmake2/FindAVUTIL.cmake -share/cmake/ignition-cmake2/cmake2/FindCPPZMQ.cmake -share/cmake/ignition-cmake2/cmake2/FindDL.cmake -share/cmake/ignition-cmake2/cmake2/FindEIGEN3.cmake -share/cmake/ignition-cmake2/cmake2/FindFreeImage.cmake -share/cmake/ignition-cmake2/cmake2/FindGTS.cmake -share/cmake/ignition-cmake2/cmake2/FindIFADDRS.cmake -share/cmake/ignition-cmake2/cmake2/FindIgnBullet.cmake -share/cmake/ignition-cmake2/cmake2/FindIgnCURL.cmake -share/cmake/ignition-cmake2/cmake2/FindIgnOGRE.cmake -share/cmake/ignition-cmake2/cmake2/FindIgnOGRE2.cmake -share/cmake/ignition-cmake2/cmake2/FindIgnProtobuf.cmake -share/cmake/ignition-cmake2/cmake2/FindIgnURDFDOM.cmake -share/cmake/ignition-cmake2/cmake2/FindJSONCPP.cmake -share/cmake/ignition-cmake2/cmake2/FindODE.cmake -share/cmake/ignition-cmake2/cmake2/FindOptiX.cmake -share/cmake/ignition-cmake2/cmake2/FindSQLite3.cmake -share/cmake/ignition-cmake2/cmake2/FindSWSCALE.cmake -share/cmake/ignition-cmake2/cmake2/FindTINYXML2.cmake -share/cmake/ignition-cmake2/cmake2/FindUUID.cmake -share/cmake/ignition-cmake2/cmake2/FindYAML.cmake -share/cmake/ignition-cmake2/cmake2/FindZIP.cmake -share/cmake/ignition-cmake2/cmake2/FindZeroMQ.cmake -share/cmake/ignition-cmake2/cmake2/IgnBenchmark.cmake -share/cmake/ignition-cmake2/cmake2/IgnCMake.cmake -share/cmake/ignition-cmake2/cmake2/IgnCheckSSE.cmake -share/cmake/ignition-cmake2/cmake2/IgnCodeCheck.cmake -share/cmake/ignition-cmake2/cmake2/IgnCodeCoverage.cmake -share/cmake/ignition-cmake2/cmake2/IgnConfigureBuild.cmake -share/cmake/ignition-cmake2/cmake2/IgnConfigureProject.cmake -share/cmake/ignition-cmake2/cmake2/IgnCreateDocs.cmake -share/cmake/ignition-cmake2/cmake2/IgnGenerateVersionInfo.cmake -share/cmake/ignition-cmake2/cmake2/IgnImportTarget.cmake -share/cmake/ignition-cmake2/cmake2/IgnManualSearch.cmake -share/cmake/ignition-cmake2/cmake2/IgnPackaging.cmake -share/cmake/ignition-cmake2/cmake2/IgnPkgConfig.cmake -share/cmake/ignition-cmake2/cmake2/IgnPython.cmake -share/cmake/ignition-cmake2/cmake2/IgnRonn2Man.cmake -share/cmake/ignition-cmake2/cmake2/IgnSanitizers.cmake -share/cmake/ignition-cmake2/cmake2/IgnSetCompilerFlags.cmake -share/cmake/ignition-cmake2/cmake2/IgnUtils.cmake -share/cmake/ignition-cmake2/cmake2/JoinPaths.cmake -share/cmake/ignition-cmake2/cmake2/cmake_uninstall.cmake.in -share/cmake/ignition-cmake2/cmake2/cpack_options.cmake.in -share/cmake/ignition-cmake2/cmake2/ign_auto_headers.hh.in -share/cmake/ignition-cmake2/cmake2/ignition-all-config.cmake.in -share/cmake/ignition-cmake2/cmake2/ignition-component-config.cmake.in -share/cmake/ignition-cmake2/cmake2/ignition-config.cmake.in -share/cmake/ignition-cmake2/cmake2/pkgconfig/ignition-component.pc.in -share/cmake/ignition-cmake2/cmake2/pkgconfig/ignition.pc.in -share/cmake/ignition-cmake2/cmake2/upload_doc.sh.in -share/cmake/ignition-cmake2/cmake2/version_info.json.in -share/cmake/ignition-cmake2/ignition-cmake2-config-version.cmake -share/cmake/ignition-cmake2/ignition-cmake2-config.cmake -share/cmake/ignition-cmake2/ignition-cmake2-utilities-targets.cmake -share/ignition/ignition-cmake2/benchmark/run_benchmarks.py -share/ignition/ignition-cmake2/codecheck/cpplint.py -share/ignition/ignition-cmake2/codecheck/header_guard.rule -share/ignition/ignition-cmake2/codecheck/namespace_AZ.rule -share/ignition/ignition-cmake2/doxygen/api.in -share/ignition/ignition-cmake2/doxygen/cppreference.tag.xml -share/ignition/ignition-cmake2/doxygen/footer.html -share/ignition/ignition-cmake2/doxygen/header.html -share/ignition/ignition-cmake2/doxygen/layout.xml -share/ignition/ignition-cmake2/tools/check_test_ran.py -share/ignition/ignition-cmake2/tools/doc_check.sh -@owner -@group -@mode +libdata/pkgconfig/gz-cmake.pc +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/Export.hh.in +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/FindAVCODEC.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/FindAVDEVICE.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/FindAVFORMAT.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/FindAVUTIL.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/FindCPPZMQ.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/FindDL.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/FindEIGEN3.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/FindFreeImage.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/FindGTS.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/FindGzAssimp.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/FindGzBullet.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/FindGzCURL.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/FindGzOGRE.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/FindGzOGRE2.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/FindGzOGRENext.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/FindGzProtobuf.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/FindGzURDFDOM.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/FindIFADDRS.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/FindJSONCPP.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/FindODE.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/FindOptiX.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/FindSQLite3.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/FindSWSCALE.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/FindTINYXML2.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/FindUUID.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/FindYAML.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/FindZIP.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/FindZeroMQ.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/GzAddComponent.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/GzBenchmark.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/GzBuildExamples.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/GzBuildExecutables.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/GzBuildTests.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/GzCMake.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/GzCheckSSE.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/GzCmakeLogging.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/GzCodeCheck.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/GzCodeCoverage.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/GzConfigureBuild.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/GzConfigureProject.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/GzCreateCoreLibrary.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/GzCreateDocs.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/GzCxxStandard.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/GzFindPackage.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/GzGenerateVersionInfo.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/GzGetLibSourcesAndUnitTests.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/GzGetPackageXmlVersion.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/GzGetSources.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/GzImportTarget.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/GzInstallAllHeaders.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/GzManualSearch.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/GzPackaging.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/GzPkgConfig.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/GzPython.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/GzRelocatableBinaries.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/GzRonn2Man.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/GzSanitizers.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/GzSetCompilerFlags.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/GzStringAppend.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/GzUtils.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/JoinPaths.cmake +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/cmake_uninstall.cmake.in +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/cpack_options.cmake.in +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/gz-all-config.cmake.in +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/gz-component-config.cmake.in +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/gz-config.cmake.in +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/gz_auto_headers.hh.in +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/pkgconfig/gz-component.pc.in +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/pkgconfig/gz.pc.in +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/upload_doc.sh.in +share/cmake/gz-cmake/%%CMAKE_IGN_VER%%/version_info.json.in +share/cmake/gz-cmake/gz-cmake-config-version.cmake +share/cmake/gz-cmake/gz-cmake-config.cmake +share/gz/gz-cmake/benchmark/run_benchmarks.py +share/gz/gz-cmake/codecheck/cpplint.py +share/gz/gz-cmake/codecheck/header_guard.rule +share/gz/gz-cmake/codecheck/namespace_AZ.rule +share/gz/gz-cmake/doxygen/api.in +share/gz/gz-cmake/doxygen/cppreference.tag.xml +share/gz/gz-cmake/doxygen/footer.html +share/gz/gz-cmake/doxygen/header.html +share/gz/gz-cmake/doxygen/layout.xml +share/gz/gz-cmake/tools/check_test_ran.py +share/gz/gz-cmake/tools/doc_check.sh +share/gz/gz-cmake/tools/print_package_xml_version.py