[138604] trunk/dports/multimedia

[Ryan Schmidt]

> On Jul 13, 2015, at 6:51 PM, devans at macports.org wrote:
> 
> Revision
> 138604
> Author
> devans at macports.org
> Date
> 2015-07-13 16:51:32 -0700 (Mon, 13 Jul 2015)
> Log Message
> 
> ffmpeg, ffmpeg-devel: make libx265 support optional via +libx265 variant, only defined for non-universal builds on 10.6 or greater (#48336, #48338, #48331).
> Modified Paths
> 
> 	• trunk/dports/multimedia/ffmpeg/Portfile
> 	• trunk/dports/multimedia/ffmpeg-devel/Portfile

> +# x265 currently does not support OS X < 10.6 (#48336, #48338)
> +# x265 cmake issues cause universal build to fail (#48331)
> +# make libx265 support optional via +libx265 variant
> +# only define variant for non-universal builds on 10.6 or greater
> +
> +platform darwin {
> +    if {${os.major} > 8 && [variant_isset gpl2] && ![variant_isset universal]} {
> +        variant libx265 description {Build with support for encoding HEVC video using libx265} {
> +            configure.args-append   --enable-libx265
> +            depends_lib-append      port:x265
> +        }
> +    }
> +}
> +

The comments and commit message say you are defining the libx265 variant on OS X 10.6 or later, but the code actually defines the variant on OS X 10.5 or later. Which is correct?

Instead of only defining the variant when the gpl2 variant is set and the universal variant is not set, try always defining the variant, but marking it as requiring the gpl2 variant and conflicting with the universal variant.

variant libx265 requires gpl2 conflicts universal description {...} {
    ...
}