<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/92557add167966304c941a7c7e855c27f7a79d58">https://github.com/macports/macports-ports/commit/92557add167966304c941a7c7e855c27f7a79d58</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 92557ad ffmpeg: remove +libx265 variant
</span>92557ad is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 92557add167966304c941a7c7e855c27f7a79d58
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Tue Nov 29 13:02:10 2016 -0800
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg: remove +libx265 variant
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> libx265 support is now enabled unconditionally for non-universal builds on 10.6 or greater.
</span>---
multimedia/ffmpeg/Portfile | 16 ++++++----------
1 file changed, 6 insertions(+), 10 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 4c887a2..79fb0ea 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,6 +10,7 @@ name ffmpeg
</span> conflicts ffmpeg-devel
epoch 1
version 3.2.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> license LGPL-2.1+
categories multimedia
maintainers devans jeremyhu openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -295,15 +296,12 @@ variant librtmp description {Use librtmp (from rtmpdump) as rtmp[t][es]:// proto
</span>
# x265 currently does not support OS X < 10.6 (#48336, #48338)
# x265 cmake issues cause universal build to fail (#48331)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# make libx265 support optional via +libx265 variant
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# only define variant for non-universal builds on 10.6 or greater
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# only enable libx265 support for non-universal builds on 10.6 or greater
</span>
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} > 8 && [variant_isset gpl2] && ![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant libx265 description {Build with support for encoding HEVC video using libx265} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-libx265
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:x265
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} > 9 && [variant_isset gpl2] && ![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-libx265
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:x265
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -319,11 +317,9 @@ variant gpl2 description {Enable GPL code, license will be GPL-2+} {
</span> configure.args-append --enable-gpl \
--enable-postproc \
--enable-libx264 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-libx265 \
</span> --enable-libxvid
depends_lib-append port:XviD \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:x264 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:x265
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:x264
</span>
license GPL-2+
}
</pre><pre style='margin:0'>
</pre>