gentoo resync : 25.09.2019

4 files changed, 118 insertions, 3 deletions

diff --git a/games-emulation/mupen64plus-core/Manifest b/games-emulation/mupen64plus-core/Manifest
index 05e71b1c2773..9bf2322f218d 100644
--- a/games-emulation/mupen64plus-core/Manifest
+++ b/games-emulation/mupen64plus-core/Manifest
@@ -1,3 +1,5 @@
+DIST mupen64plus-core-src-2.5.9.tar.gz 1618486 BLAKE2B 6d43789873c6866dc7d268e4a2cc1febc4a8ce6615a51e4dabfc3d3715aaaa6bf8d7c157ddccd45ae3b57852388c591b86d1cf401c7d78962ec6780272ef912d SHA512 8087211eb3301e356e1529c1702c965aca5e9191a5a3efe604f2e2f7470da44c8c3be506ba1f0aa96b209baa8faf011ca153566540e96c278fe63a330b791f20
 DIST mupen64plus-core-src-2.5.tar.gz 895890 BLAKE2B 08b55ff5b985838eed19b680635fec074d06aa20366bcc41c512173120b0f76b0cec691d0ee2b02b19eccce03f951c528df30ecbf440601629a5df92fa34db03 SHA512 1bf643798de4f17e2ce4f2a67dfd242a8b24d873c413b49cbcb280e4264131222e3f3bc02c46111868102b0b5174d117ababceab66551cb38b76b22b3a94f697
-EBUILD mupen64plus-core-2.5-r1.ebuild 2741 BLAKE2B 0e72eff2cd6936ad0e0078d8781fb92323acffe3dc54828dddfbeb941258a91096879bf0a4b3e9d29b5859030ba0297d1eee8b6a6080b751e98f031caca53c25 SHA512 b2afc35676acd02b99048331174ab8e8518d9f7c11f9e22b7794769685d31ed0c77d9e4e671cac70fc54cbd2ba291bd225c8837501f833e81e3bfb86cc8d2a3a
-MISC metadata.xml 958 BLAKE2B 33daa914e745751489e0b44160e14b6c9d065b0119872b0c4989b71d3ab7cdba9fdad1381f3248651542f7f31f14fdd9831726abc5c6b9255cf2ee4158c20527 SHA512 f6cc31a8d152fc50d9bbb285acc34e04f6ffb4f4b1ed9e0fe572183c68d382f757a18f6ed00b76ab90a5204afc1712d02f92194b714330548f73f1015541b7ae
+EBUILD mupen64plus-core-2.5-r1.ebuild 2742 BLAKE2B 04dcbeeb8fa796e2e825bf55d391a45c0e16c1939edfaabeb760ab963c965956ab7a424d41a10452b58657ed8a11f9370a8a95c244c5edffad659d001ab3103d SHA512 9ef2bc9cceb154e24a670a9795d665cfb60884b5c244dd2e85cdc00fad768975682031db2ab9789a6b24fc7cfb49e59718bd52da4f046cc066af4b5f83a537e2
+EBUILD mupen64plus-core-2.5.9.ebuild 2810 BLAKE2B 886a33c09a81e6788e3dcc7543e49feecbba86694cd0eaddc0a8c561cf6676a2aeece4626de22adf654b44dd23a61440a495ef26e0f898b8e346aad9d635c969 SHA512 c7dc4df88ad405fb33e202e841ad3cd55f472eec6f65563774477b579619bb40b451eaf3bde7bd2fc3148b4f0503de70ea21e284b6ba0b874d564bc082a29439
+MISC metadata.xml 1042 BLAKE2B ef5f55643b1264d3c48e20f63df5a754c17f2dd4012bd6133c6bab0868ca3f8f4b00c309c041efead11ff64a783653d7df6c800d8eea504bfd7a3ba049b7f351 SHA512 a38ea381091a52abe63c786bae44191c0318dec24d2ed9d1db9b4d94b932441dc385adea652dbd82377cfb30bcb12d77ffbd44b41fddfcddbe289d084c59d132
diff --git a/games-emulation/mupen64plus-core/metadata.xml b/games-emulation/mupen64plus-core/metadata.xml
index b4eccd857610..4e8fd61a24ba 100644
--- a/games-emulation/mupen64plus-core/metadata.xml
+++ b/games-emulation/mupen64plus-core/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="debugger">Build the debugger</flag>
 		<flag name="gles2">Use GLES2 instead of OpenGL</flag>
 		<flag name="new-dynarec">Enable new experimental dynamic recompiler implementation (only for x86 and arm)</flag>
+		<flag name="opencv">Support video capture via <pkg>media-libs/opencv</pkg></flag>
 		<flag name="osd">Overlay emulator messages using on-screen-display</flag>
 	</use>
 	<longdescription>Mupen64Plus is a plugin-based N64 emulator for Linux which is capable of accurately playing many games.
diff --git a/games-emulation/mupen64plus-core/mupen64plus-core-2.5-r1.ebuild b/games-emulation/mupen64plus-core/mupen64plus-core-2.5-r1.ebuild
index 8efaa9ff810e..e79b922df9bc 100644
--- a/games-emulation/mupen64plus-core/mupen64plus-core-2.5-r1.ebuild
+++ b/games-emulation/mupen64plus-core/mupen64plus-core-2.5-r1.ebuild
@@ -7,7 +7,7 @@ MY_P=${PN}-src-${PV}
 inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, core library"
-HOMEPAGE="http://www.mupen64plus.org/"
+HOMEPAGE="https://www.mupen64plus.org/"
 SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
diff --git a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9.ebuild b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9.ebuild
new file mode 100644
index 000000000000..a6144ccc365b
--- /dev/null
+++ b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=${PN}-src-${PV}
+inherit toolchain-funcs
+
+DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, core library"
+HOMEPAGE="https://www.mupen64plus.org/"
+SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0/2-sdl2"
+KEYWORDS="~amd64 ~x86"
+IUSE="debugger gles2 lirc new-dynarec opencv +osd cpu_flags_x86_sse"
+
+RDEPEND="media-libs/libpng:0=
+	media-libs/libsdl2:0=[joystick,opengl,video]
+	sys-libs/zlib:0=[minizip]
+	gles2? ( media-libs/libsdl2:0[gles] )
+	lirc? ( app-misc/lirc:0 )
+	opencv? ( media-libs/opencv:= )
+	osd? (
+		media-fonts/dejavu
+		media-libs/freetype:2=
+		virtual/opengl:0=
+		virtual/glu:0=
+	)
+	!<games-emulation/mupen64plus-2.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+# block versions using SDL1
+RDEPEND="${RDEPEND}
+	!<games-emulation/m64py-0.2.3-r1
+	!<games-emulation/mupen64plus-audio-sdl-2.5
+	!<games-emulation/mupen64plus-input-sdl-2.5
+	!<games-emulation/mupen64plus-ui-console-2.5
+	!<games-emulation/mupen64plus-video-glide64mk2-2.5
+	!<games-emulation/mupen64plus-video-rice-2.5"
+
+REQUIRED_USE="gles2? ( !osd )"
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# avoid implicitly appending CPU flags
+	sed -i -e 's:-mmmx::g' -e 's:-msse::g' projects/unix/Makefile || die
+}
+
+src_compile() {
+	MAKEARGS=(
+		# Note: please keep this in sync in all of mupen64plus-* packages
+
+		-C projects/unix
+
+		# this basically means: GNU userspace
+		UNAME=Linux
+
+		# verbose output
+		V=1
+
+		CROSS_COMPILE="${CHOST}-"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+		# usual CFLAGS, CXXFLAGS and LDFLAGS are respected
+		# so we can leave OPTFLAGS empty
+		OPTFLAGS=
+
+		# paths, some of them are used at compile time
+		PREFIX=/usr
+		LIBDIR=/usr/$(get_libdir)
+
+		# disable unwanted magic
+		LDCONFIG=:
+		INSTALL_STRIP_FLAG=
+
+		# Package-specific stuff
+
+		# CROSS_COMPILE causes it to look for ${CHOST}-sdl2-config...
+		SDL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags sdl2)"
+		SDL_LDLIBS="$($(tc-getPKG_CONFIG) --libs sdl2)"
+
+		OSD=$(usex osd 1 0)
+		NO_ASM=$(usex cpu_flags_x86_sse 0 1)
+		LIRC=$(usex lirc 1 0)
+		OPENCV=$(usex opencv 1 0)
+		DEBUGGER=$(usex debugger 1 0)
+		NEW_DYNAREC=$(usex new-dynarec 1 0)
+		USE_GLES=$(usex gles2 1 0)
+	)
+
+	use amd64 && MAKEARGS+=( HOST_CPU=x86_64 )
+	use x86 && MAKEARGS+=( HOST_CPU=i386 )
+
+	emake "${MAKEARGS[@]}" all
+}
+
+src_install() {
+	emake "${MAKEARGS[@]}" DESTDIR="${D}" install
+	dodoc -r CREDITS README RELEASE doc/{emuwiki-api-doc,new_dynarec.mediawiki}
+
+	# replace bundled font with a symlink
+	# TODO: fix the code to not rely on it
+	rm "${ED}/usr/share/mupen64plus/font.ttf" || die
+	if use osd; then
+		dosym ../fonts/dejavu/DejaVuSans.ttf /usr/share/mupen64plus/font.ttf
+	fi
+}