Ticket #46700: ffmpeg.Portfile.diff

File ffmpeg.Portfile.diff, 1.6 KB (added by eirnym (Arseny Nasokin), 8 years ago)

Require nonfree variant for openssl

  • Portfile

     
    7070                port:schroedinger \
    7171                port:libass \
    7272                port:libbluray \
    73                 port:gnutls \
    7473                port:openjpeg15 \
    7574                port:fontconfig \
    7675                port:freetype \
     
    9998
    10099# The old ffmpeg port was GPL-2+ as base and had a no_gpl variant, so this keeps us consistent
    101100# Also, -gpl2 causes other ports to fail to build due to the missing libpostproc (#35473)
    102 default_variants-append +gpl2
     101default_variants-append +gpl2
     102default_variants-append +gnutls
    103103
    104104configure.cflags-append    -DHAVE_LRINTF ${configure.cppflags}
    105105configure.args \
     
    118118        --enable-libass \
    119119        --enable-libbluray \
    120120        --enable-lzma \
    121         --enable-gnutls \
    122121        --enable-fontconfig \
    123122        --enable-libfreetype \
    124123        --enable-libfribidi \
     
    253252    license-append          GPL-2+
    254253}
    255254
     255
    256256# libsmbclient causes build failure when +gpl3 is selected (#46244)
    257257# disable until underlying cause is identified and addressed
    258258
     
    282282    license-append          Restrictive
    283283}
    284284
     285variant gnutls conflicts openssl description {Enable SSL using GnuTLS} {
     286    depends_lib-append      port:gnutls
     287    configure.args-append --enable-gnutls
     288}
     289
     290variant openssl requires nonfree conflicts gnutls description {Enable SSL using OpenSSL} {
     291    configure.args-append --enable-openssl
     292}
     293
    285294if {[variant_isset nonfree]} {
    286295notes "
    287296*******