diff options
| author | Martin Aumüller <aumuell@reserv.at> | 2024-03-28 11:21:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-28 11:21:47 +0100 |
| commit | abced0e87d4f19939ad47590dde705abe5cd225e (patch) | |
| tree | f67f98557bb540ace9ea191691bd54618bc60292 /var | |
| parent | 300fc2ee420ab57714ef5d9d840544a104d230fe (diff) | |
| download | spack-abced0e87d4f19939ad47590dde705abe5cd225e.tar.gz spack-abced0e87d4f19939ad47590dde705abe5cd225e.tar.bz2 spack-abced0e87d4f19939ad47590dde705abe5cd225e.tar.xz spack-abced0e87d4f19939ad47590dde705abe5cd225e.zip | |
openscenegraph: patch for compatibility with ffmpeg@5: (#43051)
Co-authored-by: aumuell <aumuell@users.noreply.github.com>
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/openscenegraph/package.py | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/openscenegraph/package.py b/var/spack/repos/builtin/packages/openscenegraph/package.py index 060eb6529e..c1ec2f5010 100644 --- a/var/spack/repos/builtin/packages/openscenegraph/package.py +++ b/var/spack/repos/builtin/packages/openscenegraph/package.py @@ -74,10 +74,19 @@ class Openscenegraph(CMakePackage): depends_on("poppler+glib", when="+pdf") depends_on("librsvg", when="+svg") - depends_on("ffmpeg@:4 +avresample", when="+ffmpeg") - # https://github.com/openscenegraph/OpenSceneGraph/issues/167 - depends_on("ffmpeg@:2", when="@:3.4.0+ffmpeg") - + with when("+ffmpeg"): + depends_on("ffmpeg") + requires("^ffmpeg +avresample", when="^ffmpeg@:4") + # https://github.com/openscenegraph/OpenSceneGraph/issues/167 + depends_on("ffmpeg@:2", when="@:3.4.0") + + # patch submitted for inclusion in OpenSceneGraph for extending compatibility + # with ffmpeg from versions up to 4 to versions 5 & 6 + patch( + "https://github.com/openscenegraph/OpenSceneGraph/pull/1281/commits/759620a3b7b787c960a7e414ba26ab5497817d40.patch?full_index=1", + sha256="b8f588d1fba9361127a7d5127e0720a4d64f44ef021515d1d67d77dcacdef8fd", + when="@3.6:", + ) patch("glibc-jasper.patch", when="@3.4%gcc") # from gentoo: https://raw.githubusercontent.com/gentoo/gentoo/9523b20c27d12dd72d1fd5ced3ba4995099925a2/dev-games/openscenegraph/files/openscenegraph-3.6.5-openexr3.patch patch("openscenegraph-3.6.5-openexr3.patch", when="@3.6:") |