Changeset 79909

Timestamp:

06/29/11 00:45:36 (4 years ago)

Author:

jeremyhu@…

Message:

ffmpeg-devel: Update to current ffmpeg git (#29215), clang build fixes

Location:

trunk/dports/multimedia/ffmpeg-devel

Files:

• Portfile (modified) (5 diffs)
• files/patch-Makefile.diff (deleted)

trunk/dports/multimedia/ffmpeg-devel/Portfile

@@ -7 +7 @@
 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
@@ -50 +49 @@
 distfiles
 
-worksrcdir      trunk
+worksrcdir      ffmpeg
 
 depends_build   port:pkgconfig \
-                bin:svn:subversion \
+                bin:git:git-core \
                 port:gmake \
                 port:texi2html
@@ -74 +73 @@
 
 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}
         }
     }
@@ -82 +81 @@
 
 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"
     }
 }
@@ -97 +96 @@
 
 extract {
-    file copy ${distpath}/${svn_rev}/trunk ${worksrcpath}
-}
-
-patchfiles patch-Makefile.diff
+    file copy ${distpath}/${rev}/ffmpeg ${worksrcpath}
+}
 
 configure.cflags-append    -DHAVE_LRINTF ${configure.cppflags}