<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2e75af42a587930284e26fd93370a6fcad5d707e">https://github.com/macports/macports-ports/commit/2e75af42a587930284e26fd93370a6fcad5d707e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2e75af42a587930284e26fd93370a6fcad5d707e
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Tue Feb 13 10:15:51 2018 -0800
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg: update to version 3.4.2, dependencies
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Prefers nasm over yasm for x86 assembly code.
</span>---
multimedia/ffmpeg/Portfile | 13 ++++++-------
.../patch-configure-no-error-on-missing-prototypes.diff | 2 +-
2 files changed, 7 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg/Portfile b/multimedia/ffmpeg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8cc8f03..ea9f417 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,8 +9,7 @@ PortGroup active_variants 1.1
</span> name ffmpeg
conflicts ffmpeg-devel
epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.4.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.4.2
</span> license LGPL-2.1+
categories multimedia
maintainers {devans @dbevans} {jeremyhu @jeremyhu} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,9 +51,9 @@ master_sites http://www.ffmpeg.org/releases/
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 0cad66d5bee31586fa1885794140ccad1a348b0b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5a77278a63741efa74e26bf197b9bb09ac6381b9757391b922407210f0f991c0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 8481964
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 97751ae03808242ced7cc9495f999a3b1760325c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2b92e9578ef8b3e49eeab229e69305f5f4cbc1fdaa22e927fc7fca18acccd740 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 8478376
</span>
# root directory of extracted tarball is owned by root and has permissions 700
# set to 755 to facilitate maintenance
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -263,7 +262,7 @@ if {[variant_isset universal]} {
</span> lappend merger_configure_env($arch) ASFLAGS='-arch ${arch}'
}
if {[string match "*86*" ${configure.universal_archs}]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:yasm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:nasm
</span> }
lappend merger_configure_args(i386) --enable-x86asm
lappend merger_configure_args(x86_64) --enable-x86asm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -271,7 +270,7 @@ if {[variant_isset universal]} {
</span> configure.args-append --arch=${configure.build_arch}
configure.env-append ASFLAGS='[get_canonical_archflags]'
if {${build_arch} eq "i386" || ${build_arch} eq "x86_64"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:yasm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:nasm
</span> configure.args-append --enable-x86asm
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg/files/patch-configure-no-error-on-missing-prototypes.diff b/multimedia/ffmpeg/files/patch-configure-no-error-on-missing-prototypes.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c6ee549..126d528 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg/files/patch-configure-no-error-on-missing-prototypes.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg/files/patch-configure-no-error-on-missing-prototypes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- configure.old 2015-09-27 18:43:30.000000000 +0200
+++ configure 2015-09-27 18:44:18.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6480,7 +6480,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6481,7 +6481,6 @@
</span> check_optflags -fno-tree-vectorize
check_cflags -Werror=format-security
check_cflags -Werror=implicit-function-declaration
</pre><pre style='margin:0'>
</pre>