<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9ac4fcbbeaf0aad8129b8134991d60a8470ec5a4">https://github.com/macports/macports-ports/commit/9ac4fcbbeaf0aad8129b8134991d60a8470ec5a4</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 9ac4fcbbeaf libavif: use external libargparse
</span>9ac4fcbbeaf is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9ac4fcbbeaf0aad8129b8134991d60a8470ec5a4
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Tue Mar 4 15:17:13 2025 -0500
<span style='display:block; white-space:pre;color:#404040;'> libavif: use external libargparse
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/72120
</span>---
multimedia/libavif/Portfile | 17 ++++++----
.../libavif/files/patch-cmake-libargparse.diff | 36 ++++++++++++++++++++
multimedia/libavif/files/patch-libargparse.diff | 38 ----------------------
3 files changed, 47 insertions(+), 44 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libavif/Portfile b/multimedia/libavif/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d2dfb366813..f742ac0103f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/libavif/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libavif/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup compiler_blacklist_versions 1.0
</span> PortGroup github 1.0
github.setup AOMediaCodec libavif 1.2.0 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span>
checksums rmd160 d2f4b6bdfa31f8d5365b2cdd64e77a628231722d \
sha256 2182f4900d1a9617cee89746922a58dd825f2a3547f23907b8d78dc3685f7d8c \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +23,13 @@ github.tarball_from archive
</span>
cmake.generator Ninja
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Upstream patch to fix build errors on oler macOS releases. But this is only a temporary fix.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Ultimately we need to patch the build to build and link with port 'libargparse'; that is forthcoming.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-libargparse.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Patch cmake script to use installed libargparse; to be contributed to upstream
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-cmake-libargparse.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Remove script which downloads and builds private libargparse
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${worksrcpath}/cmake/Modules/LocalLibargparse.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
depends_build-append \
path:bin/git:git \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,6 +38,7 @@ depends_build-append \
</span> depends_lib-append \
port:aom \
port:dav1d \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libargparse \
</span> path:include/turbojpeg.h:libjpeg-turbo \
port:libpng \
port:libyuv \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,13 +50,13 @@ compiler.blacklist-append \
</span> {clang < 600}
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DAVIF_BUILD_APPS:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DAVIF_BUILD_APPS=ON \
</span> -DAVIF_CODEC_AOM=SYSTEM \
-DAVIF_CODEC_DAV1D=SYSTEM \
-DAVIF_CODEC_LIBGAV1=OFF \
-DAVIF_CODEC_RAV1E=OFF \
-DAVIF_CODEC_SVT=SYSTEM \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DAVIF_ENABLE_WERROR:BOOL=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DAVIF_ENABLE_WERROR=OFF
</span>
platform darwin {
if {${os.major} < 10 || (${os.major} == 10 && ${configure.build_arch} eq "ppc")} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libavif/files/patch-cmake-libargparse.diff b/multimedia/libavif/files/patch-cmake-libargparse.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..186414f6fc3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libavif/files/patch-cmake-libargparse.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,36 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# libavif: patch cmake file, to use external libargparse
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Author: Christopher Nielsen @ MacPorts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Date: 2025-03-04
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2025-03-04 15:06:06.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2025-03-04 15:07:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,7 +30,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(ExternalProject)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(FetchContent)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-include(FindPkgConfig)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++find_package(PkgConfig REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(AvifExternalProjectUtils)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option(AVIF_ENABLE_NODISCARD "Add [[nodiscard]] to some functions. CMake must be at least 3.21 to force C23." OFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -716,7 +716,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(avifdec avif_apps avif avif_enable_warnings)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- include(LocalLibargparse)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pkg_check_modules(LIBARGPARSE REQUIRED libargparse)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(AVIFGAINMAPUTIL_SRCS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ apps/avifgainmaputil/avifgainmaputil.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -739,7 +739,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_target_properties(avifgainmaputil PROPERTIES LINKER_LANGUAGE "CXX")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- target_link_libraries(avifgainmaputil libargparse avif_apps avif avif_enable_warnings)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_include_directories(avifgainmaputil SYSTEM PRIVATE ${LIBARGPARSE_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_link_libraries(avifgainmaputil ${LIBARGPARSE_LINK_LIBRARIES} avif_apps avif avif_enable_warnings)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(NOT SKIP_INSTALL_APPS AND NOT SKIP_INSTALL_ALL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libavif/files/patch-libargparse.diff b/multimedia/libavif/files/patch-libargparse.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fc5fa681e76..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/libavif/files/patch-libargparse.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,38 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#==================================================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# From: Maryla
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Date: Fri, 28 Feb 2025 13:49:37 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Subject: [PATCH] libargparse: use a git patch file instead of sed command
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# This should work better cross platform.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#==================================================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/Modules/LocalLibargparse.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/Modules/LocalLibargparse.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,10 +24,7 @@ else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GIT_REPOSITORY "https://github.com/kmurray/libargparse.git"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GIT_TAG ${AVIF_LIBARGPARSE_GIT_TAG}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO(vrabaud) remove once CMake 3.13 is not supported anymore.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PATCH_COMMAND
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sed -i.bak -e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "s:install.*:include(GNUInstallDirs)\\\\ninstall(TARGETS libargparse RUNTIME DESTINATION \\\\$\\\\{CMAKE_INSTALL_BINDIR\\\\} LIBRARY DESTINATION \\\\$\\\\{CMAKE_INSTALL_LIBDIR\\\\} ARCHIVE DESTINATION \\\\$\\\\{CMAKE_INSTALL_LIBDIR\\\\}):"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PATCH_COMMAND git apply --ignore-whitespace "${AVIF_SOURCE_DIR}/ext/libargparse.patch"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UPDATE_COMMAND ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- avif_fetchcontent_populate_cmake(libargparse)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/libargparse.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+index 8ca16ae..605a062 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+--- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@@ -21,7 +21,8 @@ add_library(libargparse STATIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set_target_properties(libargparse PROPERTIES PREFIX "") #Avoid extra 'lib' prefix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set_target_properties(libargparse PROPERTIES PUBLIC_HEADER "${LIB_HEADERS}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_include_directories(libargparse PUBLIC ${LIB_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+-install(TARGETS libargparse)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-++include(GNUInstallDirs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-++install(TARGETS libargparse RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #Create the test executable
</span></pre><pre style='margin:0'>
</pre>