commit: f8a520bdece570707a9d584afed5a7fe10f6c02e Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Sat Jul 25 20:24:25 2020 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Sat Jul 25 20:24:25 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8a520bd
games-emulation/vbam: Now build against ffmpeg-4, fix dependencies Package-Manager: Portage-3.0.0, Repoman-2.3.23 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> games-emulation/vbam/vbam-2.1.4.ebuild | 20 +++++++++++++++----- games-emulation/vbam/vbam-9999.ebuild | 20 +++++++++++++++----- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/games-emulation/vbam/vbam-2.1.4.ebuild b/games-emulation/vbam/vbam-2.1.4.ebuild index 4cddf8bc249..f006bb998fa 100644 --- a/games-emulation/vbam/vbam-2.1.4.ebuild +++ b/games-emulation/vbam/vbam-2.1.4.ebuild @@ -21,7 +21,12 @@ HOMEPAGE="https://github.com/visualboyadvance-m/visualboyadvance-m"; LICENSE="GPL-2" SLOT="0" IUSE="ffmpeg link lirc nls openal +sdl wxwidgets" -REQUIRED_USE="openal? ( wxwidgets ) || ( sdl wxwidgets )" + +REQUIRED_USE=" + ffmpeg? ( wxwidgets ) + openal? ( wxwidgets ) + || ( sdl wxwidgets ) +" RDEPEND=" >=media-libs/libpng-1.4:0= @@ -30,19 +35,24 @@ RDEPEND=" sys-libs/zlib:= virtual/glu virtual/opengl - ffmpeg? ( =media-video/ffmpeg-3*:= ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) wxwidgets? ( + ffmpeg? ( media-video/ffmpeg:= ) openal? ( media-libs/openal ) x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] - )" -DEPEND="${RDEPEND} + ) +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" app-arch/zip wxwidgets? ( virtual/imagemagick-tools ) x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) nls? ( sys-devel/gettext ) - virtual/pkgconfig" + virtual/pkgconfig +" PATCHES=( "${FILESDIR}"/${P}-cmake_fix.patch diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-9999.ebuild index fa211e451c1..31465821c5d 100644 --- a/games-emulation/vbam/vbam-9999.ebuild +++ b/games-emulation/vbam/vbam-9999.ebuild @@ -21,7 +21,12 @@ HOMEPAGE="https://github.com/visualboyadvance-m/visualboyadvance-m"; LICENSE="GPL-2" SLOT="0" IUSE="ffmpeg link lirc nls openal +sdl wxwidgets" -REQUIRED_USE="openal? ( wxwidgets ) || ( sdl wxwidgets )" + +REQUIRED_USE=" + ffmpeg? ( wxwidgets ) + openal? ( wxwidgets ) + || ( sdl wxwidgets ) +" RDEPEND=" >=media-libs/libpng-1.4:0= @@ -30,19 +35,24 @@ RDEPEND=" sys-libs/zlib:= virtual/glu virtual/opengl - ffmpeg? ( =media-video/ffmpeg-3*:= ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) wxwidgets? ( + ffmpeg? ( media-video/ffmpeg:= ) openal? ( media-libs/openal ) x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] - )" -DEPEND="${RDEPEND} + ) +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" app-arch/zip wxwidgets? ( virtual/imagemagick-tools ) x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) nls? ( sys-devel/gettext ) - virtual/pkgconfig" + virtual/pkgconfig +" src_configure() { use wxwidgets && setup-wxwidgets
