<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/7140f9abd8a02c362786067a4281d0edde548bc0">https://github.com/macports/macports-ports/commit/7140f9abd8a02c362786067a4281d0edde548bc0</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 7140f9abd8a ffmpeg: remove ascii art from notes
</span>7140f9abd8a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7140f9abd8a02c362786067a4281d0edde548bc0
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Tue May 18 09:23:47 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg: remove ascii art from notes
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/54632
</span>---
multimedia/ffmpeg/Portfile | 80 +++++++++++++++++-----------------------------
1 file changed, 29 insertions(+), 51 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 56f4480a6d8..b24abb7f122 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;'>@@ -371,66 +371,44 @@ variant nonfree description {enable nonfree code, libraries and binaries will no
</span>
if {[variant_isset nonfree]} {
notes "
<span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* This build of ${name} includes nonfree code as follows:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* libfdk-aac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* The following libraries and binaries may not be redistributed:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* ffmpeg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* libavcodec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* libavdevice
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* libavfilter
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* libavformat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* libavutil
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* To remove this restriction remove the variant +nonfree
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This build of ${name} includes nonfree code as follows:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libfdk-aac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The following libraries and binaries may not be redistributed:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ffmpeg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libavcodec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libavdevice
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libavfilter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libavformat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libavutil
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+To remove this restriction remove the variant +nonfree
</span> "
} elseif {[variant_isset gpl3]} {
notes "
<span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* This build of ${name} includes GPLed code and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* is therefore licensed under GPL v3 or later.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* The following modules are GPLed:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* postproc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* libsambaclient
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* libx264
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* libx265
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* libxvid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* To include all nonfree, GPLed and LGPL code use variant +nonfree.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* To remove nonfree and GPLed code leaving only LGPL code remove the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* +gpl2 and +gpl3 variants.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This build of ${name} includes GPLed code and is therefore licensed under GPL v3 or later.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The following modules are GPLed:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ postproc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libsambaclient
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libx264
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libx265
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libxvid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+To include all nonfree, GPLed and LGPL code use variant +nonfree.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+To remove nonfree and GPLed code leaving only LGPL code remove the +gpl2 and +gpl3 variants.
</span> "
} elseif {[variant_isset gpl2]} {
notes "
<span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* This build of ${name} includes GPLed code and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* is therefore licensed under GPL v2 or later.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* The following modules are GPLed:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* postproc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* libx264
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* libx265
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* libxvid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* To include all nonfree, GPLed and LGPL code use variant +nonfree.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* To remove nonfree and GPLed code leaving only LGPL code remove the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* +gpl2 variant.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This build of ${name} includes GPLed code and is therefore licensed under GPL v2 or later.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The following modules are GPLed:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ postproc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libx264
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libx265
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libxvid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+To include all nonfree, GPLed and LGPL code use variant +nonfree.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+To remove nonfree and GPLed code leaving only LGPL code remove the +gpl2 variant.
</span> "
} else {
notes "
<span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* This build of ${name} includes no GPLed or nonfree
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* code and is therefore licensed under LGPL v2.1 or later.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This build of ${name} includes no GPLed or nonfree code\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+and is therefore licensed under LGPL v2.1 or later.
</span> "
}
</pre><pre style='margin:0'>
</pre>