[70077] trunk/dports/multimedia/ffmpeg
devans at macports.org
devans at macports.org
Thu Jul 29 08:54:03 PDT 2010
Revision: 70077
http://trac.macports.org/changeset/70077
Author: devans at macports.org
Date: 2010-07-29 08:54:02 -0700 (Thu, 29 Jul 2010)
Log Message:
-----------
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
Modified Paths:
--------------
trunk/dports/multimedia/ffmpeg/Portfile
trunk/dports/multimedia/ffmpeg/files/patch-libswscale-swscale.h.diff
Removed Paths:
-------------
trunk/dports/multimedia/ffmpeg/files/patch-libavfilter-avfilter.h.diff
Modified: trunk/dports/multimedia/ffmpeg/Portfile
===================================================================
--- 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)
@@ -7,8 +7,8 @@
name ffmpeg
conflicts ffmpeg-devel
epoch 1
-version 0.5.1
-revision 2
+version 0.6
+license nonfree GPLv2.1+ LGPLv2.1+
categories multimedia
maintainers devans openmaintainer
@@ -32,6 +32,9 @@
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 \
developped from scratch to ensure best performances \
@@ -46,15 +49,13 @@
use_bzip2 yes
-checksums md5 c7b0e1729f7aafb10496d79bb963bb26 \
- sha1 ab29dbfc7510e34e47b491279533d2f8c18efc38 \
- rmd160 9765798cabbf937f97ca7137b4ab398df5a4ec47
+checksums md5 d6142a9a5821d6a6262a6edb903faa24 \
+ sha1 c130e3bc368251b9130ce6eafb44fe8c3993ff5c \
+ rmd160 1ff6a8f419239a03d84f67cc954f60f73632432a
-patchfiles patch-libavfilter-avfilter.h.diff \
- patch-libswscale-Makefile.diff \
+patchfiles patch-libswscale-Makefile.diff \
patch-libswscale-swscale.h.diff
-
use_parallel_build yes
depends_build port:gmake
@@ -67,6 +68,7 @@
port:schroedinger \
port:faac \
port:faad2 \
+ port:speex \
port:XviD \
port:x264 \
path:lib/pkgconfig/sdl.pc:libsdl \
@@ -83,7 +85,6 @@
configure.cflags-append -DHAVE_LRINTF ${configure.cppflags}
configure.args \
- --disable-vhook \
--enable-gpl \
--enable-postproc \
--enable-swscale --enable-avfilter --enable-avfilter-lavf \
@@ -95,9 +96,11 @@
--enable-libfaad \
--enable-libxvid \
--enable-libx264 \
+ --enable-libspeex \
--enable-nonfree \
--mandir=${prefix}/share/man \
--enable-shared --enable-pthreads \
+ --disable-indevs \
--cc=${configure.cc}
#add --enable-libopenjpeg when problems with openjpeg.h are resolved
@@ -125,9 +128,8 @@
platform darwin 10 {
# ticket #20938 -- disable mmx for 32 bit intel only
if { $build_arch == "i386" } {
- if { ![variant_isset no_gpl] } {
- configure.args-delete --enable-swscale
- }
+ # swscale is no longer GPL only
+ configure.args-delete --enable-swscale
if { ![variant_isset no_mmx] } {
configure.args-append --disable-mmx --disable-mmx2 --disable-sse --disable-ssse3 --disable-amd3dnow --disable-amd3dnowext
}
@@ -148,71 +150,76 @@
variant no_gpl description {disallow use of GPL code, license will be LGPL} {
configure.args-delete --enable-gpl
configure.args-delete --enable-postproc
- configure.args-delete --enable-swscale
configure.args-delete --enable-libfaad
depends_lib-delete port:faad2
configure.args-delete --enable-libx264
- depends_build-delete port:x264
+ depends_build-delete port:x264
configure.args-delete --enable-libxvid
depends_lib-delete port:XviD
}
+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
+}
+
#
-# 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
+# jack indev support is currently broken
+# since Darwin doesn't support memory based POSIX semaphores
+# only named ones
#
-variant speex description {enable Speex decoding via libspeex} {
- configure.args-append --enable-libspeex
- depends_lib-append path:lib/libspeex.dylib:speex-devel
+variant jack description {Enable jack input device support (currently broken)} {
+ configure.args-delete --disable-indevs
+ depends_lib-append port:jack
}
-pre-configure {
- if {[variant_isset speex]} {
- if {![file exists ${prefix}/lib/libspeexdsp.dylib]} {
- error "
+post-activate {
+ if {![variant_isset no_nonfree]} {
+ ui_msg "
*******
-******* Variant speex requires port speex-devel but
-******* port speex is active. Please deactivate port speex
-******* and install/activate port speex-devel then try
-******* again.
+******* This build of ${name} includes nonfree code as follows:
*******
+******* libfaac
+*******
+******* The following libraries and binaries may not be redistributed:
+*******
+******* ffmpeg
+******* libavcodec
+******* libavdevice
+******* libavfilter
+******* libavformat
+******* libavutil
+*******
+******* To remove this restriction use variant +no_nonfree
+*******
"
- }
- }
-}
-
-post-activate {
- if {![variant_isset no_gpl]} {
+ } elseif {![variant_isset no_gpl]} {
ui_msg "
*******
******* This build of ${name} includes GPLed code and
-******* is therefore licensed under GPL.
+******* is therefore licensed under GPL v2.1 or later.
*******
******* The following modules are GPLed:
*******
******* postproc
-******* swscale
******* libfaad
******* libx264
******* libxvid
*******
-******* To include only LGPLed code use variant +no_gpl
+******* To include only LGPLed code use variant +no_gpl +no_nonfree
*******
"
} else {
ui_msg "
*******
-******* This build of ${name} includes no GPLed
-******* code and is therefore licensed under LGPL.
+******* This build of ${name} includes no GPLed or nonfree
+******* code and is therefore licensed under LGPL v2.1 or later.
*******
"
}
}
-#
-#disable livecheck
-#
livecheck.type regex
livecheck.url ${master_sites}
Deleted: trunk/dports/multimedia/ffmpeg/files/patch-libavfilter-avfilter.h.diff
===================================================================
--- 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)
@@ -1,11 +0,0 @@
---- 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
-
Modified: trunk/dports/multimedia/ffmpeg/files/patch-libswscale-swscale.h.diff
===================================================================
--- 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)
@@ -1,11 +1,11 @@
---- libswscale/swscale.h.orig 2009-03-02 08:26:26.000000000 -0800
-+++ libswscale/swscale.h 2009-03-02 08:35:45.000000000 -0800
+--- libswscale/swscale.h.orig 2010-07-15 17:05:57.000000000 -0700
++++ libswscale/swscale.h 2010-07-15 17:06:26.000000000 -0700
@@ -29,7 +29,7 @@
#include "libavutil/avutil.h"
-#define LIBSWSCALE_VERSION_MAJOR 0
+#define LIBSWSCALE_VERSION_MAJOR 1
- #define LIBSWSCALE_VERSION_MINOR 7
- #define LIBSWSCALE_VERSION_MICRO 1
+ #define LIBSWSCALE_VERSION_MINOR 11
+ #define LIBSWSCALE_VERSION_MICRO 0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100729/c2dffecd/attachment.html>
More information about the macports-changes
mailing list