[gentoo-commits] repo/gentoo:master commit in: games-emulation/mgba/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     19342050b6d040d4f5b08aaf2b8d64a9cf7caefc
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 19 19:28:58 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Apr 19 19:29:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19342050

games-emulation/mgba: Fixed several QA issues

Thanks to Soap for reporting these issues.

Closes: https://bugs.gentoo.org/653556
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 games-emulation/mgba/mgba-0.6.3.ebuild | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/games-emulation/mgba/mgba-0.6.3.ebuild b/games-emulation/mgba/mgba-0.6.3.ebuild
index b1c0a8b0b0a..6674579a2fc 100644
--- a/games-emulation/mgba/mgba-0.6.3.ebuild
+++ b/games-emulation/mgba/mgba-0.6.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug ffmpeg imagemagick opengl qt5 +sdl"
+IUSE="debug ffmpeg imagemagick libav opengl qt5 +sdl"
 REQUIRED_USE="|| ( qt5 sdl )
 		qt5? ( opengl )"
 
@@ -20,7 +20,10 @@ RDEPEND="
 	dev-db/sqlite:3
 	media-libs/libpng:0=
 	sys-libs/zlib[minizip]
-	ffmpeg? ( virtual/ffmpeg )
+	ffmpeg? (
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:= )
+	)
 	imagemagick? ( media-gfx/imagemagick:= )
 	opengl? ( virtual/opengl )
 	qt5? (
@@ -45,8 +48,8 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
 		-DBUILD_GL="$(usex opengl)"
-		-DBUILD_GLES=OFF
 		-DBUILD_PYTHON=OFF
 		-DBUILD_QT="$(usex qt5)"
 		-DBUILD_SDL="$(usex sdl)"