<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/67bbabc559afa21076ed4b5553f21b89670bd8a7">https://github.com/macports/macports-ports/commit/67bbabc559afa21076ed4b5553f21b89670bd8a7</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 67bbabc559a ffmpeg/ffmpeg-devel: use path dep for samba3; remove variant samba3 - Port works with both 'samba3' and 'samba4', allowing user to install either - Also switch back to 'samba3' as the default, to minimize user pain See: https://trac.macports.org/ticket/64890
</span>67bbabc559a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 67bbabc559afa21076ed4b5553f21b89670bd8a7
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Tue Mar 29 08:19:36 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg/ffmpeg-devel: use path dep for samba3; remove variant samba3
</span><span style='display:block; white-space:pre;color:#404040;'> - Port works with both 'samba3' and 'samba4', allowing user to install either
</span><span style='display:block; white-space:pre;color:#404040;'> - Also switch back to 'samba3' as the default, to minimize user pain
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/64890
</span>---
multimedia/ffmpeg-devel/Portfile | 9 ++-------
multimedia/ffmpeg/Portfile | 9 ++-------
2 files changed, 4 insertions(+), 14 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 d156a7745e8..97c25415411 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;'>@@ -19,7 +19,7 @@ conflicts ffmpeg
</span> # Please increase the revision of mpv whenever ffmpeg's version is updated.
epoch 0
version 5.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> license LGPL-2.1+
categories multimedia
maintainers {devans @dbevans} {jeremyhu @jeremyhu} {mascguy @mascguy} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -369,17 +369,12 @@ variant gpl3 requires gpl2 description {Enable GPL code, license will be GPL-3+}
</span> --enable-libsmbclient \
--enable-libaribb24
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:samba4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append path:lib/pkgconfig/smbclient.pc:samba3 \
</span> port:libaribb24
license GPL-3+
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant samba3 requires gpl3 description {Use Samba 3, rather than Samba 4, for gpl3 variant} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-replace port:samba4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:samba3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # the build server uses the default variants, and we want distributable binaries
# nonfree code is disabled by default but can be enabled using the +nonfree variant
<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 fb9cb04fc0d..9b1d1b7a993 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;'>@@ -19,7 +19,7 @@ conflicts ffmpeg-devel
</span> # Please increase the revision of mpv whenever ffmpeg's version is updated.
epoch 1
version 4.4.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> license LGPL-2.1+
categories multimedia
maintainers {devans @dbevans} {jeremyhu @jeremyhu} {mascguy @mascguy} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -376,17 +376,12 @@ variant gpl3 requires gpl2 description {Enable GPL code, license will be GPL-3+}
</span> --enable-libsmbclient \
--enable-libaribb24
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:samba4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append path:lib/pkgconfig/smbclient.pc:samba3 \
</span> port:libaribb24
license GPL-3+
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant samba3 requires gpl3 description {Use Samba 3, rather than Samba 4, for gpl3 variant} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-replace port:samba4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:samba3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # the build server uses the default variants, and we want distributable binaries
# nonfree code is disabled by default but can be enabled using the +nonfree variant
</pre><pre style='margin:0'>
</pre>