<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f0fc8a53ec9a9ce92ae4125636f879380f3f27f7">https://github.com/macports/macports-ports/commit/f0fc8a53ec9a9ce92ae4125636f879380f3f27f7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f0fc8a53ec9a9ce92ae4125636f879380f3f27f7
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Wed Aug 2 13:40:12 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> avidemux: fix errors with newer compilers
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> remove VERSION file, which conflicts with c++17 header
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> use upstream patch to fix c++11 narrowing error
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> both of these issues should be resolved with the next
</span><span style='display:block; white-space:pre;color:#404040;'> update to avidemux, as fixes have been incorporated upstream
</span>---
multimedia/avidemux/Portfile | 10 ++++++
.../65878cb39f3d9a2e51cb248cdab9724824f80558.patch | 37 ++++++++++++++++++++++
.../files/patch-avidemux-remove-VERSION.diff | 13 ++++++++
3 files changed, 60 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/avidemux/Portfile b/multimedia/avidemux/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1e55f97c082..668e8c0d64d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/avidemux/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/avidemux/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,6 +46,16 @@ patchfiles-append 0001-ADM_imageSave.cpp-add-missing-header.patch \
</span> 0002-ADM_coreUtils.h-fix-symbols-export.patch \
0003-Fix-missing-ADM_swap64.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# remove VERSION file from ffmpeg source, that conflicts with newer compilers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# that have a <version> header. The VERSION file has been removed in ffmpeg 6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# which will be used in the next release of avidemux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-avidemux-remove-VERSION.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix c++11-narrowing error using upstream patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/mean00/avidemux2/commit/65878cb39f3d9a2e51cb248cdab9724824f80558
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 65878cb39f3d9a2e51cb248cdab9724824f80558.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append port:bash \
port:gmake \
port:pkgconfig \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/avidemux/files/65878cb39f3d9a2e51cb248cdab9724824f80558.patch b/multimedia/avidemux/files/65878cb39f3d9a2e51cb248cdab9724824f80558.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a3cccfc2891
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/avidemux/files/65878cb39f3d9a2e51cb248cdab9724824f80558.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,37 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 65878cb39f3d9a2e51cb248cdab9724824f80558 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: listout <listout@protonmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 7 Mar 2023 13:27:46 +0530
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix Fixes non-constant-expression cannot be narrowed from
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ type 'uint32_t' error with clang-16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Clang 16 (to be released appx. March 2023) will make the following default errors:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Werror=implicit-function-declaration
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Werror=implicit-int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Werror=int-conversion (this is in Clang 15, actually)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Werror=incompatible-function-pointer-types (GCC does not have a specific equivalent error, use -Werror=incompatible-pointer-types instead when testing)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Building with Clang-16 results in build failure with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+non-constant-expression cannot be narrowed from type 'uint32_t' error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+with clang-16. Following what the compiler suggests, adding a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static_cast<int> helps suppress the error.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: listout <brahmajit.xyz@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ avidemux_core/ADM_coreImage/src/ADM_colorspace.cpp | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git avidemux_core/ADM_coreImage/src/ADM_colorspace.cpp avidemux_core/ADM_coreImage/src/ADM_colorspace.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 41628dd347..a6a4834a3e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- avidemux_core/ADM_coreImage/src/ADM_colorspace.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ avidemux_core/ADM_coreImage/src/ADM_colorspace.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -637,8 +637,8 @@ void * ADMRGB32Scaler::planeWorker(void *argptr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // resize plane
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int xs[4]={ADM_IMAGE_ALIGN(arg->srcWidth),0,0,0};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int xd[4]={ADM_IMAGE_ALIGN(arg->dstWidth),0,0,0};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int xs[4]={static_cast<int>(ADM_IMAGE_ALIGN(arg->srcWidth)),0,0,0};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int xd[4]={static_cast<int>(ADM_IMAGE_ALIGN(arg->dstWidth)),0,0,0};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint8_t *src[4]={NULL,NULL,NULL,NULL};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint8_t *dst[4]={NULL,NULL,NULL,NULL};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src[0]=arg->iPlane;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/avidemux/files/patch-avidemux-remove-VERSION.diff b/multimedia/avidemux/files/patch-avidemux-remove-VERSION.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..cb2ef4841b4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/avidemux/files/patch-avidemux-remove-VERSION.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git avidemux_core/ffmpeg_package/patches/remove-version.patch avidemux_core/ffmpeg_package/patches/remove-version.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+new file mode 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0000000..9a1f3d1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ avidemux_core/ffmpeg_package/patches/remove-version.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++diff --git VERSION VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++deleted file mode 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++index 1d068c6..0000000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++--- VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@@ -1 +0,0 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++-4.4.2
</span></pre><pre style='margin:0'>
</pre>