diff options
| author | Wouter Deconinck <wdconinc@gmail.com> | 2024-09-30 20:14:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-30 18:14:46 -0700 |
| commit | 73036f95673ea1b0ff451f7df7a687c18b65826a (patch) | |
| tree | a02bfbdf04cb56fde082a0a459fb139bca11bbd4 | |
| parent | d40ea48db7a5e3174d32227aea78b52a93afc994 (diff) | |
| download | spack-73036f95673ea1b0ff451f7df7a687c18b65826a.tar.gz spack-73036f95673ea1b0ff451f7df7a687c18b65826a.tar.bz2 spack-73036f95673ea1b0ff451f7df7a687c18b65826a.tar.xz spack-73036f95673ea1b0ff451f7df7a687c18b65826a.zip | |
ffmpeg: add v7.0.2 (fix CVE) (#46629)
* ffmpeg: add v7.0.2 (fix CVE)
* ffmpeg: fix license directive for gpl variant
| -rw-r--r-- | var/spack/repos/builtin/packages/ffmpeg/package.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/ffmpeg/package.py b/var/spack/repos/builtin/packages/ffmpeg/package.py index c9b944106a..da2057605b 100644 --- a/var/spack/repos/builtin/packages/ffmpeg/package.py +++ b/var/spack/repos/builtin/packages/ffmpeg/package.py @@ -16,15 +16,13 @@ class Ffmpeg(AutotoolsPackage): maintainers("xjrc") - license("GPL-2.0-or-later AND LGPL-2.1-or-later") + license("LGPL-2.1-or-later", when="~gpl", checked_by="wdconinc") + license("LGPL-2.1-or-later AND GPL-2.0-or-later", when="+gpl", checked_by="wdconinc") version("master", branch="master") + version("7.0.2", sha256="1ed250407ea8f955cca2f1139da3229fbc13032a0802e4b744be195865ff1541") version("7.0", sha256="a24d9074bf5523a65aaa9e7bd02afe4109ce79d69bd77d104fed3dab4b934d7a") - version( - "6.1.1", - sha256="5e3133939a61ef64ac9b47ffd29a5ea6e337a4023ef0ad972094b4da844e3a20", - preferred=True, - ) + version("6.1.1", sha256="5e3133939a61ef64ac9b47ffd29a5ea6e337a4023ef0ad972094b4da844e3a20") version("6.0", sha256="47d062731c9f66a78380e35a19aac77cebceccd1c7cc309b9c82343ffc430c3d") version("5.1.4", sha256="c3c1e316bf91468738dd0aff6eb1faab409f1edcd34fd1a4213626439bc5d743") version("5.1.3", sha256="5d5bef6a11f0c500588f9870ec965a30acc0d54d8b1e535da6554a32902d236d") @@ -51,7 +49,7 @@ class Ffmpeg(AutotoolsPackage): variant( "gpl", default=True, - description="allow use of GPL code, the resulting libs " "and binaries will be under GPL", + description="allow use of GPL code, the resulting libs and binaries will be under GPL", ) variant("version3", default=True, description="upgrade (L)GPL to version 3") variant( |