Changeset 116084 for trunk/dports

Timestamp:

Jan 17, 2014, 9:38:56 PM (10 years ago)

Author:

devans@…

Message:

ffmpeg, ffmpeg-devel: dependencies, configuration (#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.

Location:

trunk/dports/multimedia

Files:

• ffmpeg-devel/Portfile (modified) (6 diffs)
• ffmpeg-devel/files (added)
• ffmpeg-devel/files/patch-libdc1394.diff (added)
• ffmpeg/Portfile (modified) (6 diffs)
• ffmpeg/files (added)
• ffmpeg/files/patch-libdc1394.diff (added)

trunk/dports/multimedia/ffmpeg-devel/Portfile

@@ -10 +10 @@
 conflicts       ffmpeg
 version         20140116
+revision        1
 set git_branch  3ca7085ae2f7734746174762e76a9b2b1c6e8626
 license         LGPL-2.1+
@@ -59 +60 @@
 
 depends_lib     port:lame \
+                port:libiconv \
                 port:libvorbis \
                 port:libopus \
@@ -69 +71 @@
                 port:gnutls \
                 port:openjpeg15 \
+                port:fontconfig \
                 port:freetype \
                 path:lib/libspeex.dylib:speex \
@@ -82 +85 @@
     error "git branch hash must be at least 7 characters long."
 }
+
+patchfiles      patch-libdc1394.diff
 
 build.cmd       ${prefix}/bin/gmake
@@ -119 +124 @@
         --enable-libbluray \
         --enable-gnutls \
+        --enable-fontconfig \
         --enable-libfreetype \
         --disable-indev=jack \
@@ -185 +191 @@
         configure.args-append --enable-yasm
     }
+}
+
+variant libdc1394 description {Enable IIDC-1394 frame grabbing using libdc1394 (experimental)} {
+    depends_lib-append port:libdc1394
+    configure.args-append --enable-libdc1394
 }
 

trunk/dports/multimedia/ffmpeg/Portfile

@@ -11 +11 @@
 epoch           1
 version         2.1.3
+revision        1
 license         LGPL-2.1+
 categories      multimedia
@@ -60 +61 @@
 
 depends_lib     port:lame \
+                port:libiconv \
                 port:libvorbis \
                 port:libopus \
@@ -70 +72 @@
                 port:gnutls \
                 port:openjpeg15 \
+                port:fontconfig \
                 port:freetype \
                 path:lib/libspeex.dylib:speex \
@@ -76 +79 @@
                 port:bzip2 \
                 port:zlib
+
+patchfiles      patch-libdc1394.diff
 
 build.cmd       ${prefix}/bin/gmake
@@ -113 +118 @@
         --enable-libbluray \
         --enable-gnutls \
+        --enable-fontconfig \
         --enable-libfreetype \
         --disable-indev=jack \
@@ -179 +185 @@
         configure.args-append --enable-yasm
     }
+}
+
+variant libdc1394 description {Enable IIDC-1394 frame grabbing using libdc1394 (experimental)} {
+    depends_lib-append port:libdc1394
+    configure.args-append --enable-libdc1394
 }