<!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>[70077] trunk/dports/multimedia/ffmpeg</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="http://trac.macports.org/changeset/70077">70077</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2010-07-29 08:54:02 -0700 (Thu, 29 Jul 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>ffmpeg: update to stable version 0.6
* add license information
* update variants to reflect changes in licensing
* add speex support by default
* disable broken jack indev
* update long description</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaffmpegPortfile">trunk/dports/multimedia/ffmpeg/Portfile</a></li>
<li><a href="#trunkdportsmultimediaffmpegfilespatchlibswscaleswscalehdiff">trunk/dports/multimedia/ffmpeg/files/patch-libswscale-swscale.h.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaffmpegfilespatchlibavfilteravfilterhdiff">trunk/dports/multimedia/ffmpeg/files/patch-libavfilter-avfilter.h.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmultimediaffmpegPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/ffmpeg/Portfile (70076 => 70077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/ffmpeg/Portfile 2010-07-29 15:45:47 UTC (rev 70076)
+++ trunk/dports/multimedia/ffmpeg/Portfile 2010-07-29 15:54:02 UTC (rev 70077)
</span><span class="lines">@@ -7,8 +7,8 @@
</span><span class="cx"> name ffmpeg
</span><span class="cx"> conflicts ffmpeg-devel
</span><span class="cx"> epoch 1
</span><del>-version 0.5.1
-revision 2
</del><ins>+version 0.6
+license nonfree GPLv2.1+ LGPLv2.1+
</ins><span class="cx"> categories multimedia
</span><span class="cx"> maintainers devans openmaintainer
</span><span class="cx">
</span><span class="lines">@@ -32,6 +32,9 @@
</span><span class="cx"> ffplay is a simple media player based on SDL and on \
</span><span class="cx"> the ffmpeg libraries. \
</span><span class="cx"> \
</span><ins>+ ffprobe gathers information from multimedia streams and \
+ prints it in human- and machine-readable fashion. \
+ \
</ins><span class="cx"> libavcodec is a library containing all the ffmpeg \
</span><span class="cx"> audio/video encoders and decoders. Most codecs were \
</span><span class="cx"> developped from scratch to ensure best performances \
</span><span class="lines">@@ -46,15 +49,13 @@
</span><span class="cx">
</span><span class="cx"> use_bzip2 yes
</span><span class="cx">
</span><del>-checksums md5 c7b0e1729f7aafb10496d79bb963bb26 \
- sha1 ab29dbfc7510e34e47b491279533d2f8c18efc38 \
- rmd160 9765798cabbf937f97ca7137b4ab398df5a4ec47
</del><ins>+checksums md5 d6142a9a5821d6a6262a6edb903faa24 \
+ sha1 c130e3bc368251b9130ce6eafb44fe8c3993ff5c \
+ rmd160 1ff6a8f419239a03d84f67cc954f60f73632432a
</ins><span class="cx">
</span><del>-patchfiles patch-libavfilter-avfilter.h.diff \
- patch-libswscale-Makefile.diff \
</del><ins>+patchfiles patch-libswscale-Makefile.diff \
</ins><span class="cx"> patch-libswscale-swscale.h.diff
</span><span class="cx">
</span><del>-
</del><span class="cx"> use_parallel_build yes
</span><span class="cx">
</span><span class="cx"> depends_build port:gmake
</span><span class="lines">@@ -67,6 +68,7 @@
</span><span class="cx"> port:schroedinger \
</span><span class="cx"> port:faac \
</span><span class="cx"> port:faad2 \
</span><ins>+ port:speex \
</ins><span class="cx"> port:XviD \
</span><span class="cx"> port:x264 \
</span><span class="cx"> path:lib/pkgconfig/sdl.pc:libsdl \
</span><span class="lines">@@ -83,7 +85,6 @@
</span><span class="cx">
</span><span class="cx"> configure.cflags-append -DHAVE_LRINTF ${configure.cppflags}
</span><span class="cx"> configure.args \
</span><del>- --disable-vhook \
</del><span class="cx"> --enable-gpl \
</span><span class="cx"> --enable-postproc \
</span><span class="cx"> --enable-swscale --enable-avfilter --enable-avfilter-lavf \
</span><span class="lines">@@ -95,9 +96,11 @@
</span><span class="cx"> --enable-libfaad \
</span><span class="cx"> --enable-libxvid \
</span><span class="cx"> --enable-libx264 \
</span><ins>+ --enable-libspeex \
</ins><span class="cx"> --enable-nonfree \
</span><span class="cx"> --mandir=${prefix}/share/man \
</span><span class="cx"> --enable-shared --enable-pthreads \
</span><ins>+ --disable-indevs \
</ins><span class="cx"> --cc=${configure.cc}
</span><span class="cx">
</span><span class="cx"> #add --enable-libopenjpeg when problems with openjpeg.h are resolved
</span><span class="lines">@@ -125,9 +128,8 @@
</span><span class="cx"> platform darwin 10 {
</span><span class="cx"> # ticket #20938 -- disable mmx for 32 bit intel only
</span><span class="cx"> if { $build_arch == "i386" } {
</span><del>- if { ![variant_isset no_gpl] } {
- configure.args-delete --enable-swscale
- }
</del><ins>+ # swscale is no longer GPL only
+ configure.args-delete --enable-swscale
</ins><span class="cx"> if { ![variant_isset no_mmx] } {
</span><span class="cx"> configure.args-append --disable-mmx --disable-mmx2 --disable-sse --disable-ssse3 --disable-amd3dnow --disable-amd3dnowext
</span><span class="cx"> }
</span><span class="lines">@@ -148,71 +150,76 @@
</span><span class="cx"> variant no_gpl description {disallow use of GPL code, license will be LGPL} {
</span><span class="cx"> configure.args-delete --enable-gpl
</span><span class="cx"> configure.args-delete --enable-postproc
</span><del>- configure.args-delete --enable-swscale
</del><span class="cx"> configure.args-delete --enable-libfaad
</span><span class="cx"> depends_lib-delete port:faad2
</span><span class="cx"> configure.args-delete --enable-libx264
</span><del>- depends_build-delete port:x264
</del><ins>+ depends_build-delete port:x264
</ins><span class="cx"> configure.args-delete --enable-libxvid
</span><span class="cx"> depends_lib-delete port:XviD
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+variant no_nonfree description {disallow use of nonfree code, libraries and binaries will be redistributable under GPL/LGPL} {
+ configure.args-delete --enable-nonfree
+ configure.args-delete --enable-libfaac
+ depends_lib-delete port:faac
+}
+
</ins><span class="cx"> #
</span><del>-# make speex a variant since it requires speex version 1.2
-# which is currently only available via port speex-devel
-# remove variant and make default when 1.2 is available in speex
</del><ins>+# jack indev support is currently broken
+# since Darwin doesn't support memory based POSIX semaphores
+# only named ones
</ins><span class="cx"> #
</span><span class="cx">
</span><del>-variant speex description {enable Speex decoding via libspeex} {
- configure.args-append --enable-libspeex
- depends_lib-append path:lib/libspeex.dylib:speex-devel
</del><ins>+variant jack description {Enable jack input device support (currently broken)} {
+ configure.args-delete --disable-indevs
+ depends_lib-append port:jack
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-pre-configure {
- if {[variant_isset speex]} {
- if {![file exists ${prefix}/lib/libspeexdsp.dylib]} {
- error "
</del><ins>+post-activate {
+ if {![variant_isset no_nonfree]} {
+ ui_msg "
</ins><span class="cx"> *******
</span><del>-******* Variant speex requires port speex-devel but
-******* port speex is active. Please deactivate port speex
-******* and install/activate port speex-devel then try
-******* again.
</del><ins>+******* This build of ${name} includes nonfree code as follows:
</ins><span class="cx"> *******
</span><ins>+******* libfaac
+*******
+******* The following libraries and binaries may not be redistributed:
+*******
+******* ffmpeg
+******* libavcodec
+******* libavdevice
+******* libavfilter
+******* libavformat
+******* libavutil
+*******
+******* To remove this restriction use variant +no_nonfree
+*******
</ins><span class="cx"> "
</span><del>- }
- }
-}
-
-post-activate {
- if {![variant_isset no_gpl]} {
</del><ins>+ } elseif {![variant_isset no_gpl]} {
</ins><span class="cx"> ui_msg "
</span><span class="cx"> *******
</span><span class="cx"> ******* This build of ${name} includes GPLed code and
</span><del>-******* is therefore licensed under GPL.
</del><ins>+******* is therefore licensed under GPL v2.1 or later.
</ins><span class="cx"> *******
</span><span class="cx"> ******* The following modules are GPLed:
</span><span class="cx"> *******
</span><span class="cx"> ******* postproc
</span><del>-******* swscale
</del><span class="cx"> ******* libfaad
</span><span class="cx"> ******* libx264
</span><span class="cx"> ******* libxvid
</span><span class="cx"> *******
</span><del>-******* To include only LGPLed code use variant +no_gpl
</del><ins>+******* To include only LGPLed code use variant +no_gpl +no_nonfree
</ins><span class="cx"> *******
</span><span class="cx"> "
</span><span class="cx"> } else {
</span><span class="cx"> ui_msg "
</span><span class="cx"> *******
</span><del>-******* This build of ${name} includes no GPLed
-******* code and is therefore licensed under LGPL.
</del><ins>+******* This build of ${name} includes no GPLed or nonfree
+******* code and is therefore licensed under LGPL v2.1 or later.
</ins><span class="cx"> *******
</span><span class="cx"> "
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-#
-#disable livecheck
-#
</del><span class="cx">
</span><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url ${master_sites}
</span></span></pre></div>
<a id="trunkdportsmultimediaffmpegfilespatchlibavfilteravfilterhdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/ffmpeg/files/patch-libavfilter-avfilter.h.diff (70076 => 70077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/ffmpeg/files/patch-libavfilter-avfilter.h.diff 2010-07-29 15:45:47 UTC (rev 70076)
+++ trunk/dports/multimedia/ffmpeg/files/patch-libavfilter-avfilter.h.diff 2010-07-29 15:54:02 UTC (rev 70077)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- libavfilter/avfilter.h.orig 2009-03-02 08:26:14.000000000 -0800
-+++ libavfilter/avfilter.h 2009-03-02 08:30:48.000000000 -0800
-@@ -22,7 +22,7 @@
- #ifndef AVFILTER_AVFILTER_H
- #define AVFILTER_AVFILTER_H
-
--#define LIBAVFILTER_VERSION_MAJOR 0
-+#define LIBAVFILTER_VERSION_MAJOR 1
- #define LIBAVFILTER_VERSION_MINOR 4
- #define LIBAVFILTER_VERSION_MICRO 0
-
</del></span></pre></div>
<a id="trunkdportsmultimediaffmpegfilespatchlibswscaleswscalehdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/ffmpeg/files/patch-libswscale-swscale.h.diff (70076 => 70077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/ffmpeg/files/patch-libswscale-swscale.h.diff 2010-07-29 15:45:47 UTC (rev 70076)
+++ trunk/dports/multimedia/ffmpeg/files/patch-libswscale-swscale.h.diff 2010-07-29 15:54:02 UTC (rev 70077)
</span><span class="lines">@@ -1,11 +1,11 @@
</span><del>---- libswscale/swscale.h.orig 2009-03-02 08:26:26.000000000 -0800
-+++ libswscale/swscale.h 2009-03-02 08:35:45.000000000 -0800
</del><ins>+--- libswscale/swscale.h.orig 2010-07-15 17:05:57.000000000 -0700
++++ libswscale/swscale.h 2010-07-15 17:06:26.000000000 -0700
</ins><span class="cx"> @@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #include "libavutil/avutil.h"
</span><span class="cx">
</span><span class="cx"> -#define LIBSWSCALE_VERSION_MAJOR 0
</span><span class="cx"> +#define LIBSWSCALE_VERSION_MAJOR 1
</span><del>- #define LIBSWSCALE_VERSION_MINOR 7
- #define LIBSWSCALE_VERSION_MICRO 1
</del><ins>+ #define LIBSWSCALE_VERSION_MINOR 11
+ #define LIBSWSCALE_VERSION_MICRO 0
</ins><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>