[116084] trunk/dports/multimedia
devans at macports.org
devans at macports.org
Fri Jan 17 13:38:56 PST 2014
Revision: 116084
https://trac.macports.org/changeset/116084
Author: devans at macports.org
Date: 2014-01-17 13:38:56 -0800 (Fri, 17 Jan 2014)
Log 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.
Modified Paths:
--------------
trunk/dports/multimedia/ffmpeg/Portfile
trunk/dports/multimedia/ffmpeg-devel/Portfile
Added Paths:
-----------
trunk/dports/multimedia/ffmpeg/files/
trunk/dports/multimedia/ffmpeg/files/patch-libdc1394.diff
trunk/dports/multimedia/ffmpeg-devel/files/
trunk/dports/multimedia/ffmpeg-devel/files/patch-libdc1394.diff
Modified: trunk/dports/multimedia/ffmpeg/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg/Portfile 2014-01-17 21:01:09 UTC (rev 116083)
+++ trunk/dports/multimedia/ffmpeg/Portfile 2014-01-17 21:38:56 UTC (rev 116084)
@@ -10,6 +10,7 @@
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 @@
port:texi2html
depends_lib port:lame \
+ port:libiconv \
port:libvorbis \
port:libopus \
port:libogg \
@@ -69,6 +71,7 @@
port:libbluray \
port:gnutls \
port:openjpeg15 \
+ port:fontconfig \
port:freetype \
path:lib/libspeex.dylib:speex \
port:libvpx \
@@ -76,6 +79,8 @@
port:bzip2 \
port:zlib
+patchfiles patch-libdc1394.diff
+
build.cmd ${prefix}/bin/gmake
build.env-append V=1
@@ -112,6 +117,7 @@
--enable-libass \
--enable-libbluray \
--enable-gnutls \
+ --enable-fontconfig \
--enable-libfreetype \
--disable-indev=jack \
--disable-outdev=xv \
@@ -180,6 +186,11 @@
}
}
+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 \
Added: trunk/dports/multimedia/ffmpeg/files/patch-libdc1394.diff
===================================================================
--- trunk/dports/multimedia/ffmpeg/files/patch-libdc1394.diff (rev 0)
+++ trunk/dports/multimedia/ffmpeg/files/patch-libdc1394.diff 2014-01-17 21:38:56 UTC (rev 116084)
@@ -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 "
Modified: trunk/dports/multimedia/ffmpeg-devel/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg-devel/Portfile 2014-01-17 21:01:09 UTC (rev 116083)
+++ trunk/dports/multimedia/ffmpeg-devel/Portfile 2014-01-17 21:38:56 UTC (rev 116084)
@@ -9,6 +9,7 @@
name ffmpeg-devel
conflicts ffmpeg
version 20140116
+revision 1
set git_branch 3ca7085ae2f7734746174762e76a9b2b1c6e8626
license LGPL-2.1+
categories multimedia
@@ -58,6 +59,7 @@
port:texi2html
depends_lib port:lame \
+ port:libiconv \
port:libvorbis \
port:libopus \
port:libogg \
@@ -68,6 +70,7 @@
port:libbluray \
port:gnutls \
port:openjpeg15 \
+ port:fontconfig \
port:freetype \
path:lib/libspeex.dylib:speex \
port:libvpx \
@@ -82,6 +85,8 @@
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 @@
--enable-libass \
--enable-libbluray \
--enable-gnutls \
+ --enable-fontconfig \
--enable-libfreetype \
--disable-indev=jack \
--disable-outdev=xv \
@@ -186,6 +192,11 @@
}
}
+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 \
Added: trunk/dports/multimedia/ffmpeg-devel/files/patch-libdc1394.diff
===================================================================
--- trunk/dports/multimedia/ffmpeg-devel/files/patch-libdc1394.diff (rev 0)
+++ trunk/dports/multimedia/ffmpeg-devel/files/patch-libdc1394.diff 2014-01-17 21:38:56 UTC (rev 116084)
@@ -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 "
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140117/6f5e0fae/attachment.html>
More information about the macports-changes
mailing list