[83668] trunk/dports/multimedia/ffmpeg

[devans at macports.org]

Revision: 83668
          http://trac.macports.org/changeset/83668
Author:   devans at macports.org
Date:     2011-09-08 19:29:52 -0700 (Thu, 08 Sep 2011)
Log Message:
-----------
ffmpeg: general cleanup
    * remove outdated dependencies and references to faad2
    * remove unused patch files
    * update docs installed during destroot
    * other minor cosmetic changes

Modified Paths:
--------------
    trunk/dports/multimedia/ffmpeg/Portfile

Removed Paths:
-------------
    trunk/dports/multimedia/ffmpeg/files/

Modified: trunk/dports/multimedia/ffmpeg/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg/Portfile	2011-09-08 22:41:38 UTC (rev 83667)
+++ trunk/dports/multimedia/ffmpeg/Portfile	2011-09-09 02:29:52 UTC (rev 83668)
@@ -64,7 +64,6 @@
                 port:dirac \
                 port:schroedinger \
                 port:faac \
-                port:faad2 \
                 path:lib/libspeex.dylib:speex \
                 port:XviD \
                 port:x264 \
@@ -103,6 +102,7 @@
 
 configure.cflags-append    -DHAVE_LRINTF ${configure.cppflags}
 configure.args \
+        --enable-nonfree \
         --enable-gpl \
         --enable-postproc \
         --enable-swscale --enable-avfilter \
@@ -115,7 +115,6 @@
         --enable-libx264 \
         --enable-libvpx \
         --enable-libspeex \
-        --enable-nonfree \
         --mandir=${prefix}/share/man \
         --enable-shared --enable-pthreads \
         --disable-indevs \
@@ -130,10 +129,11 @@
 #
 
 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/ffmpeg
+    file copy ${worksrcpath}/doc/APIchanges ${destroot}${prefix}/share/doc/ffmpeg
+    file copy ${worksrcpath}/doc/RELEASE_NOTES ${destroot}${prefix}/share/doc/ffmpeg
+    foreach f [glob ${worksrcpath}/doc/*.txt] {
+        file copy $f ${destroot}${prefix}/share/doc/ffmpeg
     }
 }
 
@@ -172,11 +172,9 @@
 variant no_gpl description {disallow use of GPL code, license will be LGPL} {
     configure.args-delete   --enable-gpl \
                             --enable-postproc \
-                            --enable-libfaad \
                             --enable-libx264 \
                             --enable-libxvid
-    depends_lib-delete      port:faad2 \
-                            port:XviD
+    depends_lib-delete      port:XviD
     depends_build-delete    port:x264
     license-delete          GPL-2+
 }
@@ -187,7 +185,9 @@
     depends_lib-delete      port:faac
     license-delete          nonfree
 }
+
 # the build server uses the default variants, and we want distributable binaries
+
 default_variants    +no_nonfree
 
 #
@@ -229,7 +229,6 @@
 ******* The following modules are GPLed:
 *******
 *******      postproc
-*******      libfaad
 *******      libx264
 *******      libxvid
 *******
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110908/59caeacc/attachment.html>