<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/19c28c8d4354b5d0d1b86580508dae962a7d572a">https://github.com/macports/macports-ports/commit/19c28c8d4354b5d0d1b86580508dae962a7d572a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 19c28c8d4354b5d0d1b86580508dae962a7d572a
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Thu Jan 18 09:09:54 2018 -0800
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg, ffmpeg-devel: add +jack variant, disabled by default
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Prevents opportunistic linking with libjack.
</span>---
multimedia/ffmpeg-devel/Portfile | 10 +++++++++-
multimedia/ffmpeg/Portfile | 10 +++++++++-
2 files changed, 18 insertions(+), 2 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 6e95b76..75f791f 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;'>@@ -11,7 +11,7 @@ github.setup FFmpeg FFmpeg c7a5e80f569d312c9d2f0dc534e07630eecd5a34
</span> name ffmpeg-devel
conflicts ffmpeg
version 20171210
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> license LGPL-2.1+
categories multimedia
maintainers {devans @dbevans} {jeremyhu @jeremyhu} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -130,6 +130,7 @@ configure.args --enable-swscale \
</span> --enable-fontconfig \
--enable-libfreetype \
--enable-libfribidi \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-libjack \
</span> --disable-libopencore-amrnb \
--disable-libopencore-amrwb \
--disable-libxcb \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -306,6 +307,13 @@ if {[variant_isset high10]} {
</span> require_active_variants x264 "" high10
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant jack description {Enable jack library and indev support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# jack will autoconfigure if not disabled
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:jack
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --disable-libjack \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-indev=jack
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant gpl2 description {Enable GPL code, license will be GPL-2+} {
configure.args-append --enable-gpl \
--enable-postproc \
<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 2be34a5..fb8e213 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;'>@@ -10,7 +10,7 @@ name ffmpeg
</span> conflicts ffmpeg-devel
epoch 1
version 3.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} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -140,6 +140,7 @@ configure.args --enable-swscale \
</span> --enable-fontconfig \
--enable-libfreetype \
--enable-libfribidi \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-jack \
</span> --disable-libopencore-amrnb \
--disable-libopencore-amrwb \
--disable-libxcb \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -329,6 +330,13 @@ if {[variant_isset high10]} {
</span> require_active_variants x264 "" high10
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant jack description {Enable jack library and indev support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# jack will autoconfigure if not disabled
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:jack
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --disable-jack \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-indev=jack
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant gpl2 description {Enable GPL code, license will be GPL-2+} {
configure.args-append --enable-gpl \
--enable-postproc \
</pre><pre style='margin:0'>
</pre>