[122170] trunk/dports/multimedia/ffmpeg

[devans at macports.org]

Revision: 122170
          https://trac.macports.org/changeset/122170
Author:   devans at macports.org
Date:     2014-07-16 09:02:01 -0700 (Wed, 16 Jul 2014)
Log Message:
-----------
ffmpeg: update to version 2.3, dependencies, configuration.

Modified Paths:
--------------
    trunk/dports/multimedia/ffmpeg/Portfile
    trunk/dports/multimedia/ffmpeg/files/patch-libdc1394.diff

Modified: trunk/dports/multimedia/ffmpeg/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg/Portfile	2014-07-16 15:09:14 UTC (rev 122169)
+++ trunk/dports/multimedia/ffmpeg/Portfile	2014-07-16 16:02:01 UTC (rev 122170)
@@ -9,7 +9,7 @@
 name            ffmpeg
 conflicts       ffmpeg-devel
 epoch           1
-version         2.2.5
+version         2.3
 license         LGPL-2.1+
 categories      multimedia
 maintainers     devans jeremyhu openmaintainer
@@ -51,8 +51,8 @@
 
 use_bzip2       yes
 
-checksums       rmd160  2584ee7fa1f5dc3608e8edef9bd5f218e1797a41 \
-                sha256  c8587a1ac91599dd87fcfb53de6e32b9ab81449e7f22ff55044faf7815a68633
+checksums       rmd160  8140c254d008cfc623ae42ffbda8e0f453b383c7 \
+                sha256  6b3dbb64e20951480bfd64bcbe305f6ee9031e5fccfd3b3e94cc5055525f809e
 
 depends_build   port:pkgconfig \
                 port:gmake \
@@ -72,6 +72,7 @@
                 port:openjpeg15 \
                 port:fontconfig \
                 port:freetype \
+                port:fribidi \
                 path:lib/libspeex.dylib:speex \
                 port:libvpx \
                 port:libsdl \
@@ -118,6 +119,7 @@
         --enable-gnutls \
         --enable-fontconfig \
         --enable-libfreetype \
+        --enable-libfribidi \
         --disable-indev=jack \
         --disable-outdev=xv \
         --disable-vda \
@@ -127,6 +129,7 @@
 
 # disable asm on Tiger
 # libblueray doesn't build on Tiger so disable for now (#39442)
+
 platform darwin {
     if {${os.major} < 9} {
         depends_lib-delete    port:libbluray
@@ -141,6 +144,11 @@
         configure.args-delete --disable-vda
         configure.args-append --enable-vda
     }
+
+    # kCVPixelFormatType_OneComponent8 used in avfoundation indev is only available on 10.8+
+    if {${os.major} < 12} {
+        configure.args-append --disable-indev=avfoundation
+    }
 }
 
 test.run        yes
@@ -152,7 +160,6 @@
 post-destroot {
     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
     }
@@ -205,9 +212,9 @@
 # https://trac.ffmpeg.org/ticket/1700
 
 variant librtmp description {Use librtmp (from rtmpdump) as rtmp[t][es]:// protocol handler} {
-    configure.args-append     --enable-librtmp
+    configure.args-append   --enable-librtmp
 
-    depends_lib-append        port:rtmpdump
+    depends_lib-append      port:rtmpdump
 }
 
 variant gpl2 description {Enable GPL code, license will be GPL-2+} {
@@ -222,12 +229,14 @@
 }
 
 variant gpl3 requires gpl2 description {Enable GPL code, license will be GPL-3+} {
-    configure.args-delete   --disable-libopencore-amrnb \
-                            --disable-libopencore-amrwb
     configure.args-append   --enable-version3 \
                             --enable-libopencore-amrnb \
-                            --enable-libopencore-amrwb
-    depends_lib-append      port:opencore-amr
+                            --enable-libopencore-amrwb \
+                            --enable-libsmbclient
+
+    depends_lib-append      port:opencore-amr \
+                            port:samba3
+
     license-delete          LGPL-2.1+
     license-append          GPL-3+
 }
@@ -274,6 +283,7 @@
 ******* The following modules are GPLed:
 *******
 *******      postproc
+*******      libsambaclient
 *******      libx264
 *******      libxvid
 *******      opencore-amr

Modified: trunk/dports/multimedia/ffmpeg/files/patch-libdc1394.diff
===================================================================
--- trunk/dports/multimedia/ffmpeg/files/patch-libdc1394.diff	2014-07-16 15:09:14 UTC (rev 122169)
+++ trunk/dports/multimedia/ffmpeg/files/patch-libdc1394.diff	2014-07-16 16:02:01 UTC (rev 122170)
@@ -1,6 +1,6 @@
---- configure.orig	2014-03-23 15:08:02.000000000 -0700
-+++ configure	2014-04-17 01:08:13.000000000 -0700
-@@ -4563,9 +4563,12 @@
+--- configure.orig	2014-07-15 18:00:37.000000000 -0700
++++ configure	2014-07-16 00:45:59.000000000 -0700
+@@ -4819,9 +4819,12 @@
  fi
  
  # libdc1394 check
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140716/203714a8/attachment.html>