commit: 77bc1896b237888d9a4399b113433daac6a17a59 Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org> AuthorDate: Wed Feb 15 23:50:52 2023 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Thu Feb 16 09:51:05 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77bc1896
games-engines/openmw: stop requiring ffmpeg in osg Limit openmw-0.47 itself to <ffmpeg-5, but it's fixed in openmw-0.48 which is not released yet Bug: https://bugs.gentoo.org/834425 Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org> Signed-off-by: David Seifert <soap <AT> gentoo.org> .../openmw/{openmw-0.47.0-r1.ebuild => openmw-0.47.0-r2.ebuild} | 8 ++++---- games-engines/openmw/openmw-9999.ebuild | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/games-engines/openmw/openmw-0.47.0-r1.ebuild b/games-engines/openmw/openmw-0.47.0-r2.ebuild similarity index 94% rename from games-engines/openmw/openmw-0.47.0-r1.ebuild rename to games-engines/openmw/openmw-0.47.0-r2.ebuild index fd36783f0afe..91dd01645c25 100644 --- a/games-engines/openmw/openmw-0.47.0-r1.ebuild +++ b/games-engines/openmw/openmw-0.47.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -33,11 +33,11 @@ RDEPEND=" dev-libs/tinyxml[stl] media-libs/libsdl2[joystick,opengl,video] media-libs/openal - media-video/ffmpeg:= + <media-video/ffmpeg-5:= >=sci-physics/bullet-2.86:=[double-precision] virtual/opengl - osg-fork? ( >=dev-games/openscenegraph-openmw-3.6:=[collada(-),ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) - !osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[collada(-),ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) + osg-fork? ( >=dev-games/openscenegraph-openmw-3.6:=[collada(-),jpeg,png,sdl,svg,truetype,zlib] ) + !osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[collada(-),jpeg,png,sdl,svg,truetype,zlib] ) qt5? ( app-arch/unshield dev-qt/qtcore:5 diff --git a/games-engines/openmw/openmw-9999.ebuild b/games-engines/openmw/openmw-9999.ebuild index cec9ea8020ba..47e3aee609e5 100644 --- a/games-engines/openmw/openmw-9999.ebuild +++ b/games-engines/openmw/openmw-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -46,8 +46,8 @@ RDEPEND="${LUA_DEPS} media-video/ffmpeg:= >=sci-physics/bullet-2.86:=[double-precision] virtual/opengl - osg-fork? ( >=dev-games/openscenegraph-openmw-3.6:=[collada(-),ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) - !osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[collada(-),ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) + osg-fork? ( >=dev-games/openscenegraph-openmw-3.6:=[collada(-),jpeg,png,sdl,svg,truetype,zlib] ) + !osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[collada(-),jpeg,png,sdl,svg,truetype,zlib] ) qt5? ( app-arch/unshield dev-qt/qtcore:5
