ffmpeg, ffmpeg-devel: dependencies, configuration (https://trac.macpo…

…rts.org/ticket/36849). * add explicit dependency on libiconv to avoid opportunistic configuration * add dependency and enable fontconfig (fonts by name in filter drawtext) * add variant +libdc1394, enables experimental frame grabbing from FireWire cameras. * increment revision to rebuild with these features and libass.5. git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@116084 d073be05-634f-4543-b044-5fe20cf6d1d6
macports · Jan 17, 2014 · 885b977 · 885b977
1 parent 48d5114
commit 885b977
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 0 deletions.
diff --git a/multimedia/ffmpeg-devel/Portfile b/multimedia/ffmpeg-devel/Portfile
@@ -9,6 +9,7 @@ PortGroup compiler_blacklist_versions 1.0
 name            ffmpeg-devel
 conflicts       ffmpeg
 version         20140116
+revision        1
 set git_branch  3ca7085ae2f7734746174762e76a9b2b1c6e8626
 license         LGPL-2.1+
 categories      multimedia
@@ -58,6 +59,7 @@ depends_build   port:pkgconfig \
                 port:texi2html
 
 depends_lib     port:lame \
+                port:libiconv \
                 port:libvorbis \
                 port:libopus \
                 port:libogg \
@@ -68,6 +70,7 @@ depends_lib     port:lame \
                 port:libbluray \
                 port:gnutls \
                 port:openjpeg15 \
+                port:fontconfig \
                 port:freetype \
                 path:lib/libspeex.dylib:speex \
                 port:libvpx \
@@ -82,6 +85,8 @@ if {[string length "${git_branch}"] >= 7} {
     error "git branch hash must be at least 7 characters long."
 }
 
+patchfiles      patch-libdc1394.diff
+
 build.cmd       ${prefix}/bin/gmake
 build.env-append V=1
 
@@ -118,6 +123,7 @@ configure.args \
         --enable-libass \
         --enable-libbluray \
         --enable-gnutls \
+        --enable-fontconfig \
         --enable-libfreetype \
         --disable-indev=jack \
         --disable-outdev=xv \
@@ -186,6 +192,11 @@ if {[variant_isset universal]} {
     }
 }
 
+variant libdc1394 description {Enable IIDC-1394 frame grabbing using libdc1394 (experimental)} {
+    depends_lib-append port:libdc1394
+    configure.args-append --enable-libdc1394
+}
+
 variant gpl2 description {Enable GPL code, license will be GPL-2+} {
     configure.args-append   --enable-gpl \
                             --enable-postproc \

diff --git a/multimedia/ffmpeg-devel/files/patch-libdc1394.diff b/multimedia/ffmpeg-devel/files/patch-libdc1394.diff
@@ -0,0 +1,15 @@
+--- configure.orig	2014-01-17 09:06:53.000000000 -0800
++++ configure	2014-01-17 09:07:35.000000000 -0800
+@@ -4358,9 +4358,12 @@
+ fi
+
+ # libdc1394 check
++# libraw1394 only required for Linux
+ if enabled libdc1394; then
+     { check_lib dc1394/dc1394.h dc1394_new -ldc1394 -lraw1394 &&
+         enable libdc1394_2; } ||
++    { check_lib dc1394/dc1394.h dc1394_new -ldc1394 &&
++        enable libdc1394_2; } ||
+     { check_lib libdc1394/dc1394_control.h dc1394_create_handle -ldc1394_control -lraw1394 &&
+         enable libdc1394_1; } ||
+     die "ERROR: No version of libdc1394 found "
diff --git a/multimedia/ffmpeg/Portfile b/multimedia/ffmpeg/Portfile
@@ -10,6 +10,7 @@ name            ffmpeg
 conflicts       ffmpeg-devel
 epoch           1
 version         2.1.3
+revision        1
 license         LGPL-2.1+
 categories      multimedia
 maintainers     devans jeremyhu openmaintainer
@@ -59,6 +60,7 @@ depends_build   port:pkgconfig \
                 port:texi2html
 
 depends_lib     port:lame \
+                port:libiconv \
                 port:libvorbis \
                 port:libopus \
                 port:libogg \
@@ -69,13 +71,16 @@ depends_lib     port:lame \
                 port:libbluray \
                 port:gnutls \
                 port:openjpeg15 \
+                port:fontconfig \
                 port:freetype \
                 path:lib/libspeex.dylib:speex \
                 port:libvpx \
                 port:libsdl \
                 port:bzip2 \
                 port:zlib
 
+patchfiles      patch-libdc1394.diff
+
 build.cmd       ${prefix}/bin/gmake
 build.env-append V=1
 
@@ -112,6 +117,7 @@ configure.args \
         --enable-libass \
         --enable-libbluray \
         --enable-gnutls \
+        --enable-fontconfig \
         --enable-libfreetype \
         --disable-indev=jack \
         --disable-outdev=xv \
@@ -180,6 +186,11 @@ if {[variant_isset universal]} {
     }
 }
 
+variant libdc1394 description {Enable IIDC-1394 frame grabbing using libdc1394 (experimental)} {
+    depends_lib-append port:libdc1394
+    configure.args-append --enable-libdc1394
+}
+
 variant gpl2 description {Enable GPL code, license will be GPL-2+} {
     configure.args-append   --enable-gpl \
                             --enable-postproc \

diff --git a/multimedia/ffmpeg/files/patch-libdc1394.diff b/multimedia/ffmpeg/files/patch-libdc1394.diff
@@ -0,0 +1,15 @@
+--- configure.orig	2014-01-17 09:06:53.000000000 -0800
++++ configure	2014-01-17 09:07:35.000000000 -0800
+@@ -4358,9 +4358,12 @@
+ fi
+
+ # libdc1394 check
++# libraw1394 only required for Linux
+ if enabled libdc1394; then
+     { check_lib dc1394/dc1394.h dc1394_new -ldc1394 -lraw1394 &&
+         enable libdc1394_2; } ||
++    { check_lib dc1394/dc1394.h dc1394_new -ldc1394 &&
++        enable libdc1394_2; } ||
+     { check_lib libdc1394/dc1394_control.h dc1394_create_handle -ldc1394_control -lraw1394 &&
+         enable libdc1394_1; } ||
+     die "ERROR: No version of libdc1394 found "