Ignore:
Timestamp:
Jul 31, 2012, 4:53:17 PM (7 years ago)
Author:
jeremyhu@…
Message:

ffmpeg*: Eliminate no_ variants, add gpl3 variant for opencore-amr. Closes #33503.

File:
1 edited

Legend:

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

    r96090 r96093  
    1010epoch           1
    1111version         0.7.13
     12revision        1
    1213set branch      [join [lrange [split ${version} .] 0 1] .]
    13 license         GPL-2+
     14license         LGPL-2.1+
    1415categories      multimedia
    1516maintainers     devans openmaintainer
     
    6768                port:openjpeg \
    6869                path:lib/libspeex.dylib:speex \
    69                 port:XviD \
    70                 port:x264 \
    7170                port:libvpx \
    7271                path:lib/pkgconfig/sdl.pc:libsdl \
     
    110109configure.cflags-append    -DHAVE_LRINTF ${configure.cppflags}
    111110configure.args \
    112         --enable-gpl \
    113         --enable-postproc \
    114111        --enable-swscale --enable-avfilter \
    115112        --enable-libmp3lame \
     
    118115        --enable-libdirac --enable-libschroedinger \
    119116        --enable-libopenjpeg \
    120         --enable-libxvid \
    121         --enable-libx264 \
    122117        --enable-libvpx \
    123118        --enable-libspeex \
     
    182177}
    183178
    184 variant no_gpl conflicts nonfree description {disallow use of GPL code, license will be LGPL} {
    185     configure.args-delete   --enable-gpl \
     179variant gpl2 description {Enable GPL code, license will be GPL-2+} {
     180    configure.args-append   --enable-gpl \
    186181                            --enable-postproc \
    187182                            --enable-libx264 \
    188183                            --enable-libxvid
    189     depends_lib-delete      port:XviD \
     184    depends_lib-append      port:XviD \
    190185                            port:x264
    191     license-delete          GPL-2+
    192     license-append          LGPL-2.1+
    193 }
     186    license-delete          LGPL-2.1+
     187    license-append          GPL-2+
     188}
     189
     190variant gpl3 requires gpl2 description {Enable GPL code, license will be GPL-3+} {
     191    configure.args-append   --enable-version3 \
     192                            --enable-libopencore-amrnb \
     193                            --enable-libopencore-amrwb
     194    depends_lib-append      port:opencore-amr
     195    license-delete          LGPL-2.1+
     196    license-append          GPL-3+
     197}
     198
    194199
    195200# the build server uses the default variants, and we want distributable binaries
    196201# nonfree code is disabled by default but can be enabled using the +nonfree variant
    197202
    198 variant nonfree conflicts no_gpl description {enable nonfree code, libraries and binaries will not be redistributable} {
     203variant nonfree description {enable nonfree code, libraries and binaries will not be redistributable} {
    199204    configure.args-append   --enable-nonfree \
    200205                            --enable-libfaac
    201206    depends_lib-append      port:faac
    202     license-delete          GPL-2+
     207    license-delete          LGPL-2.1+
    203208    license-append          Restrictive
    204209}
     
    223228*******
    224229"
    225 } elseif {![variant_isset no_gpl]} {
     230} elseif {[variant_isset gpl3]} {
    226231notes "
    227232*******
    228233******* This build of ${name} includes GPLed code and
    229 ******* is therefore licensed under GPL v2 or later.
     234******* is therefore licensed under GPL v3 or later.
    230235*******
    231236******* The following modules are GPLed:
     
    234239*******      libx264
    235240*******      libxvid
    236 *******
    237 ******* To include all nonfree, GPLed and LGPL code use variant +nonfree
    238 ******* To remove nonfree and GPLed code leaving only LGPL code use variant +no_gpl
     241*******      opencore-amr
     242*******
     243******* To include all nonfree, GPLed and LGPL code use variant +nonfree.
     244******* To remove nonfree and GPLed code leaving only LGPL code remove the
     245******* +gpl2 and +gpl3 variants.
     246*******
     247"
     248} elseif {[variant_isset gpl2]} {
     249notes "
     250*******
     251******* This build of ${name} includes GPLed code and
     252******* is therefore licensed under GPL v2 or later.
     253*******
     254******* The following modules are GPLed:
     255*******
     256*******      postproc
     257*******      libx264
     258*******      libxvid
     259*******
     260******* To include all nonfree, GPLed and LGPL code use variant +nonfree.
     261******* To remove nonfree and GPLed code leaving only LGPL code remove the
     262******* +gpl2 variant.
    239263*******
    240264"
Note: See TracChangeset for help on using the changeset viewer.