zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ffmpeg: add v7.0.2 (fix CVE) (#46629)

Browse Source 
* ffmpeg: add v7.0.2 (fix CVE)
* ffmpeg: fix license directive for gpl variant
This commit is contained in:
Wouter Deconinck 2024-09-30 20:14:46 -05:00 committed by GitHub
parent d40ea48db7
commit 73036f9567
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
var/spack/repos/builtin/packages/ffmpeg/package.py
View File

@ -16,15 +16,13 @@ class Ffmpeg(AutotoolsPackage):
maintainers("xjrc") 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("master", branch="master")
version("7.0.2", sha256="1ed250407ea8f955cca2f1139da3229fbc13032a0802e4b744be195865ff1541")
version("7.0", sha256="a24d9074bf5523a65aaa9e7bd02afe4109ce79d69bd77d104fed3dab4b934d7a") version("7.0", sha256="a24d9074bf5523a65aaa9e7bd02afe4109ce79d69bd77d104fed3dab4b934d7a")
version( version("6.1.1", sha256="5e3133939a61ef64ac9b47ffd29a5ea6e337a4023ef0ad972094b4da844e3a20")
"6.1.1",
sha256="5e3133939a61ef64ac9b47ffd29a5ea6e337a4023ef0ad972094b4da844e3a20",
preferred=True,
)
version("6.0", sha256="47d062731c9f66a78380e35a19aac77cebceccd1c7cc309b9c82343ffc430c3d") version("6.0", sha256="47d062731c9f66a78380e35a19aac77cebceccd1c7cc309b9c82343ffc430c3d")
version("5.1.4", sha256="c3c1e316bf91468738dd0aff6eb1faab409f1edcd34fd1a4213626439bc5d743") version("5.1.4", sha256="c3c1e316bf91468738dd0aff6eb1faab409f1edcd34fd1a4213626439bc5d743")
version("5.1.3", sha256="5d5bef6a11f0c500588f9870ec965a30acc0d54d8b1e535da6554a32902d236d") version("5.1.3", sha256="5d5bef6a11f0c500588f9870ec965a30acc0d54d8b1e535da6554a32902d236d")
@ -51,7 +49,7 @@ class Ffmpeg(AutotoolsPackage):
variant( variant(
"gpl", "gpl",
default=True, 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("version3", default=True, description="upgrade (L)GPL to version 3")
variant( variant(