Revision

117554

Author

devans@macports.org

Date

2014-03-03 09:02:00 -0800 (Mon, 03 Mar 2014)

Log Message

ffmpeg: update to version 2.1.4, add support for Fraunhofer libfdk-aac codec (+nonfree only), now provides both vp8 and vp9 using libvpx 1.3.0.

Modified Paths

• trunk/dports/multimedia/ffmpeg/Portfile
• trunk/dports/multimedia/ffmpeg/files/patch-libdc1394.diff

Diff

--- trunk/dports/multimedia/ffmpeg/Portfile	2014-03-03 16:52:46 UTC (rev 117553)
+++ trunk/dports/multimedia/ffmpeg/Portfile	2014-03-03 17:02:00 UTC (rev 117554)
@@ -9,8 +9,7 @@
 name            ffmpeg
 conflicts       ffmpeg-devel
 epoch           1
-version         2.1.3
-revision        2
+version         2.1.4
 license         LGPL-2.1+
 categories      multimedia
 maintainers     devans jeremyhu openmaintainer
@@ -52,8 +51,8 @@
 
 use_bzip2       yes
 
-checksums       rmd160  432380d11ce83708131091cd77417e7eb0f13aa0 \
-                sha256  1d332e7fd35f87e1ffb6c9b0405cbfda085ef712ede0133a213793a4e66d13a3
+checksums       rmd160  66584f0264d1585bebf163f3cccf688f039a5bdd \
+                sha256  7fb46cbd686830db192968e2f117744b1e9cd23f2fcf5ee63e6cbeaa089a8101
 
 depends_build   port:pkgconfig \
                 port:gmake \
@@ -219,8 +218,10 @@
 
 variant nonfree description {enable nonfree code, libraries and binaries will not be redistributable} {
     configure.args-append   --enable-nonfree \
+                            --enable-libfdk-aac \
                             --enable-libfaac
-    depends_lib-append      port:faac
+    depends_lib-append      port:libfdk-aac \
+                            port:faac
     license-delete          LGPL-2.1+
     license-append          Restrictive
 }
@@ -231,6 +232,7 @@
 ******* This build of ${name} includes nonfree code as follows:
 *******
 *******     libfaac
+*******     libfdk-aac
 *******
 ******* The following libraries and binaries may not be redistributed:
 *******

--- trunk/dports/multimedia/ffmpeg/files/patch-libdc1394.diff	2014-03-03 16:52:46 UTC (rev 117553)
+++ trunk/dports/multimedia/ffmpeg/files/patch-libdc1394.diff	2014-03-03 17:02:00 UTC (rev 117554)
@@ -1,6 +1,6 @@
---- configure.orig	2014-01-17 09:06:53.000000000 -0800
-+++ configure	2014-01-17 09:07:35.000000000 -0800
-@@ -4358,9 +4358,12 @@
+--- configure.orig	2014-02-23 13:59:23.000000000 -0800
++++ configure	2014-03-01 08:42:11.000000000 -0800
+@@ -4359,9 +4359,12 @@
  fi
  
  # libdc1394 check