<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[138808] trunk/dports/multimedia</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/138808">138808</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-07-20 11:35:18 -0700 (Mon, 20 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>ffmpeg, ffmpeg-devel: reformat for more consistent indentation, white space only.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaffmpegPortfile">trunk/dports/multimedia/ffmpeg/Portfile</a></li>
<li><a href="#trunkdportsmultimediaffmpegdevelPortfile">trunk/dports/multimedia/ffmpeg-devel/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmultimediaffmpegPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/ffmpeg/Portfile (138807 => 138808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/ffmpeg/Portfile 2015-07-20 18:25:44 UTC (rev 138807)
+++ trunk/dports/multimedia/ffmpeg/Portfile 2015-07-20 18:35:18 UTC (rev 138808)
</span><span class="lines">@@ -1,93 +1,92 @@
</span><span class="cx"> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><del>-PortSystem 1.0
-PortGroup xcodeversion 1.0
-PortGroup muniversal 1.0
-PortGroup compiler_blacklist_versions 1.0
-PortGroup active_variants 1.1
</del><ins>+PortSystem 1.0
+PortGroup xcodeversion 1.0
+PortGroup muniversal 1.0
+PortGroup compiler_blacklist_versions 1.0
+PortGroup active_variants 1.1
</ins><span class="cx">
</span><del>-name ffmpeg
-conflicts ffmpeg-devel
-epoch 1
-version 2.7.1
-revision 2
-license LGPL-2.1+
-categories multimedia
-maintainers devans jeremyhu openmaintainer
</del><ins>+name ffmpeg
+conflicts ffmpeg-devel
+epoch 1
+version 2.7.1
+revision 2
+license LGPL-2.1+
+categories multimedia
+maintainers devans jeremyhu openmaintainer
</ins><span class="cx">
</span><del>-description FFmpeg is a complete solution to play, record, convert and \
- stream audio and video.
</del><ins>+description FFmpeg is a complete solution to play, record, convert and \
+ stream audio and video.
</ins><span class="cx">
</span><del>-long_description FFmpeg is a complete solution to record, convert and \
- stream audio and video. It includes libavcodec, the \
- leading audio/video codec library. \
- \
- The project is made of several components: \
- \
- ffmpeg is a command line tool to convert one video \
- file format to another. It also supports grabbing and \
- encoding in real time from a TV card. \
- \
- ffserver is an HTTP (RTSP is being developed) \
- multimedia streaming server for live broadcasts. Time \
- shifting of live broadcast is also supported. \
- \
- ffplay is a simple media player based on SDL and on \
- the ffmpeg libraries. \
- \
- ffprobe gathers information from multimedia streams and \
- prints it in human- and machine-readable fashion. \
- \
- libavcodec is a library containing all the ffmpeg \
- audio/video encoders and decoders. Most codecs were \
- developed from scratch to ensure best performance \
- and high code reusability. \
- \
- libavformat is a library containing parsers and \
- generators for all common audio/video formats.
</del><ins>+long_description FFmpeg is a complete solution to record, convert and \
+ stream audio and video. It includes libavcodec, the \
+ leading audio/video codec library. \
+ \
+ The project is made of several components: \
+ \
+ ffmpeg is a command line tool to convert one video \
+ file format to another. It also supports grabbing and \
+ encoding in real time from a TV card. \
+ \
+ ffserver is an HTTP (RTSP is being developed) \
+ multimedia streaming server for live broadcasts. Time \
+ shifting of live broadcast is also supported. \
+ \
+ ffplay is a simple media player based on SDL and on \
+ the ffmpeg libraries. \
+ \
+ ffprobe gathers information from multimedia streams and \
+ prints it in human- and machine-readable fashion. \
+ \
+ libavcodec is a library containing all the ffmpeg \
+ audio/video encoders and decoders. Most codecs were \
+ developed from scratch to ensure best performance \
+ and high code reusability. \
+ \
+ libavformat is a library containing parsers and \
+ generators for all common audio/video formats.
+platforms darwin
+homepage http://www.ffmpeg.org/
+master_sites http://www.ffmpeg.org/releases/
</ins><span class="cx">
</span><del>-platforms darwin
-homepage http://www.ffmpeg.org/
-master_sites http://www.ffmpeg.org/releases/
</del><ins>+use_bzip2 yes
</ins><span class="cx">
</span><del>-use_bzip2 yes
</del><ins>+checksums rmd160 ee27091f9be74786a53344f3d3c6988ed03ec460 \
+ sha256 7e07b97d2415feeae9c9b5595e35e7b7aab33207e81bf9f8c0d1eece43f7f720
</ins><span class="cx">
</span><del>-checksums rmd160 ee27091f9be74786a53344f3d3c6988ed03ec460 \
- sha256 7e07b97d2415feeae9c9b5595e35e7b7aab33207e81bf9f8c0d1eece43f7f720
</del><ins>+depends_build port:pkgconfig \
+ port:gmake \
+ port:texinfo
</ins><span class="cx">
</span><del>-depends_build port:pkgconfig \
- port:gmake \
- port:texinfo
-
</del><span class="cx"> # libvpx is static only so can be considered a build dependency (#47934)
</span><span class="cx">
</span><span class="cx"> depends_build-append \
</span><del>- port:libvpx
</del><ins>+ port:libvpx
</ins><span class="cx">
</span><del>-depends_lib port:lame \
- port:libiconv \
- port:libvorbis \
- port:libopus \
- port:libogg \
- port:libtheora \
- port:libmodplug \
- port:schroedinger \
- port:libass \
- port:libbluray \
- port:gnutls \
- port:openjpeg15 \
- port:fontconfig \
- port:freetype \
- port:fribidi \
- path:lib/libspeex.dylib:speex \
- port:libsdl \
- port:bzip2 \
- port:xz \
- port:zlib
</del><ins>+depends_lib port:lame \
+ port:libiconv \
+ port:libvorbis \
+ port:libopus \
+ port:libogg \
+ port:libtheora \
+ port:libmodplug \
+ port:schroedinger \
+ port:libass \
+ port:libbluray \
+ port:gnutls \
+ port:openjpeg15 \
+ port:fontconfig \
+ port:freetype \
+ port:fribidi \
+ path:lib/libspeex.dylib:speex \
+ port:libsdl \
+ port:bzip2 \
+ port:xz \
+ port:zlib
</ins><span class="cx">
</span><del>-build.cmd ${prefix}/bin/gmake
-build.env-append V=1
</del><ins>+build.cmd ${prefix}/bin/gmake
+build.env-append V=1
</ins><span class="cx">
</span><span class="cx"> #
</span><span class="cx"> # enable auto configure of asm optimizations
</span><span class="lines">@@ -105,36 +104,35 @@
</span><span class="cx"> # Also, -gpl2 causes other ports to fail to build due to the missing libpostproc (#35473)
</span><span class="cx"> default_variants-append +gpl2
</span><span class="cx">
</span><del>-configure.cflags-append -DHAVE_LRINTF ${configure.cppflags}
-configure.args \
- --enable-swscale \
- --enable-avfilter \
- --enable-avresample \
- --enable-libmp3lame \
- --enable-libvorbis \
- --enable-libopus \
- --enable-libtheora \
- --enable-libschroedinger \
- --enable-libopenjpeg \
- --enable-libmodplug \
- --enable-libvpx \
- --enable-libspeex \
- --enable-libass \
- --enable-libbluray \
- --enable-lzma \
- --enable-gnutls \
- --enable-fontconfig \
- --enable-libfreetype \
- --enable-libfribidi \
- --disable-libxcb \
- --disable-libxcb-shm \
- --disable-libxcb-xfixes \
- --disable-indev=jack \
- --disable-outdev=xv \
- --disable-vda \
- --mandir=${prefix}/share/man \
- --enable-shared --enable-pthreads \
- --cc=${configure.cc}
</del><ins>+configure.cflags-append -DHAVE_LRINTF ${configure.cppflags}
+configure.args --enable-swscale \
+ --enable-avfilter \
+ --enable-avresample \
+ --enable-libmp3lame \
+ --enable-libvorbis \
+ --enable-libopus \
+ --enable-libtheora \
+ --enable-libschroedinger \
+ --enable-libopenjpeg \
+ --enable-libmodplug \
+ --enable-libvpx \
+ --enable-libspeex \
+ --enable-libass \
+ --enable-libbluray \
+ --enable-lzma \
+ --enable-gnutls \
+ --enable-fontconfig \
+ --enable-libfreetype \
+ --enable-libfribidi \
+ --disable-libxcb \
+ --disable-libxcb-shm \
+ --disable-libxcb-xfixes \
+ --disable-indev=jack \
+ --disable-outdev=xv \
+ --disable-vda \
+ --mandir=${prefix}/share/man \
+ --enable-shared --enable-pthreads \
+ --cc=${configure.cc}
</ins><span class="cx">
</span><span class="cx"> # disable asm on Tiger
</span><span class="cx"> # libblueray doesn't build on Tiger so disable for now (#39442)
</span><span class="lines">@@ -159,7 +157,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-test.run yes
</del><ins>+test.run yes
</ins><span class="cx">
</span><span class="cx"> #
</span><span class="cx"> # configure isn't autoconf and they do use a dep cache
</span><span class="lines">@@ -362,6 +360,6 @@
</span><span class="cx"> "
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type regex
-livecheck.url ${master_sites}
-livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
</del><ins>+livecheck.type regex
+livecheck.url ${master_sites}
+livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
</ins></span></pre></div>
<a id="trunkdportsmultimediaffmpegdevelPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/ffmpeg-devel/Portfile (138807 => 138808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/ffmpeg-devel/Portfile 2015-07-20 18:25:44 UTC (rev 138807)
+++ trunk/dports/multimedia/ffmpeg-devel/Portfile 2015-07-20 18:35:18 UTC (rev 138808)
</span><span class="lines">@@ -1,88 +1,88 @@
</span><span class="cx"> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><del>-PortSystem 1.0
-PortGroup xcodeversion 1.0
-PortGroup muniversal 1.0
-PortGroup compiler_blacklist_versions 1.0
-PortGroup active_variants 1.1
-PortGroup github 1.0
</del><ins>+PortSystem 1.0
+PortGroup xcodeversion 1.0
+PortGroup muniversal 1.0
+PortGroup compiler_blacklist_versions 1.0
+PortGroup active_variants 1.1
+PortGroup github 1.0
</ins><span class="cx">
</span><del>-github.setup FFmpeg FFmpeg f8db81074a
-name ffmpeg-devel
-conflicts ffmpeg
-version 20150711
-revision 1
-license LGPL-2.1+
-categories multimedia
-maintainers devans jeremyhu openmaintainer
</del><ins>+github.setup FFmpeg FFmpeg f8db81074a
+name ffmpeg-devel
+conflicts ffmpeg
+version 20150711
+revision 1
+license LGPL-2.1+
+categories multimedia
+maintainers devans jeremyhu openmaintainer
</ins><span class="cx">
</span><del>-description FFmpeg is a complete solution to play, record, convert and \
- stream audio and video.
</del><ins>+description FFmpeg is a complete solution to play, record, convert and \
+ stream audio and video.
</ins><span class="cx">
</span><del>-long_description FFmpeg is a complete solution to record, convert and \
- stream audio and video. It includes libavcodec, the \
- leading audio/video codec library. \
- \
- The project is made of several components: \
- \
- ffmpeg is a command line tool to convert one video \
- file format to another. It also supports grabbing and \
- encoding in real time from a TV card. \
- \
- ffserver is an HTTP (RTSP is being developed) \
- multimedia streaming server for live broadcasts. Time \
- shifting of live broadcast is also supported. \
- \
- ffplay is a simple media player based on SDL and on \
- the ffmpeg libraries. \
- \
- ffprobe gathers information from multimedia streams and \
- prints it in human- and machine-readable fashion. \
- \
- libavcodec is a library containing all the ffmpeg \
- audio/video encoders and decoders. Most codecs were \
- developed from scratch to ensure best performance \
- and high code reusability. \
- \
- libavformat is a library containing parsers and \
- generators for all common audio/video formats.
</del><ins>+long_description FFmpeg is a complete solution to record, convert and \
+ stream audio and video. It includes libavcodec, the \
+ leading audio/video codec library. \
+ \
+ The project is made of several components: \
+ \
+ ffmpeg is a command line tool to convert one video \
+ file format to another. It also supports grabbing and \
+ encoding in real time from a TV card. \
+ \
+ ffserver is an HTTP (RTSP is being developed) \
+ multimedia streaming server for live broadcasts. Time \
+ shifting of live broadcast is also supported. \
+ \
+ ffplay is a simple media player based on SDL and on \
+ the ffmpeg libraries. \
+ \
+ ffprobe gathers information from multimedia streams and \
+ prints it in human- and machine-readable fashion. \
+ \
+ libavcodec is a library containing all the ffmpeg \
+ audio/video encoders and decoders. Most codecs were \
+ developed from scratch to ensure best performance \
+ and high code reusability. \
+ \
+ libavformat is a library containing parsers and \
+ generators for all common audio/video formats.
</ins><span class="cx">
</span><del>-platforms darwin
-homepage http://www.ffmpeg.org/
</del><ins>+platforms darwin
+homepage http://www.ffmpeg.org/
</ins><span class="cx">
</span><del>-checksums rmd160 4c2d11ca4c7dc14396859bdbb578adaf0f0f2013 \
- sha256 627f1d4faedc371e93cec5cbfe5237ae282c06cf42979ffedc1661ca9d10697c
</del><ins>+checksums rmd160 4c2d11ca4c7dc14396859bdbb578adaf0f0f2013 \
+ sha256 627f1d4faedc371e93cec5cbfe5237ae282c06cf42979ffedc1661ca9d10697c
</ins><span class="cx">
</span><del>-depends_build port:pkgconfig \
- port:gmake \
- port:texinfo
</del><ins>+depends_build port:pkgconfig \
+ port:gmake \
+ port:texinfo
</ins><span class="cx">
</span><span class="cx"> # libvpx is static only so can be considered a build dependency (#47934)
</span><span class="cx">
</span><span class="cx"> depends_build-append \
</span><del>- port:libvpx
</del><ins>+ port:libvpx
</ins><span class="cx">
</span><del>-depends_lib port:lame \
- port:libiconv \
- port:libvorbis \
- port:libopus \
- port:libogg \
- port:libtheora \
- port:libmodplug \
- port:schroedinger \
- port:libass \
- port:libbluray \
- port:gnutls \
- port:openjpeg15 \
- port:fontconfig \
- port:freetype \
- port:fribidi \
- path:lib/libspeex.dylib:speex \
- port:libsdl \
- port:bzip2 \
- port:xz \
- port:zlib
</del><ins>+depends_lib port:lame \
+ port:libiconv \
+ port:libvorbis \
+ port:libopus \
+ port:libogg \
+ port:libtheora \
+ port:libmodplug \
+ port:schroedinger \
+ port:libass \
+ port:libbluray \
+ port:gnutls \
+ port:openjpeg15 \
+ port:fontconfig \
+ port:freetype \
+ port:fribidi \
+ path:lib/libspeex.dylib:speex \
+ port:libsdl \
+ port:bzip2 \
+ port:xz \
+ port:zlib
</ins><span class="cx">
</span><span class="cx"> #
</span><span class="cx"> # enable auto configure of asm optimizations
</span><span class="lines">@@ -100,36 +100,35 @@
</span><span class="cx"> # Also, -gpl2 causes other ports to fail to build due to the missing libpostproc (#35473)
</span><span class="cx"> default_variants-append +gpl2
</span><span class="cx">
</span><del>-configure.cflags-append -DHAVE_LRINTF ${configure.cppflags}
-configure.args \
- --enable-swscale \
- --enable-avfilter \
- --enable-avresample \
- --enable-libmp3lame \
- --enable-libvorbis \
- --enable-libopus \
- --enable-libtheora \
- --enable-libschroedinger \
- --enable-libopenjpeg \
- --enable-libmodplug \
- --enable-libvpx \
- --enable-libspeex \
- --enable-libass \
- --enable-libbluray \
- --enable-lzma \
- --enable-gnutls \
- --enable-fontconfig \
- --enable-libfreetype \
- --enable-libfribidi \
- --disable-libxcb \
- --disable-libxcb-shm \
- --disable-libxcb-xfixes \
- --disable-indev=jack \
- --disable-outdev=xv \
- --disable-vda \
- --mandir=${prefix}/share/man \
- --enable-shared --enable-pthreads \
- --cc=${configure.cc}
</del><ins>+configure.cflags-append -DHAVE_LRINTF ${configure.cppflags}
+configure.args --enable-swscale \
+ --enable-avfilter \
+ --enable-avresample \
+ --enable-libmp3lame \
+ --enable-libvorbis \
+ --enable-libopus \
+ --enable-libtheora \
+ --enable-libschroedinger \
+ --enable-libopenjpeg \
+ --enable-libmodplug \
+ --enable-libvpx \
+ --enable-libspeex \
+ --enable-libass \
+ --enable-libbluray \
+ --enable-lzma \
+ --enable-gnutls \
+ --enable-fontconfig \
+ --enable-libfreetype \
+ --enable-libfribidi \
+ --disable-libxcb \
+ --disable-libxcb-shm \
+ --disable-libxcb-xfixes \
+ --disable-indev=jack \
+ --disable-outdev=xv \
+ --disable-vda \
+ --mandir=${prefix}/share/man \
+ --enable-shared --enable-pthreads \
+ --cc=${configure.cc}
</ins><span class="cx">
</span><span class="cx"> # disable asm on Tiger
</span><span class="cx"> # libblueray doesn't build on Tiger so disable for now (#39442)
</span><span class="lines">@@ -154,10 +153,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-build.cmd ${prefix}/bin/gmake
-build.env-append V=1
</del><ins>+build.cmd ${prefix}/bin/gmake
+build.env-append V=1
</ins><span class="cx">
</span><del>-test.run yes
</del><ins>+test.run yes
</ins><span class="cx">
</span><span class="cx"> destroot.env-append V=1
</span><span class="cx">
</span><span class="lines">@@ -366,4 +365,4 @@
</span><span class="cx"> #disable livecheck
</span><span class="cx"> #
</span><span class="cx">
</span><del>-livecheck.type none
</del><ins>+livecheck.type none
</ins></span></pre>
</div>
</div>
</body>
</html>