Revision: 70307 http://trac.macports.org/changeset/70307 Author: devans@macports.org Date: 2010-08-05 12:34:54 -0700 (Thu, 05 Aug 2010) Log Message: ----------- gimp-gap: * fetch latest ffmpeg 0.5.2 source instead of embedded source (0.6 not yet supported) * patch to build properly * use path dependency to allow either gimp2 or gimp2-devel * disable x264 support in ffmpeg (latest version not yet supported by gimp-gap) * default to mplayer-devel for run time dependency * update dependencies Modified Paths: -------------- trunk/dports/graphics/gimp-gap/Portfile Added Paths: ----------- trunk/dports/graphics/gimp-gap/files/ trunk/dports/graphics/gimp-gap/files/patch-extern_libs-configure_options_ffmpeg.txt.diff trunk/dports/graphics/gimp-gap/files/patch-ffmpeg-Makefile.diff Modified: trunk/dports/graphics/gimp-gap/Portfile =================================================================== --- trunk/dports/graphics/gimp-gap/Portfile 2010-08-05 19:26:02 UTC (rev 70306) +++ trunk/dports/graphics/gimp-gap/Portfile 2010-08-05 19:34:54 UTC (rev 70307) @@ -6,8 +6,10 @@ name gimp-gap conflicts gimp-gap-devel version 2.6.0 -revision 3 +revision 4 set branch [join [lrange [split ${version} .] 0 1] .] +set ffmpeg-vers 0.5.2 +set ffmpeg-name ffmpeg-${ffmpeg-vers} categories graphics maintainers devans @@ -19,34 +21,64 @@ sequences of single frames. universal_variant no +use_parallel_build no homepage http://www.gimp.org/ platforms darwin -master_sites gimp:gimp/plug-ins/v${branch}/gap/ +master_sites gimp:gimp/plug-ins/v${branch}/gap/:gap \ + http://www.ffmpeg.org/releases/:ffmpeg -checksums md5 249ed829de8b78675c0fe4ef4212089f \ - sha1 5ce9b73de4c992bd2a527197847033e15eb2c346 \ - rmd160 2121eae37bd02f8e784cd377d1a48515221a97e8 - use_bzip2 yes +distfiles ${distname}${extract.suffix}:gap \ + ${ffmpeg-name}${extract.suffix}:ffmpeg + +checksums ${distname}${extract.suffix} \ + md5 249ed829de8b78675c0fe4ef4212089f \ + sha1 5ce9b73de4c992bd2a527197847033e15eb2c346 \ + rmd160 2121eae37bd02f8e784cd377d1a48515221a97e8 \ + ${ffmpeg-name}${extract.suffix} \ + md5 451eb428ca97a72c00555d50944cdb24 \ + sha1 47baf6a95602e1a0120d2864816b13066c5c3973 \ + rmd160 c884f92ead5e5e2e781a1046727d78a041786b35 + +patchfiles patch-extern_libs-configure_options_ffmpeg.txt.diff \ + patch-ffmpeg-Makefile.diff + +post-patch { + if {$build_arch != ""} { + set ffmpeg_extras "--cc=${configure.cc} --arch=${build_arch}" + } else { + set ffmpeg_extras "--cc=${configure.cc}" + } + reinplace "s|MP_FFMPEG_EXTRAS|${ffmpeg_extras}|" ${worksrcpath}/extern_libs/configure_options_ffmpeg.txt + } + depends_build port:pkgconfig \ port:intltool \ port:p5-xml-parser \ - port:gmake + port:gmake \ + port:yasm -depends_lib port:gimp2 \ +depends_lib path:lib/pkgconfig/gimp-2.0.pc:gimp2 \ port:faac \ port:faad2 \ - port:x264 \ port:lame \ - port:XviD + port:XviD \ + port:bzip2 \ + port:zlib -depends_run path:bin/mplayer:MPlayer +# +# make mplayer-devel the default as MPlayer doesn't build on Snow Leopard +# +depends_run path:bin/mplayer:mplayer-devel + configure.args --disable-audio-support \ --disable-libmpeg3 \ + --disable-ff-libx264 \ --enable-gdkpixbuf-pview \ + --with-ffmpegsrcdir=${workpath}/${ffmpeg-name} \ --with-ff-extra-cflags=-I${prefix}/include \ --with-ff-extra-ldflags=-L${prefix}/lib Added: trunk/dports/graphics/gimp-gap/files/patch-extern_libs-configure_options_ffmpeg.txt.diff =================================================================== --- trunk/dports/graphics/gimp-gap/files/patch-extern_libs-configure_options_ffmpeg.txt.diff (rev 0) +++ trunk/dports/graphics/gimp-gap/files/patch-extern_libs-configure_options_ffmpeg.txt.diff 2010-08-05 19:34:54 UTC (rev 70307) @@ -0,0 +1,8 @@ +--- extern_libs/configure_options_ffmpeg.txt.orig 2010-08-04 11:21:45.000000000 -0700 ++++ extern_libs/configure_options_ffmpeg.txt 2010-08-04 12:13:36.000000000 -0700 +@@ -1,4 +1,4 @@ +---enable-shared --enable-static --disable-mmx --enable-gpl ++--enable-shared --enable-static --disable-amd3dnow --disable-amd3dnowext --disable-mmx --disable-mmx2 --disable-sse --disable-ssse3 --enable-nonfree --enable-gpl --disable-ffmpeg --disable-ffplay --disable-ffserver MP_FFMPEG_EXTRAS + # recent ffmpeg releases does no longer support --enable-liba52 + # for audio /mp3 encoding ffmpeg recommands to link with the external libraries. + # Added: trunk/dports/graphics/gimp-gap/files/patch-ffmpeg-Makefile.diff =================================================================== --- trunk/dports/graphics/gimp-gap/files/patch-ffmpeg-Makefile.diff (rev 0) +++ trunk/dports/graphics/gimp-gap/files/patch-ffmpeg-Makefile.diff 2010-08-05 19:34:54 UTC (rev 70307) @@ -0,0 +1,16 @@ +--- ../ffmpeg-0.5.2/Makefile.orig 2010-08-04 19:25:32.000000000 -0700 ++++ ../ffmpeg-0.5.2/Makefile 2010-08-04 19:27:27.000000000 -0700 +@@ -113,9 +113,10 @@ + VHOOK_DEPS = $(HOOKS:$(SLIBSUF)=.d) + depend dep: $(VHOOK_DEPS) + +-documentation: $(addprefix doc/, ffmpeg-doc.html faq.html ffserver-doc.html \ +- ffplay-doc.html general.html hooks.html \ +- $(ALLMANPAGES)) ++documentation: ++# documentation: $(addprefix doc/, ffmpeg-doc.html faq.html ffserver-doc.html \ ++# ffplay-doc.html general.html hooks.html \ ++# $(ALLMANPAGES)) + + doc/%.html: doc/%.texi + texi2html -monolithic -number $<