[122171] trunk/dports/multimedia/ffmpeg-devel

[devans at macports.org]

Revision: 122171
          https://trac.macports.org/changeset/122171
Author:   devans at macports.org
Date:     2014-07-16 09:03:15 -0700 (Wed, 16 Jul 2014)
Log Message:
-----------
ffmpeg-devel: update to recent git master, dependencies, configuration.

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

Modified: trunk/dports/multimedia/ffmpeg-devel/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg-devel/Portfile	2014-07-16 16:02:01 UTC (rev 122170)
+++ trunk/dports/multimedia/ffmpeg-devel/Portfile	2014-07-16 16:03:15 UTC (rev 122171)
@@ -8,8 +8,8 @@
 
 name            ffmpeg-devel
 conflicts       ffmpeg
-version         20140714
-set git_branch  d59536159379a1b8c5f7631025edfc4a7d40b048
+version         20140715
+set git_branch  9bc0410e4f891719b54a5788665526e22d94bb50
 license         LGPL-2.1+
 categories      multimedia
 maintainers     devans jeremyhu openmaintainer
@@ -50,8 +50,8 @@
 master_sites    "http://git.videolan.org/gitweb.cgi?p=ffmpeg.git;a=snapshot;h=${git_branch};sf=tgz;dummy="
 dist_subdir     ffmpeg
 
-checksums       rmd160  a857da15ce8f410aff948040420b30c452057717 \
-                sha256  1ec67b0a5ead68ff4ffce8f348b409a0a0292dd1d4ae893bb6308bed90f8e372
+checksums       rmd160  dab1ae24555b6d13dbe414288a067ec3b4f966fe \
+                sha256  b03dae6b14b520961a37b3075f8bb035d02e147771385429d030a3f7c9570080
 
 depends_build   port:pkgconfig \
                 port:gmake \
@@ -71,6 +71,7 @@
                 port:openjpeg15 \
                 port:fontconfig \
                 port:freetype \
+                port:fribidi \
                 path:lib/libspeex.dylib:speex \
                 port:libvpx \
                 port:libsdl \
@@ -124,6 +125,7 @@
         --enable-gnutls \
         --enable-fontconfig \
         --enable-libfreetype \
+        --enable-libfribidi \
         --disable-indev=jack \
         --disable-outdev=xv \
         --disable-vda \
@@ -216,9 +218,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+} {
@@ -233,12 +235,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+
 }
@@ -285,6 +289,7 @@
 ******* The following modules are GPLed:
 *******
 *******      postproc
+*******      libsambaclient
 *******      libx264
 *******      libxvid
 *******      opencore-amr

Modified: trunk/dports/multimedia/ffmpeg-devel/files/patch-libdc1394.diff
===================================================================
--- trunk/dports/multimedia/ffmpeg-devel/files/patch-libdc1394.diff	2014-07-16 16:02:01 UTC (rev 122170)
+++ trunk/dports/multimedia/ffmpeg-devel/files/patch-libdc1394.diff	2014-07-16 16:03:15 UTC (rev 122171)
@@ -1,6 +1,6 @@
---- configure.orig	2014-07-14 18:08:41.000000000 -0700
-+++ configure	2014-07-14 20:49:06.000000000 -0700
-@@ -4816,9 +4816,12 @@
+--- configure.orig	2014-07-16 05:38:42.000000000 -0700
++++ configure	2014-07-16 06:36:13.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/8461dc89/attachment.html>