[46741] trunk/dports/multimedia/ffmpeg/Portfile

[Rainer Müller]

devans at macports.org wrote:
> Revision: 46741
>           http://trac.macports.org/changeset/46741
> Author:   devans at macports.org
> Date:     2009-02-11 13:00:11 -0800 (Wed, 11 Feb 2009)
> Log Message:
> -----------
> ffmpeg: remove --enable--nonfree configure option and +no_nonfree variants as nonfree applies only to libamr-nb and libamr-wb which are not provided by MacPorts due to license/patent issues (#16074), default install is now licensed under GPL.  Disabling x264 support which is broken in this revision.
> 
> Modified Paths:
> --------------
>     trunk/dports/multimedia/ffmpeg/Portfile
> 
> Modified: trunk/dports/multimedia/ffmpeg/Portfile
> ===================================================================
> --- trunk/dports/multimedia/ffmpeg/Portfile	2009-02-11 20:52:14 UTC (rev 46740)
> +++ trunk/dports/multimedia/ffmpeg/Portfile	2009-02-11 21:00:11 UTC (rev 46741)

[...]

> -variant no_gpl conflicts a52 description {disallow use of GPL code, license will be LGPL if +no_nonfree is selected} {
> +variant no_gpl conflicts a52 description {disallow use of GPL code, license will be LGPL} {
>      configure.args-delete   --enable-gpl
>      configure.args-delete   --enable-postproc
>      configure.args-delete   --enable-swscale
>      configure.args-delete   --enable-libfaad
>      depends_lib-delete      port:faad2
> -    configure.args-delete   --enable-libx264
> -    depends_build-delete    port:x264
> +#    configure.args-delete   --enable-libx264
> +#    depends_build-delete    port:x264
>      configure.args-delete   --enable-libxvid
>      depends_lib-delete      port:XviD
>  }

Either remove these lines or remove the comment, but please do not leave
such commented lines in Portfiles. Later authors might not have any clue
what is meant by that.

Rainer