Revision: 70306 http://trac.macports.org/changeset/70306 Author: devans@macports.org Date: 2010-08-05 12:26:02 -0700 (Thu, 05 Aug 2010) Log Message: ----------- gimp-gap-devel: * update to latest git master * pre-extract embedded ffmpeg source and 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 Modified Paths: -------------- trunk/dports/graphics/gimp-gap-devel/Portfile Added Paths: ----------- trunk/dports/graphics/gimp-gap-devel/files/ trunk/dports/graphics/gimp-gap-devel/files/patch-extern_libs-configure_options_ffmpeg.txt.diff trunk/dports/graphics/gimp-gap-devel/files/patch-ffmpeg-Makefile.diff Modified: trunk/dports/graphics/gimp-gap-devel/Portfile =================================================================== --- trunk/dports/graphics/gimp-gap-devel/Portfile 2010-08-05 19:22:22 UTC (rev 70305) +++ trunk/dports/graphics/gimp-gap-devel/Portfile 2010-08-05 19:26:02 UTC (rev 70306) @@ -7,7 +7,7 @@ conflicts gimp-gap set git_name gimp-gap version 2.7.0 -revision 3 +revision 4 categories graphics maintainers devans @@ -20,14 +20,31 @@ leading up to a stable version 2.8. universal_variant no +use_parallel_build no homepage http://www.gimp.org/ platforms darwin fetch.type git git.url git://git.gnome.org/${git_name} -git.branch 58844b7a +git.branch ab07c18b +pre-patch { + system "cd ${worksrcpath}/extern_libs && gzip -dc ffmpeg.tar.gz | gnutar -xf -" + } + +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:git-core \ port:pkgconfig \ port:autoconf \ @@ -36,20 +53,25 @@ port:p5-xml-parser \ port:gmake -depends_lib port:gimp2 \ +depends_lib path:lib/pkgconfig/gimp-2.0.pc:gimp2 \ port:faac \ port:faad2 \ - port:x264 \ port:lame \ port:XviD -depends_run port:MPlayer +# +# make mplayer-devel the default as MPlayer doesn't build on Snow Leopard +# +depends_run path:bin/mplayer:mplayer-devel + configure.cmd ./autogen.sh configure.args --disable-audio-support \ --disable-libmpeg3 \ + --disable-ff-libx264 \ --enable-gdkpixbuf-pview \ + --with-ffmpegsrcdir=${worksrcpath}/extern_libs/ffmpeg \ --with-ff-extra-cflags=-I${prefix}/include \ --with-ff-extra-ldflags=-L${prefix}/lib Added: trunk/dports/graphics/gimp-gap-devel/files/patch-extern_libs-configure_options_ffmpeg.txt.diff =================================================================== --- trunk/dports/graphics/gimp-gap-devel/files/patch-extern_libs-configure_options_ffmpeg.txt.diff (rev 0) +++ trunk/dports/graphics/gimp-gap-devel/files/patch-extern_libs-configure_options_ffmpeg.txt.diff 2010-08-05 19:26:02 UTC (rev 70306) @@ -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-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-devel/files/patch-ffmpeg-Makefile.diff =================================================================== --- trunk/dports/graphics/gimp-gap-devel/files/patch-ffmpeg-Makefile.diff (rev 0) +++ trunk/dports/graphics/gimp-gap-devel/files/patch-ffmpeg-Makefile.diff 2010-08-05 19:26:02 UTC (rev 70306) @@ -0,0 +1,16 @@ +--- extern_libs/ffmpeg/Makefile.orig 2010-08-04 19:25:32.000000000 -0700 ++++ extern_libs/ffmpeg//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 $<