Revision: 79909 http://trac.macports.org/changeset/79909 Author: jeremyhu@macports.org Date: 2011-06-29 00:45:36 -0700 (Wed, 29 Jun 2011) Log Message: ----------- ffmpeg-devel: Update to current ffmpeg git, clang build fixes Modified Paths: -------------- trunk/dports/multimedia/ffmpeg-devel/Portfile Removed Paths: ------------- trunk/dports/multimedia/ffmpeg-devel/files/patch-Makefile.diff Modified: trunk/dports/multimedia/ffmpeg-devel/Portfile =================================================================== --- trunk/dports/multimedia/ffmpeg-devel/Portfile 2011-06-29 07:44:35 UTC (rev 79908) +++ trunk/dports/multimedia/ffmpeg-devel/Portfile 2011-06-29 07:45:36 UTC (rev 79909) @@ -6,9 +6,8 @@ name ffmpeg-devel conflicts ffmpeg -set svn_rev 25102 -set swscale_rev 32106 -version ${svn_rev} +set rev 9e17d051ac9b113b70980373b8489ca469505f3f +version 20110628 license nonfree GPL-2+ LGPL-2.1+ categories multimedia maintainers devans openmaintainer @@ -49,10 +48,10 @@ master_sites distfiles -worksrcdir trunk +worksrcdir ffmpeg depends_build port:pkgconfig \ - bin:svn:subversion \ + bin:git:git-core \ port:gmake \ port:texi2html @@ -73,19 +72,19 @@ 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} + if {[file isdirectory ${distpath}/${rev}]} { + if {![file exists ${distpath}/${rev}/.complete]} { + file delete -force ${distpath}/${rev} } } } fetch { - if {![file isdirectory ${distpath}/${svn_rev}]} { - file mkdir ${distpath}/${svn_rev} - system "svn co --ignore-externals svn://svn.ffmpeg.org/ffmpeg/trunk@${svn_rev} ${distpath}/${svn_rev}/trunk" - system "svn co svn://svn.ffmpeg.org/mplayer/trunk/libswscale@${swscale_rev} ${distpath}/${svn_rev}/trunk/libswscale" - system "touch ${distpath}/${svn_rev}/trunk/.complete" + if {![file isdirectory ${distpath}/${rev}]} { + file mkdir ${distpath}/${rev}/ffmpeg + system "git clone --depth 1000 git://git.videolan.org/ffmpeg.git ${distpath}/${rev}/ffmpeg" + system "cd ${distpath}/${rev}/ffmpeg && git checkout -f ${rev}" + system "touch ${distpath}/${rev}/.complete" } } @@ -96,11 +95,9 @@ minimum_xcodeversions {9 3.1} extract { - file copy ${distpath}/${svn_rev}/trunk ${worksrcpath} + file copy ${distpath}/${rev}/ffmpeg ${worksrcpath} } -patchfiles patch-Makefile.diff - configure.cflags-append -DHAVE_LRINTF ${configure.cppflags} configure.args \ --enable-nonfree \ Deleted: trunk/dports/multimedia/ffmpeg-devel/files/patch-Makefile.diff =================================================================== --- trunk/dports/multimedia/ffmpeg-devel/files/patch-Makefile.diff 2011-06-29 07:44:35 UTC (rev 79908) +++ trunk/dports/multimedia/ffmpeg-devel/files/patch-Makefile.diff 2011-06-29 07:45:36 UTC (rev 79909) @@ -1,11 +0,0 @@ ---- Makefile.orig 2010-08-03 02:31:29.000000000 -0700 -+++ Makefile 2010-08-03 02:49:32.000000000 -0700 -@@ -121,7 +121,7 @@ - - doc/%.html: TAG = HTML - doc/%.html: doc/%.texi -- $(M)cd doc && texi2html -monolithic -number $(<:doc/%=%) -+ $(M)cd doc && texi2html $(<:doc/%=%) - - doc/%.pod: TAG = POD - doc/%.pod: doc/%-doc.texi