Ignore:
Timestamp:
Sep 9, 2011, 5:23:37 PM (8 years ago)
Author:
devans@…
Message:

ffmpeg, ffmpeg-devel:

  • remove confusing default variant +no_nonfree
  • default build without any variants builds a distributable binary by disabling nonfree code
  • add a new +nonfree variant to enable nonfree code (libfaac support) if desired
  • update notes to reflect change
  • minor fix to x264 dependency
  • addresses issue raised in #31185
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/multimedia/ffmpeg/Portfile

    r83674 r83708  
    1111version         0.7.4
    1212set branch      [join [lrange [split ${version} .] 0 1] .]
    13 license         nonfree GPL-2+ LGPL-2.1+
     13license         GPL-2+ LGPL-2.1+
    1414categories      multimedia
    1515maintainers     devans openmaintainer
     
    6565                port:dirac \
    6666                port:schroedinger \
    67                 port:faac \
    6867                path:lib/libspeex.dylib:speex \
    6968                port:XviD \
     
    104103configure.cflags-append    -DHAVE_LRINTF ${configure.cppflags}
    105104configure.args \
    106         --enable-nonfree \
    107105        --enable-gpl \
    108106        --enable-postproc \
     
    112110        --enable-libtheora \
    113111        --enable-libdirac --enable-libschroedinger \
    114         --enable-libfaac \
    115112        --enable-libxvid \
    116113        --enable-libx264 \
     
    171168}
    172169
    173 variant no_gpl description {disallow use of GPL code, license will be LGPL} {
     170variant no_gpl conflicts nonfree description {disallow use of GPL code, license will be LGPL} {
    174171    configure.args-delete   --enable-gpl \
    175172                            --enable-postproc \
    176173                            --enable-libx264 \
    177174                            --enable-libxvid
    178     depends_lib-delete      port:XviD
    179     depends_build-delete    port:x264
     175    depends_lib-delete      port:XviD \
     176                            port:x264
    180177    license-delete          GPL-2+
    181178}
    182179
    183 variant no_nonfree description {disallow use of nonfree code, libraries and binaries will be redistributable under GPL/LGPL} {
    184     configure.args-delete   --enable-nonfree \
     180# the build server uses the default variants, and we want distributable binaries
     181# nonfree code is disabled by default but can be enabled using the +nonfree variant
     182
     183variant nonfree conflicts no_gpl description {enable nonfree code, libraries and binaries will not be redistributable} {
     184    configure.args-append   --enable-nonfree \
    185185                            --enable-libfaac
    186     depends_lib-delete      port:faac
    187     license-delete          nonfree
    188 }
    189 
    190 # the build server uses the default variants, and we want distributable binaries
    191 
    192 default_variants    +no_nonfree
     186    depends_lib-append      port:faac
     187    license-append          nonfree
     188}
    193189
    194190#
     
    203199}
    204200
    205 if {![variant_isset no_nonfree]} {
     201if {[variant_isset nonfree]} {
    206202notes "
    207203*******
     
    219215*******     libavutil
    220216*******
    221 ******* To remove this restriction use variant +no_nonfree
     217******* To remove this restriction remove the variant +nonfree
    222218*******
    223219"
     
    234230*******      libxvid
    235231*******
    236 ******* To include only LGPLed code use variant +no_gpl +no_nonfree
     232******* To include all nonfree, GPLed and LGPL code use variant +nonfree
     233******* To remove nonfree and GPLed code leaving only LGPL code use variant +no_gpl
    237234*******
    238235"
Note: See TracChangeset for help on using the changeset viewer.