<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f1ec57f590c1c4d6a20bd19bf570a0aaf0fa39b2">https://github.com/macports/macports-ports/commit/f1ec57f590c1c4d6a20bd19bf570a0aaf0fa39b2</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 f1ec57f590c Revert "ffmpeg/ffmpeg-devel: add license_noconflict for openssl11"
</span>f1ec57f590c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f1ec57f590c1c4d6a20bd19bf570a0aaf0fa39b2
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Jul 9 02:44:40 2022 +1000
<span style='display:block; white-space:pre;color:#404040;'> Revert "ffmpeg/ffmpeg-devel: add license_noconflict for openssl11"
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This reverts commit 0778750ef43db61b5b5bf961601d64c66040cafd.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> ffmpeg's license does conflict with openssl's. This belongs in the
</span><span style='display:block; white-space:pre;color:#404040;'> dependencies.
</span>---
multimedia/ffmpeg-devel/Portfile | 3 ---
multimedia/ffmpeg/Portfile | 3 ---
2 files changed, 6 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 96a73be1e69..67fdb4fbed2 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;'>@@ -63,9 +63,6 @@ distname ${my_name}-${version}
</span> dist_subdir ${my_name}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# OpenSSL not used; originates from upstream ports, built with cargo and rust
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license_noconflict openssl11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> checksums rmd160 22a690edfad74f25de0d24557f8edf4b2366b1a0 \
sha256 af419a7f88adbc56c758ab19b4c708afbcae15ef09606b82b855291f6a6faa93 \
size 9562968
<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 f745431bf79..78d79ac9101 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;'>@@ -63,9 +63,6 @@ distname ${my_name}-${version}
</span> dist_subdir ${my_name}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# OpenSSL not used; originates from upstream ports, built with cargo and rust
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license_noconflict openssl11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> checksums rmd160 22a690edfad74f25de0d24557f8edf4b2366b1a0 \
sha256 af419a7f88adbc56c758ab19b4c708afbcae15ef09606b82b855291f6a6faa93 \
size 9562968
</pre><pre style='margin:0'>
</pre>