[48055] trunk/dports/multimedia/ffmpeg
devans at macports.org
devans at macports.org
Fri Mar 13 08:10:53 PDT 2009
Revision: 48055
http://trac.macports.org/changeset/48055
Author: devans at macports.org
Date: 2009-03-13 08:10:52 -0700 (Fri, 13 Mar 2009)
Log Message:
-----------
ffmpeg: update to new release version 0.5 (maintainer timeout). See #18793 for details.
Modified Paths:
--------------
trunk/dports/multimedia/ffmpeg/Portfile
trunk/dports/multimedia/ffmpeg/files/patch-libavfilter-avfilter.h.diff
trunk/dports/multimedia/ffmpeg/files/patch-libswscale-swscale.h.diff
Removed Paths:
-------------
trunk/dports/multimedia/ffmpeg/files/patch-libavcodec_libx264.c.diff
trunk/dports/multimedia/ffmpeg/files/patch-libavcodec_ppc_check_altivec.c.diff
Modified: trunk/dports/multimedia/ffmpeg/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg/Portfile 2009-03-13 11:05:57 UTC (rev 48054)
+++ trunk/dports/multimedia/ffmpeg/Portfile 2009-03-13 15:10:52 UTC (rev 48055)
@@ -3,164 +3,169 @@
PortSystem 1.0
-name ffmpeg
-version 15261
-revision 5
-categories multimedia
-maintainers acho at macports.org openmaintainer
-description Digital VCR and streaming server
-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 developped) \
- 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. \
- \
- libavcodec is a library containing all the ffmpeg \
- audio/video encoders and decoders. Most codecs were \
- developped from scratch to ensure best performances \
- and high code reusability. \
- \
- libavformat is a library containing parsers and \
- generators for all common audio/video formats.
+name ffmpeg
+version 0.5
+epoch 1
+categories multimedia
+maintainers acho openmaintainer
+
+description FFmpeg is a complete solution to play, record, convert and \
+ stream audio and video.
+
+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 developped) \
+ 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. \
+ \
+ libavcodec is a library containing all the ffmpeg \
+ audio/video encoders and decoders. Most codecs were \
+ developped from scratch to ensure best performances \
+ 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
-distfiles
-patchfiles patch-libavcodec_ppc_check_altivec.c.diff \
- patch-libavcodec_libx264.c.diff \
- patch-libavfilter-avfilter.h.diff \
+master_sites http://www.ffmpeg.org/releases/
+
+use_bzip2 yes
+
+checksums md5 be8503f15c3b81ba00eb8379ca8dcf33 \
+ sha1 f930971bc0ac3d11a4ffbb1af439425c24f6f5b1 \
+ rmd160 23b4a591c422f98b634eba0ba82817ad27a4ff07
+
+patchfiles patch-libavfilter-avfilter.h.diff \
patch-libswscale-Makefile.diff \
patch-libswscale-swscale.h.diff
-use_parallel_build yes
-worksrcdir trunk
-depends_build bin:svn:subversion \
- port:gmake
+use_parallel_build yes
+depends_build port:gmake
+
depends_lib port:lame \
port:libvorbis \
port:libogg \
port:libtheora \
- port:x264 \
port:dirac \
port:schroedinger \
port:faac \
port:faad2 \
port:XviD \
+ port:x264 \
port:libsdl \
port:bzip2 \
port:zlib
-build.cmd gmake
-configure.compiler gcc-4.0
+build.cmd gmake
+configure.compiler gcc-4.0
-set svn_rev ${version}
-set libswscale_rev 27728
+configure.cflags-append -DHAVE_LRINTF ${configure.cppflags}
+configure.args \
+ --disable-vhook \
+ --enable-gpl \
+ --enable-postproc \
+ --enable-swscale --enable-avfilter --enable-avfilter-lavf \
+ --enable-libmp3lame \
+ --enable-libvorbis \
+ --enable-libtheora \
+ --enable-libdirac --enable-libschroedinger \
+ --enable-libfaac \
+ --enable-libfaad \
+ --enable-libxvid \
+ --enable-libx264 \
+ --mandir=${prefix}/share/man \
+ --enable-shared --enable-pthreads \
+ --disable-mmx \
+ --cc=gcc-4.0
-pre-fetch {
- if {[file isdirectory ${distpath}/${svn_rev}]} {
- if {![file isdirectory ${distpath}/${svn_rev}/trunk/.svn] || ![file exists ${distpath}/${svn_rev}/trunk/.complete]} {
- file delete -force ${distpath}/${svn_rev}
- }
- }
-}
+#add --enable-libopenjpeg when problems with openjpeg.h are resolved
-fetch {
- if {![file isdirectory ${distpath}/${svn_rev}]} {
- file mkdir ${distpath}/${svn_rev}
- system "svn co -r${svn_rev} --ignore-externals svn://svn.ffmpeg.org/ffmpeg/trunk ${distpath}/${svn_rev}/trunk"
- system "svn co -r${libswscale_rev} svn://svn.ffmpeg.org/mplayer/trunk/libswscale ${distpath}/${svn_rev}/trunk/libswscale"
- system "touch ${distpath}/${svn_rev}/trunk/.complete"
- }
-}
-
-extract {
- file copy ${distpath}/${svn_rev}/trunk ${worksrcpath}
-}
-
-platforms darwin
-
-configure.cflags-append -DHAVE_LRINTF ${configure.cppflags}
-configure.args \
- --disable-vhook \
- --enable-gpl \
- --enable-swscale --enable-avfilter --enable-avfilter-lavf \
- --enable-postproc \
- --enable-libmp3lame \
- --enable-libvorbis \
- --enable-libtheora \
- --enable-libdirac --enable-libschroedinger \
- --enable-libfaac \
- --enable-libfaad \
- --enable-libx264 \
- --enable-libxvid \
- --mandir=${prefix}/share/man \
- --enable-shared --enable-pthreads \
- --disable-mmx \
- --cc=gcc-4.0
-
test.run yes
-default_variants +a52
+#
+# configure isn't autoconf and they do use a dep cache
+#
-# configure isn't autoconf and they do use a dep cache
universal_variant no
post-destroot {
- file mkdir ${destroot}${prefix}/share/doc/${name}
- file copy ${worksrcpath}/doc/TODO ${destroot}${prefix}/share/doc/${name}
- foreach f [glob ${worksrcpath}/doc/*.txt ${worksrcpath}/doc/*.html] {
- file copy $f ${destroot}${prefix}/share/doc/${name}
- }
+ file mkdir ${destroot}${prefix}/share/doc/${name}
+ file copy ${worksrcpath}/doc/TODO ${destroot}${prefix}/share/doc/${name}
+ foreach f [glob ${worksrcpath}/doc/*.txt ${worksrcpath}/doc/*.html] {
+ file copy $f ${destroot}${prefix}/share/doc/${name}
+ }
}
platform darwin i386 {
- post-patch {
- reinplace "s|defined\(ARCH_X86\) \&\& defined\(CONFIG_GPL\)|defined\(ARCH_X86\) \\\&\\\& defined\(CONFIG_GPL\) \\\&\\\& \\\!defined\(__APPLE__\)|g" ${worksrcpath}/libswscale/rgb2rgb.c
- }
+ post-patch {
+ reinplace "s|defined\(ARCH_X86\) \&\& defined\(CONFIG_GPL\)|defined\(ARCH_X86\) \\\&\\\& defined\(CONFIG_GPL\) \\\&\\\& \\\!defined\(__APPLE__\)|g" ${worksrcpath}/libswscale/rgb2rgb.c
+ }
}
-variant mmx description {enable mmx support, experimental; does not build in gcc-4.2 or xcode 3.0 gcc-4.0} {
+#
+# comments concerning mmx problems may be out of date
+# needs testing on i386 platform to verify
+#
+
+variant mmx description {enable mmx optimizations ; may not build in gcc-4.2 or xcode 3.0 gcc-4.0} {
# make no-mmx default and allow mmx enabling for the brave.
- configure.args-delete --disable-mmx
-# Fix Leopard problems by disabling the cavs decoder for now
- configure.args-append --disable-decoder=cavs
+ configure.args-delete --disable-mmx
+# Fix Leopard problems by disabling the cavs decoder for now (is this still required?)
+ configure.args-append --disable-decoder=cavs
}
-variant a52 description {enable GPLed liba52 support} {
- depends_lib-append port:a52dec
- configure.args-append --enable-liba52
- post-destroot {
- file mkdir ${destroot}${prefix}/include/ffmpeg
- foreach f [glob ${destroot}${prefix}/include/libavcodec/*.h ${destroot}${prefix}/include/libavformat/*.h ${destroot}${prefix}/include/libavutil/*.h] {
- regsub -all $destroot ${f} "" srclink
- ln -s ${srclink} ${destroot}${prefix}/include/ffmpeg/[lindex [split ${f} /] end]
- }
-
- }
-}
-
-variant no_gpl conflicts a52 description {disallow use of GPL code, license will be LGPL} {
+variant no_gpl description {disallow use of GPL code, license will be LGPL if +no_nonfree is selected} {
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
configure.args-delete --enable-libxvid
depends_lib-delete port:XviD
}
+#
+# 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
+#
+
+variant speex description {enable Speex decoding via libspeex} {
+ configure.args-append --enable-libspeex
+ depends_lib-append path:lib/libspeex.dylib:speex-devel
+}
+
+pre-configure {
+ if {[variant_isset speex]} {
+ if {![file exists ${prefix}/lib/libspeexdsp.dylib]} {
+ error "
+*******
+******* Variant speex requires port speex-devel but
+******* port speex is active. Please deactivate port speex
+******* and install/activate port speex-devel then try
+******* again.
+*******
+"
+ }
+ }
+}
+
post-activate {
if {![variant_isset no_gpl]} {
ui_msg "
@@ -172,12 +177,11 @@
*******
******* postproc
******* swscale
-******* liba52
******* libfaad
******* libx264
******* libxvid
*******
-******* To include only LGPLed code use variants +no_gpl -a52
+******* To include only LGPLed code use variant +no_gpl
*******
"
} else {
@@ -189,9 +193,10 @@
"
}
}
-
#
#disable livecheck
#
-livecheck.check none
+livecheck.check regex
+livecheck.url ${master_sites}
+livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
Deleted: trunk/dports/multimedia/ffmpeg/files/patch-libavcodec_libx264.c.diff
===================================================================
--- trunk/dports/multimedia/ffmpeg/files/patch-libavcodec_libx264.c.diff 2009-03-13 11:05:57 UTC (rev 48054)
+++ trunk/dports/multimedia/ffmpeg/files/patch-libavcodec_libx264.c.diff 2009-03-13 15:10:52 UTC (rev 48055)
@@ -1,29 +0,0 @@
---- libavcodec/libx264.c.orig 2009-03-05 22:54:53.000000000 +0100
-+++ libavcodec/libx264.c 2009-03-05 22:56:14.000000000 +0100
-@@ -124,6 +124,8 @@
- {
- X264Context *x4 = avctx->priv_data;
-
-+ av_freep(&avctx->extradata);
-+
- if(x4->enc)
- x264_encoder_close(x4->enc);
-
-@@ -162,7 +164,7 @@
-
- x4->params.i_bframe = avctx->max_b_frames;
- x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC;
-- x4->params.b_bframe_adaptive = avctx->b_frame_strategy;
-+ x4->params.i_bframe_adaptive = avctx->b_frame_strategy;
- x4->params.i_bframe_bias = avctx->bframebias;
- x4->params.b_bframe_pyramid = avctx->flags2 & CODEC_FLAG2_BPYRAMID;
- avctx->has_b_frames= avctx->flags2 & CODEC_FLAG2_BPYRAMID ? 2 : !!avctx->max_b_frames;
-@@ -227,8 +229,6 @@
- x4->params.analyse.i_me_range = avctx->me_range;
- x4->params.analyse.i_subpel_refine = avctx->me_subpel_quality;
-
-- x4->params.analyse.b_bidir_me = avctx->bidir_refine > 0;
-- x4->params.analyse.b_bframe_rdo = avctx->flags2 & CODEC_FLAG2_BRDO;
- x4->params.analyse.b_mixed_references =
- avctx->flags2 & CODEC_FLAG2_MIXED_REFS;
- x4->params.analyse.b_chroma_me = avctx->me_cmp & FF_CMP_CHROMA;
Deleted: trunk/dports/multimedia/ffmpeg/files/patch-libavcodec_ppc_check_altivec.c.diff
===================================================================
--- trunk/dports/multimedia/ffmpeg/files/patch-libavcodec_ppc_check_altivec.c.diff 2009-03-13 11:05:57 UTC (rev 48054)
+++ trunk/dports/multimedia/ffmpeg/files/patch-libavcodec_ppc_check_altivec.c.diff 2009-03-13 15:10:52 UTC (rev 48055)
@@ -1,21 +0,0 @@
---- libavcodec/ppc/check_altivec.c.orig 2008-12-05 20:07:27.000000000 +0900
-+++ libavcodec/ppc/check_altivec.c 2008-12-08 05:20:52.000000000 +0900
-@@ -23,6 +23,18 @@
- */
-
- #ifdef __APPLE__
-+#ifndef u_char
-+typedef unsigned char u_char;
-+#endif /* u_char */
-+#ifndef u_short
-+typedef unsigned short u_short;
-+#endif /* u_short */
-+#ifndef u_int
-+typedef unsigned int u_int;
-+#endif /* u_int */
-+#ifndef u_long
-+typedef unsigned long u_long;
-+#endif /* u_long */
- #include <sys/sysctl.h>
- #elif __AMIGAOS4__
- #include <exec/exec.h>
Modified: trunk/dports/multimedia/ffmpeg/files/patch-libavfilter-avfilter.h.diff
===================================================================
--- trunk/dports/multimedia/ffmpeg/files/patch-libavfilter-avfilter.h.diff 2009-03-13 11:05:57 UTC (rev 48054)
+++ trunk/dports/multimedia/ffmpeg/files/patch-libavfilter-avfilter.h.diff 2009-03-13 15:10:52 UTC (rev 48055)
@@ -1,11 +1,11 @@
---- libavfilter/avfilter.h.orig 2008-12-11 14:10:03.000000000 -0800
-+++ libavfilter/avfilter.h 2008-12-11 14:19:01.000000000 -0800
+--- 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 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 2009-03-13 11:05:57 UTC (rev 48054)
+++ trunk/dports/multimedia/ffmpeg/files/patch-libswscale-swscale.h.diff 2009-03-13 15:10:52 UTC (rev 48055)
@@ -1,11 +1,11 @@
---- libswscale/swscale.h.orig 2008-12-11 14:15:54.000000000 -0800
-+++ libswscale/swscale.h 2008-12-11 14:18:22.000000000 -0800
+--- libswscale/swscale.h.orig 2009-03-02 08:26:26.000000000 -0800
++++ libswscale/swscale.h 2009-03-02 08:35:45.000000000 -0800
@@ -29,7 +29,7 @@
#include "libavutil/avutil.h"
-#define LIBSWSCALE_VERSION_MAJOR 0
+#define LIBSWSCALE_VERSION_MAJOR 1
- #define LIBSWSCALE_VERSION_MINOR 6
+ #define LIBSWSCALE_VERSION_MINOR 7
#define LIBSWSCALE_VERSION_MICRO 1
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090313/a2076db0/attachment.html>
More information about the macports-changes
mailing list