From bea4321bf7f5d7c2a7992ed057a1f1651f89c334 Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sat, 25 Apr 2020 21:35:22 +0300 Subject: [PATCH] dev-games/openscenegraph: migrate from libav Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Mikle Kolyada --- dev-games/openscenegraph/openscenegraph-3.5.5.ebuild | 7 ++----- dev-games/openscenegraph/openscenegraph-3.6.4.ebuild | 7 ++----- dev-games/openscenegraph/openscenegraph-3.6.5.ebuild | 7 ++----- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild b/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild index 3538002c978d..250b3589885d 100644 --- a/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild +++ b/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild @@ -17,7 +17,7 @@ LICENSE="wxWinLL-3 LGPL-2.1" SLOT="0/145" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION KEYWORDS="amd64 ~hppa ppc ppc64 x86" IUSE="asio curl debug doc examples ffmpeg fltk fox gdal gif glut gstreamer jpeg -las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff +las lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff truetype vnc wxwidgets xine xrandr zlib" REQUIRED_USE="sdl2? ( sdl )" @@ -37,10 +37,7 @@ RDEPEND=" sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] ) ) - ffmpeg? ( - libav? ( media-video/libav:0= ) - !libav? ( media-video/ffmpeg:0= ) - ) + ffmpeg? ( media-video/ffmpeg:0= ) gdal? ( sci-libs/gdal ) gif? ( media-libs/giflib:= ) gstreamer? ( diff --git a/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild index 78b6b1ca5a34..c8d6dbf4fbbf 100644 --- a/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild +++ b/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild @@ -16,7 +16,7 @@ LICENSE="wxWinLL-3 LGPL-2.1" SLOT="0/158" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" IUSE="asio curl dicom debug doc egl examples ffmpeg fltk fox gdal gif glut -gstreamer jpeg las libav lua openexr openinventor osgapps pdf png sdl sdl2 +gstreamer jpeg las lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff truetype vnc wxwidgets xrandr +zlib" REQUIRED_USE="sdl2? ( sdl ) dicom? ( zlib ) openexr? ( zlib )" @@ -42,10 +42,7 @@ RDEPEND=" sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] ) ) - ffmpeg? ( - libav? ( media-video/libav:0= ) - !libav? ( media-video/ffmpeg:0= ) - ) + ffmpeg? ( media-video/ffmpeg:0= ) gdal? ( sci-libs/gdal:= ) gif? ( media-libs/giflib:= ) gstreamer? ( diff --git a/dev-games/openscenegraph/openscenegraph-3.6.5.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.5.ebuild index ac7435fee720..4614315778aa 100644 --- a/dev-games/openscenegraph/openscenegraph-3.6.5.ebuild +++ b/dev-games/openscenegraph/openscenegraph-3.6.5.ebuild @@ -16,7 +16,7 @@ LICENSE="wxWinLL-3 LGPL-2.1" SLOT="0/160" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" IUSE="asio curl dicom debug doc egl examples ffmpeg fltk fox gdal gif glut -gstreamer jpeg las libav lua openexr openinventor osgapps pdf png sdl sdl2 +gstreamer jpeg las lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff truetype vnc wxwidgets xrandr +zlib" REQUIRED_USE="sdl2? ( sdl ) dicom? ( zlib ) openexr? ( zlib )" @@ -42,10 +42,7 @@ RDEPEND=" sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] ) ) - ffmpeg? ( - libav? ( media-video/libav:0= ) - !libav? ( media-video/ffmpeg:0= ) - ) + ffmpeg? ( media-video/ffmpeg:0= ) gdal? ( sci-libs/gdal:= ) gif? ( media-libs/giflib:= ) gstreamer? ( -- 2.26.2