<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/75aff96c657f0f3e5b0aa9e0f1aa3b66a3477ee3">https://github.com/macports/macports-ports/commit/75aff96c657f0f3e5b0aa9e0f1aa3b66a3477ee3</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 75aff96c657f0f3e5b0aa9e0f1aa3b66a3477ee3
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Tue Feb 13 10:19:20 2018 -0800
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg-devel: update to git master as of 20180213
</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-devel/Portfile | 14 +++++++-------
.../patch-configure-no-error-on-missing-prototypes.diff | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg-devel/Portfile b/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b2836c3..b4234cd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,10 +7,10 @@ PortGroup compiler_blacklist_versions 1.0
</span> PortGroup active_variants 1.1
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup FFmpeg FFmpeg cb97400f93ba925485ef0af976cd656b90a9ba86
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup FFmpeg FFmpeg 474194a8d0f2812802c275f6ed4f0fd5cd58ae0e
</span> name ffmpeg-devel
conflicts ffmpeg
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20180208
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20180213
</span> license LGPL-2.1+
categories multimedia
maintainers {devans @dbevans} {jeremyhu @jeremyhu} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,9 +49,9 @@ long_description FFmpeg is a complete solution to record, convert and \
</span> platforms darwin
homepage http://www.ffmpeg.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 4d099fe2dced3ec126c4a9617f16f1bfa30c54a5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5a629518ba72f4ab4a283a55387337c7603fa791ee566423aef04a9a5f8d899f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 12304948
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 cdb8d288786d42ac648d163a511e3b46a5efc73d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0f2ea246b7bea3018ec9de39a538c0bdc9dadc5cd9d94ec22b9b082affdd46e3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 12312808
</span>
depends_build port:pkgconfig \
port:gmake \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -244,7 +244,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;'>@@ -252,7 +252,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-devel/files/patch-configure-no-error-on-missing-prototypes.diff b/multimedia/ffmpeg-devel/files/patch-configure-no-error-on-missing-prototypes.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 2fc006a..a8cf7b0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg-devel/files/patch-configure-no-error-on-missing-prototypes.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg-devel/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;'>-@@ -6413,7 +6413,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6439,7 +6439,6 @@
</span> check_optflags -fno-tree-vectorize
check_cflags -Werror=format-security
check_cflags -Werror=implicit-function-declaration
</pre><pre style='margin:0'>
</pre>