Revision: 124862 https://trac.macports.org/changeset/124862 Author: devans@macports.org Date: 2014-08-29 13:34:07 -0700 (Fri, 29 Aug 2014) Log Message: ----------- ffmpeg: add +x11 variant to indicate binary dependency on libX11 when building with libsdl +x11, ensures appropriate rebuilding when -x11 is asserted. Modified Paths: -------------- trunk/dports/multimedia/ffmpeg/Portfile Modified: trunk/dports/multimedia/ffmpeg/Portfile =================================================================== --- trunk/dports/multimedia/ffmpeg/Portfile 2014-08-29 16:44:28 UTC (rev 124861) +++ trunk/dports/multimedia/ffmpeg/Portfile 2014-08-29 20:34:07 UTC (rev 124862) @@ -1,15 +1,17 @@ # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 # $Id$ -PortSystem 1.0 -PortGroup xcodeversion 1.0 -PortGroup muniversal 1.0 -PortGroup compiler_blacklist_versions 1.0 +PortSystem 1.0 +PortGroup xcodeversion 1.0 +PortGroup muniversal 1.0 +PortGroup compiler_blacklist_versions 1.0 +PortGroup active_variants 1.1 name ffmpeg conflicts ffmpeg-devel epoch 1 version 2.3.3 +revision 1 license LGPL-2.1+ categories multimedia maintainers devans jeremyhu openmaintainer @@ -200,6 +202,19 @@ } } +# this dummy variant is used to mark whether ffmpeg is built with +# libsdl +x11 and hence has a binary dependency on xorg-libX11 +# or libsdl -x11 and does not + +variant x11 {} +default_variants +x11 + +if {[variant_isset x11]} { + require_active_variants libsdl x11 +} else { + require_active_variants libsdl "" x11 +} + variant libdc1394 description {Enable IIDC-1394 frame grabbing using libdc1394 (experimental)} { depends_lib-append port:libdc1394 configure.args-append --enable-libdc1394