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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: games-emulation/mupen64plus-core/
@ 2015-09-01 19:43 Tobias Klausmann
  0 siblings, 0 replies; 14+ messages in thread
From: Tobias Klausmann @ 2015-09-01 19:43 UTC (permalink / raw
  To: gentoo-commits

commit:     e8525bf8a72aed6106327608bcd3b2b207fdbb73
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  1 19:34:20 2015 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Tue Sep  1 19:34:20 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8525bf8

games-emulation/mupen64plus-core: Fixing HOMEPAGE move due to code.google.com shutdown

Package-Manager: portage-2.2.20.1

 games-emulation/mupen64plus-core/mupen64plus-core-2.0-r1.ebuild | 2 +-
 games-emulation/mupen64plus-core/mupen64plus-core-2.0.ebuild    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-emulation/mupen64plus-core/mupen64plus-core-2.0-r1.ebuild b/games-emulation/mupen64plus-core/mupen64plus-core-2.0-r1.ebuild
index f9c3afe..c2f1ca6 100644
--- a/games-emulation/mupen64plus-core/mupen64plus-core-2.0-r1.ebuild
+++ b/games-emulation/mupen64plus-core/mupen64plus-core-2.0-r1.ebuild
@@ -8,7 +8,7 @@ MY_P=${PN}-src-${PV}
 inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, core library"
-HOMEPAGE="https://code.google.com/p/mupen64plus/"
+HOMEPAGE="http://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.0.ebuild b/games-emulation/mupen64plus-core/mupen64plus-core-2.0.ebuild
index 81bc7f9..b9e95c0 100644
--- a/games-emulation/mupen64plus-core/mupen64plus-core-2.0.ebuild
+++ b/games-emulation/mupen64plus-core/mupen64plus-core-2.0.ebuild
@@ -8,7 +8,7 @@ MY_P=${PN}-src-${PV}
 inherit eutils toolchain-funcs games
 
 DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, core library"
-HOMEPAGE="https://code.google.com/p/mupen64plus/"
+HOMEPAGE="http://www.mupen64plus.org/"
 SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-emulation/mupen64plus-core/
@ 2015-10-04 10:59 Michał Górny
  0 siblings, 0 replies; 14+ messages in thread
From: Michał Górny @ 2015-10-04 10:59 UTC (permalink / raw
  To: gentoo-commits

commit:     345da67d5ddeffcb7253af320e2a121690aec53f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  4 10:58:52 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Oct  4 10:58:52 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=345da67d

games-emulation/mupen64plus-core: Use DejaVu font, #548214

Use DejaVu Sans instead of deprecated BitStream Vera for OSD.

Fixes: https://bugs.gentoo.org/show_bug.cgi?id=548214

Package-Manager: portage-2.2.22

 .../{mupen64plus-core-2.5.ebuild => mupen64plus-core-2.5-r1.ebuild}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.ebuild b/games-emulation/mupen64plus-core/mupen64plus-core-2.5-r1.ebuild
similarity index 96%
rename from games-emulation/mupen64plus-core/mupen64plus-core-2.5.ebuild
rename to games-emulation/mupen64plus-core/mupen64plus-core-2.5-r1.ebuild
index a279007..1954420 100644
--- a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.ebuild
+++ b/games-emulation/mupen64plus-core/mupen64plus-core-2.5-r1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="media-libs/libpng:0=
 	sys-libs/zlib:0=[minizip]
 	lirc? ( app-misc/lirc:0 )
 	osd? (
-		media-fonts/ttf-bitstream-vera
+		media-fonts/dejavu
 		media-libs/freetype:2=
 		virtual/opengl:0=
 		virtual/glu:0=
@@ -107,6 +107,6 @@ src_install() {
 	local font_path=/usr/share/mupen64plus/font.ttf
 	rm "${D%/}/${font_path}" || die
 	if use osd; then
-		dosym /usr/share/fonts/ttf-bitstream-vera/Vera.ttf "${font_path}"
+		dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${font_path}"
 	fi
 }


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-emulation/mupen64plus-core/
@ 2016-06-11 20:39 Pacho Ramos
  0 siblings, 0 replies; 14+ messages in thread
From: Pacho Ramos @ 2016-06-11 20:39 UTC (permalink / raw
  To: gentoo-commits

commit:     4341927a0074e03cc92396ba5f0f54bc033126cf
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 11 20:33:20 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Jun 11 20:38:22 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4341927a

games-emulation/mupen64plus-core: Cleanup due to #261692

Package-Manager: portage-2.3.0_rc1

 games-emulation/mupen64plus-core/metadata.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/games-emulation/mupen64plus-core/metadata.xml b/games-emulation/mupen64plus-core/metadata.xml
index 5ffad1f..b4eccd8 100644
--- a/games-emulation/mupen64plus-core/metadata.xml
+++ b/games-emulation/mupen64plus-core/metadata.xml
@@ -5,10 +5,6 @@
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>joker@gentoo.org</email>
-		<name>Christian Birchinger</name>
-	</maintainer>
 	<use>
 		<flag name="debugger">Build the debugger</flag>
 		<flag name="gles2">Use GLES2 instead of OpenGL</flag>


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-emulation/mupen64plus-core/
@ 2016-10-08  6:29 Pacho Ramos
  0 siblings, 0 replies; 14+ messages in thread
From: Pacho Ramos @ 2016-10-08  6:29 UTC (permalink / raw
  To: gentoo-commits

commit:     ec5cf3687347e890de8079d48ecdaa73240cb3e7
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  8 06:27:16 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Oct  8 06:27:16 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec5cf368

games-emulation/mupen64plus-core: Drop old

Package-Manager: portage-2.3.1

 games-emulation/mupen64plus-core/Manifest          |   1 -
 .../mupen64plus-core-2.0-r1.ebuild                 | 112 ---------------------
 2 files changed, 113 deletions(-)

diff --git a/games-emulation/mupen64plus-core/Manifest b/games-emulation/mupen64plus-core/Manifest
index 4a2a712..becbd3d 100644
--- a/games-emulation/mupen64plus-core/Manifest
+++ b/games-emulation/mupen64plus-core/Manifest
@@ -1,2 +1 @@
-DIST mupen64plus-core-src-2.0.tar.gz 1127862 SHA256 7e98795dbe4646b858919078f58a6ed94f7cfa30867df6cf44ef33da6aaa7a28 SHA512 6f7391536c23b465af737b3b64f3488bc0275c472e27f97f1d8be61e917c6772cad2c747db8ffa251ba88ba4f4c0d29de2451325f3ea4bcc6049534ef1dac41e WHIRLPOOL c32c97071d911696c9b24a931287ba7da1bdb29434300d984926a2a1b0541660022b6a811f616e8ed18de8d59fdafd168a571b248165c950d80f4e045e25aa53
 DIST mupen64plus-core-src-2.5.tar.gz 895890 SHA256 59e99a79e7f862517232e3115bd1f72377e3e34da795c118ba617c478c839578 SHA512 1bf643798de4f17e2ce4f2a67dfd242a8b24d873c413b49cbcb280e4264131222e3f3bc02c46111868102b0b5174d117ababceab66551cb38b76b22b3a94f697 WHIRLPOOL 3ea76e1bd914c9f8f2857976df7ab1ee6cc8d41e7b34f2fc832e0f4030b139b702b0295fca157f475b90245dbfe93aaab05ec5677cd676010b69af873b5f8840

diff --git a/games-emulation/mupen64plus-core/mupen64plus-core-2.0-r1.ebuild b/games-emulation/mupen64plus-core/mupen64plus-core-2.0-r1.ebuild
deleted file mode 100644
index c2f1ca6..00000000
--- a/games-emulation/mupen64plus-core/mupen64plus-core-2.0-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-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/"
-SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/2"
-KEYWORDS="~amd64 ~x86"
-IUSE="lirc new-dynarec +osd cpu_flags_x86_sse"
-
-RDEPEND="media-libs/libpng:0=
-	media-libs/libsdl:0=[joystick,opengl,video]
-	sys-libs/zlib:0=[minizip]
-	lirc? ( app-misc/lirc:0 )
-	osd? (
-		media-fonts/ttf-bitstream-vera
-		media-libs/freetype:2=
-		virtual/opengl:0=
-		virtual/glu:0=
-	)
-	!<games-emulation/mupen64plus-2.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-# block versions using games.eclass
-RDEPEND="${RDEPEND}
-	!<games-emulation/m64py-0.2.1-r1
-	!<games-emulation/mupen64plus-audio-sdl-2.0-r1
-	!<games-emulation/mupen64plus-input-sdl-2.0-r1
-	!<games-emulation/mupen64plus-rsp-hle-2.0-r1
-	!<games-emulation/mupen64plus-ui-console-2.0-r1
-	!<games-emulation/mupen64plus-video-glide64mk2-2.0-r1
-	!<games-emulation/mupen64plus-video-rice-2.0-r1"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch_user
-
-	# 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}-sdl-config...
-		SDL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags sdl)"
-		SDL_LDLIBS="$($(tc-getPKG_CONFIG) --libs sdl)"
-
-		OSD=$(usex osd 1 0)
-		NO_ASM=$(usex cpu_flags_x86_sse 0 1)
-		LIRC=$(usex lirc 1 0)
-		# (it does not build)
-		# DEBUGGER=$(usex debug 1 0)
-		NEW_DYNAREC=$(usex new-dynarec 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
-	einstalldocs
-	dodoc -r doc/{emuwiki-api-doc,new_dynarec.txt}
-
-	# replace bundled font with a symlink
-	# TODO: fix the code to not rely on it
-	local font_path=/usr/share/mupen64plus/font.ttf
-	rm "${D%/}/${font_path}" || die
-	if use osd; then
-		dosym /usr/share/fonts/ttf-bitstream-vera/Vera.ttf "${font_path}"
-	fi
-}


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-emulation/mupen64plus-core/
@ 2019-09-15  9:51 Michał Górny
  0 siblings, 0 replies; 14+ messages in thread
From: Michał Górny @ 2019-09-15  9:51 UTC (permalink / raw
  To: gentoo-commits

commit:     5ab7f01bbe39e14567e136a01ecf0f934c6da648
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 08:03:56 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Sep 15 09:51:05 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ab7f01b

games-emulation/mupen64plus-core: Switch HOMEPAGE to https

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 games-emulation/mupen64plus-core/mupen64plus-core-2.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 8efaa9ff810..e79b922df9b 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"


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-emulation/mupen64plus-core/
@ 2019-09-15  9:51 Michał Górny
  0 siblings, 0 replies; 14+ messages in thread
From: Michał Górny @ 2019-09-15  9:51 UTC (permalink / raw
  To: gentoo-commits

commit:     f26d0a146b25bff1290aadb1e766dc82883039ae
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 08:36:48 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Sep 15 09:51:12 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f26d0a14

games-emulation/mupen64plus-core: Bump to 2.5.9

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 games-emulation/mupen64plus-core/Manifest          |   1 +
 games-emulation/mupen64plus-core/metadata.xml      |   1 +
 .../mupen64plus-core/mupen64plus-core-2.5.9.ebuild | 111 +++++++++++++++++++++
 3 files changed, 113 insertions(+)

diff --git a/games-emulation/mupen64plus-core/Manifest b/games-emulation/mupen64plus-core/Manifest
index 4553448b115..ed1096b9bff 100644
--- a/games-emulation/mupen64plus-core/Manifest
+++ b/games-emulation/mupen64plus-core/Manifest
@@ -1 +1,2 @@
+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

diff --git a/games-emulation/mupen64plus-core/metadata.xml b/games-emulation/mupen64plus-core/metadata.xml
index b4eccd85761..4e8fd61a24b 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.9.ebuild b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9.ebuild
new file mode 100644
index 00000000000..ca45a085896
--- /dev/null
+++ b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9.ebuild
@@ -0,0 +1,111 @@
+# 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]
+	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
+}


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-emulation/mupen64plus-core/
@ 2019-09-15  9:51 Michał Górny
  0 siblings, 0 replies; 14+ messages in thread
From: Michał Górny @ 2019-09-15  9:51 UTC (permalink / raw
  To: gentoo-commits

commit:     b3c02bbc8f09abcd959d6c5e51c9936aa3253aa9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 09:18:41 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Sep 15 09:51:19 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3c02bbc

games-emulation/mupen64plus-core: Depend on sdl2[gles?]

Closes: https://bugs.gentoo.org/654542
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 games-emulation/mupen64plus-core/mupen64plus-core-2.5.9.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9.ebuild b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9.ebuild
index ca45a085896..a6144ccc365 100644
--- a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9.ebuild
+++ b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9.ebuild
@@ -18,6 +18,7 @@ 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? (


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-emulation/mupen64plus-core/
@ 2019-09-28  5:35 Michał Górny
  0 siblings, 0 replies; 14+ messages in thread
From: Michał Górny @ 2019-09-28  5:35 UTC (permalink / raw
  To: gentoo-commits

commit:     dde93a8d42b2aaebcd034045572b1a667b3fc119
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 28 05:34:03 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Sep 28 05:35:09 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dde93a8d

games-emulation/mupen64plus-core: Drop old (2.5)

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 games-emulation/mupen64plus-core/Manifest          |   1 -
 .../mupen64plus-core-2.5-r1.ebuild                 | 111 ---------------------
 2 files changed, 112 deletions(-)

diff --git a/games-emulation/mupen64plus-core/Manifest b/games-emulation/mupen64plus-core/Manifest
index ed1096b9bff..986603232ba 100644
--- a/games-emulation/mupen64plus-core/Manifest
+++ b/games-emulation/mupen64plus-core/Manifest
@@ -1,2 +1 @@
 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

diff --git a/games-emulation/mupen64plus-core/mupen64plus-core-2.5-r1.ebuild b/games-emulation/mupen64plus-core/mupen64plus-core-2.5-r1.ebuild
deleted file mode 100644
index e79b922df9b..00000000000
--- a/games-emulation/mupen64plus-core/mupen64plus-core-2.5-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P=${PN}-src-${PV}
-inherit eutils multilib 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 LGPL-2.1"
-SLOT="0/2-sdl2"
-KEYWORDS="~amd64 ~x86"
-IUSE="debugger gles2 lirc new-dynarec +osd cpu_flags_x86_sse"
-
-RDEPEND="media-libs/libpng:0=
-	media-libs/libsdl2:0=[joystick,opengl,video]
-	sys-libs/zlib:0=[minizip]
-	lirc? ( app-misc/lirc:0 )
-	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() {
-	epatch_user
-
-	# 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)
-		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
-	einstalldocs
-	dodoc -r doc/{emuwiki-api-doc,new_dynarec.txt}
-
-	# replace bundled font with a symlink
-	# TODO: fix the code to not rely on it
-	local font_path=/usr/share/mupen64plus/font.ttf
-	rm "${D%/}/${font_path}" || die
-	if use osd; then
-		dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${font_path}"
-	fi
-}


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-emulation/mupen64plus-core/
@ 2020-01-03 20:40 Michał Górny
  0 siblings, 0 replies; 14+ messages in thread
From: Michał Górny @ 2020-01-03 20:40 UTC (permalink / raw
  To: gentoo-commits

commit:     bc6220386b2e80f32ddfceeefd844358f69bf53c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  3 17:02:07 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan  3 20:39:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc622038

games-emulation/mupen64plus-core: Remove outdated blockers

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../mupen64plus-core/mupen64plus-core-2.5.9.ebuild         | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9.ebuild b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9.ebuild
index a6144ccc365..f7e5603250c 100644
--- a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9.ebuild
+++ b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,20 +26,10 @@ RDEPEND="media-libs/libpng:0=
 		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}
 


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-emulation/mupen64plus-core/
@ 2020-04-03 14:57 Andreas Sturmlechner
  0 siblings, 0 replies; 14+ messages in thread
From: Andreas Sturmlechner @ 2020-04-03 14:57 UTC (permalink / raw
  To: gentoo-commits

commit:     173a72ab19ebfb5807cb9d712421fdc078f15182
Author:     Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Sat Nov 23 09:51:05 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr  3 14:56:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=173a72ab

games-emulation/mupen64plus-core: rename USE=gles2 to USE=gles2-only

Closes: https://github.com/gentoo/gentoo/pull/15133
Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 games-emulation/mupen64plus-core/metadata.xml                     | 1 -
 ...n64plus-core-2.5.9.ebuild => mupen64plus-core-2.5.9-r1.ebuild} | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/games-emulation/mupen64plus-core/metadata.xml b/games-emulation/mupen64plus-core/metadata.xml
index 4e8fd61a24b..d4cc98359e4 100644
--- a/games-emulation/mupen64plus-core/metadata.xml
+++ b/games-emulation/mupen64plus-core/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<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>

diff --git a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9.ebuild b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r1.ebuild
similarity index 92%
rename from games-emulation/mupen64plus-core/mupen64plus-core-2.5.9.ebuild
rename to games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r1.ebuild
index 5bf2f73d58f..57dc6a6f230 100644
--- a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9.ebuild
+++ b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r1.ebuild
@@ -13,12 +13,12 @@ SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.ta
 LICENSE="GPL-2+"
 SLOT="0/2-sdl2"
 KEYWORDS="~amd64 ~x86"
-IUSE="debugger gles2 lirc new-dynarec opencv +osd cpu_flags_x86_sse"
+IUSE="debugger gles2-only 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] )
+	gles2-only? ( media-libs/libsdl2:0[gles] )
 	lirc? ( app-misc/lirc:0 )
 	opencv? ( media-libs/opencv:= )
 	osd? (
@@ -30,7 +30,7 @@ RDEPEND="media-libs/libpng:0=
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-REQUIRED_USE="gles2? ( !osd )"
+REQUIRED_USE="gles2-only? ( !osd )"
 S=${WORKDIR}/${MY_P}
 
 PATCHES=( "${FILESDIR}"/${PN}-2.5.9-fix-gcc10-fno-common.patch )
@@ -82,7 +82,7 @@ src_compile() {
 		OPENCV=$(usex opencv 1 0)
 		DEBUGGER=$(usex debugger 1 0)
 		NEW_DYNAREC=$(usex new-dynarec 1 0)
-		USE_GLES=$(usex gles2 1 0)
+		USE_GLES=$(usex gles2-only 1 0)
 	)
 
 	use amd64 && MAKEARGS+=( HOST_CPU=x86_64 )


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-emulation/mupen64plus-core/
@ 2020-04-05 21:34 James Le Cuirot
  0 siblings, 0 replies; 14+ messages in thread
From: James Le Cuirot @ 2020-04-05 21:34 UTC (permalink / raw
  To: gentoo-commits

commit:     35bf87fc542d104cd04d9d62d4f86ab46624b678
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  5 21:31:28 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Apr  5 21:33:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35bf87fc

games-emulation/mupen64plus-core: libsdl2 has renamed gles USE flag to gles2

Package-Manager: Portage-2.3.96, Repoman-2.3.20
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 ...upen64plus-core-2.5.9-r1.ebuild => mupen64plus-core-2.5.9-r2.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r1.ebuild b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r2.ebuild
similarity index 98%
rename from games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r1.ebuild
rename to games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r2.ebuild
index 57dc6a6f230..99d93cc2358 100644
--- a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r1.ebuild
+++ b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r2.ebuild
@@ -18,7 +18,7 @@ IUSE="debugger gles2-only 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-only? ( media-libs/libsdl2:0[gles] )
+	gles2-only? ( media-libs/libsdl2:0[gles2] )
 	lirc? ( app-misc/lirc:0 )
 	opencv? ( media-libs/opencv:= )
 	osd? (


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-emulation/mupen64plus-core/
@ 2020-07-15  8:10 Michał Górny
  0 siblings, 0 replies; 14+ messages in thread
From: Michał Górny @ 2020-07-15  8:10 UTC (permalink / raw
  To: gentoo-commits

commit:     73649de3d9793c425cc5b3e96936222e99cf513c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 15 06:00:29 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jul 15 08:10:37 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73649de3

games-emulation/mupen64plus-core: Add dep on nasm

Closes: https://bugs.gentoo.org/732674
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r2.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r2.ebuild b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r2.ebuild
index 99d93cc2358..21de520cdfe 100644
--- a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r2.ebuild
+++ b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r2.ebuild
@@ -27,7 +27,9 @@ RDEPEND="media-libs/libpng:0=
 		virtual/opengl:0=
 		virtual/glu:0=
 	)"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
+	cpu_flags_x86_sse? ( dev-lang/nasm )
 	virtual/pkgconfig"
 
 REQUIRED_USE="gles2-only? ( !osd )"


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-emulation/mupen64plus-core/
@ 2021-05-21 15:19 Michał Górny
  0 siblings, 0 replies; 14+ messages in thread
From: Michał Górny @ 2021-05-21 15:19 UTC (permalink / raw
  To: gentoo-commits

commit:     4dca9d042d3d4d8bc3a71bdcae8e7544c39f1590
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri May 21 15:18:31 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri May 21 15:19:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dca9d04

games-emulation/mupen64plus-core: Fix building against opencv-4

Closes: https://bugs.gentoo.org/790380
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r2.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r2.ebuild b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r2.ebuild
index 21de520cdfe..459fd3cd623 100644
--- a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r2.ebuild
+++ b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,6 +42,8 @@ src_prepare() {
 
 	# avoid implicitly appending CPU flags
 	sed -i -e 's:-mmmx::g' -e 's:-msse::g' projects/unix/Makefile || die
+	# fix building against opencv-4
+	sed -i -e '/PKG_CONFIG/s:opencv:&4:' projects/unix/Makefile || die
 }
 
 src_compile() {


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-emulation/mupen64plus-core/
@ 2024-07-15 10:51 Michał Górny
  0 siblings, 0 replies; 14+ messages in thread
From: Michał Górny @ 2024-07-15 10:51 UTC (permalink / raw
  To: gentoo-commits

commit:     8afc6bb02d34ca168b1616c48b633fb2d7892aa3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 09:34:24 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 10:51:02 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8afc6bb0

games-emulation/mupen64plus-core: Bump to 2.6.0

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 games-emulation/mupen64plus-core/Manifest          |   1 +
 games-emulation/mupen64plus-core/metadata.xml      |   1 +
 .../mupen64plus-core/mupen64plus-core-2.6.0.ebuild | 117 +++++++++++++++++++++
 3 files changed, 119 insertions(+)

diff --git a/games-emulation/mupen64plus-core/Manifest b/games-emulation/mupen64plus-core/Manifest
index 986603232baf..6644c1c40cbd 100644
--- a/games-emulation/mupen64plus-core/Manifest
+++ b/games-emulation/mupen64plus-core/Manifest
@@ -1 +1,2 @@
 DIST mupen64plus-core-src-2.5.9.tar.gz 1618486 BLAKE2B 6d43789873c6866dc7d268e4a2cc1febc4a8ce6615a51e4dabfc3d3715aaaa6bf8d7c157ddccd45ae3b57852388c591b86d1cf401c7d78962ec6780272ef912d SHA512 8087211eb3301e356e1529c1702c965aca5e9191a5a3efe604f2e2f7470da44c8c3be506ba1f0aa96b209baa8faf011ca153566540e96c278fe63a330b791f20
+DIST mupen64plus-core-src-2.6.0.tar.gz 1754271 BLAKE2B 69f63a965bf3172c661979022ca8b1c3dddd4d35ca4453233c883e85db9e988c56509fed44221a6ab6f513ac6d8400bd055227e37225a2636f6f3e919075feea SHA512 2e43e4c337199afbc5ba4ae9b0490a133fd09ef1252390858ff9594f512b75a8a6a5b0331dc3eee794f9445484e6046b19a0bf6df17f21243c80960340f80f34

diff --git a/games-emulation/mupen64plus-core/metadata.xml b/games-emulation/mupen64plus-core/metadata.xml
index 92b6f728925d..28aedc766663 100644
--- a/games-emulation/mupen64plus-core/metadata.xml
+++ b/games-emulation/mupen64plus-core/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="debugger">Build the debugger</flag>
+		<flag name="netplay">Enable netplay functionality</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>

diff --git a/games-emulation/mupen64plus-core/mupen64plus-core-2.6.0.ebuild b/games-emulation/mupen64plus-core/mupen64plus-core-2.6.0.ebuild
new file mode 100644
index 000000000000..b5f1e2e7a02f
--- /dev/null
+++ b/games-emulation/mupen64plus-core/mupen64plus-core-2.6.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_P=${PN}-src-${PV}
+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
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2+"
+SLOT="0/2-sdl2"
+KEYWORDS="~amd64 ~x86"
+IUSE="
+	debugger gles2-only lirc netplay new-dynarec opencv +osd +vulkan
+	cpu_flags_x86_sse
+"
+REQUIRED_USE="gles2-only? ( !osd )"
+
+DEPEND="
+	media-libs/libpng:=
+	media-libs/libsdl2[joystick,opengl,video]
+	sys-libs/zlib[minizip]
+	gles2-only? ( media-libs/libsdl2[gles2] )
+	lirc? ( app-misc/lirc )
+	netplay? ( media-libs/sdl2-net )
+	opencv? ( media-libs/opencv:= )
+	osd? (
+		media-fonts/dejavu
+		media-libs/freetype:2
+		virtual/opengl
+		virtual/glu
+	)
+	vulkan? ( media-libs/vulkan-loader )
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	cpu_flags_x86_sse? ( dev-lang/nasm )
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	# avoid implicitly appending CPU flags
+	sed -i -e 's:-mmmx::g' -e 's:-msse::g' projects/unix/Makefile || die
+	# fix building against opencv-4
+	sed -i -e '/PKG_CONFIG/s:opencv:&4:' 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-only 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
+}


^ permalink raw reply related	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2024-07-15 10:51 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-15  9:51 [gentoo-commits] repo/gentoo:master commit in: games-emulation/mupen64plus-core/ Michał Górny
  -- strict thread matches above, loose matches on Subject: below --
2024-07-15 10:51 Michał Górny
2021-05-21 15:19 Michał Górny
2020-07-15  8:10 Michał Górny
2020-04-05 21:34 James Le Cuirot
2020-04-03 14:57 Andreas Sturmlechner
2020-01-03 20:40 Michał Górny
2019-09-28  5:35 Michał Górny
2019-09-15  9:51 Michał Górny
2019-09-15  9:51 Michał Górny
2016-10-08  6:29 Pacho Ramos
2016-06-11 20:39 Pacho Ramos
2015-10-04 10:59 Michał Górny
2015-09-01 19:43 Tobias Klausmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox