<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/92c81f36f29ef5cbe0935d4e4acb8f881885efd9">https://github.com/macports/macports-ports/commit/92c81f36f29ef5cbe0935d4e4acb8f881885efd9</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 92c81f3 ffmpeg, ffmpeg-devel: Enable x265 for universal variant
</span>92c81f3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 92c81f36f29ef5cbe0935d4e4acb8f881885efd9
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Apr 29 01:03:26 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg, ffmpeg-devel: Enable x265 for universal variant
</span>---
multimedia/ffmpeg-devel/Portfile | 7 +++----
multimedia/ffmpeg/Portfile | 7 +++----
2 files changed, 6 insertions(+), 8 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 f9a5612..c68553b 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 0fe50e56e9ca74f9d992b50ee512eadc428410d7
</span> name ffmpeg-devel
conflicts ffmpeg
version 20170119
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> license LGPL-2.1+
categories multimedia
maintainers {devans @dbevans} {jeremyhu @jeremyhu} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -286,11 +286,10 @@ variant librtmp description {Use librtmp (from rtmpdump) as rtmp[t][es]:// proto
</span> }
# x265 currently does not support OS X < 10.6 (#48336, #48338)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# x265 cmake issues cause universal build to fail (#48331)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# only enable libx265 support for non-universal builds on 10.6 or greater
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# only enable libx265 support on 10.6 or greater
</span>
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} > 9 && [variant_isset gpl2] && ![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} > 9 && [variant_isset gpl2]} {
</span> configure.args-append --enable-libx265
depends_lib-append port:x265
}
<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 cec0f16..db8f7e6 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.2.4
<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;'>@@ -296,11 +296,10 @@ variant librtmp description {Use librtmp (from rtmpdump) as rtmp[t][es]:// proto
</span> }
# x265 currently does not support OS X < 10.6 (#48336, #48338)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# x265 cmake issues cause universal build to fail (#48331)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# only enable libx265 support for non-universal builds on 10.6 or greater
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# only enable libx265 support on 10.6 or greater
</span>
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} > 9 && [variant_isset gpl2] && ![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} > 9 && [variant_isset gpl2]} {
</span> configure.args-append --enable-libx265
depends_lib-append port:x265
}
</pre><pre style='margin:0'>
</pre>