From 173a72ab19ebfb5807cb9d712421fdc078f15182 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Sat, 23 Nov 2019 10:51:05 +0100 Subject: 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 Signed-off-by: Andreas Sturmlechner --- games-emulation/mupen64plus-core/metadata.xml | 1 - .../mupen64plus-core-2.5.9-r1.ebuild | 104 +++++++++++++++++++++ .../mupen64plus-core/mupen64plus-core-2.5.9.ebuild | 104 --------------------- 3 files changed, 104 insertions(+), 105 deletions(-) create mode 100644 games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r1.ebuild delete mode 100644 games-emulation/mupen64plus-core/mupen64plus-core-2.5.9.ebuild (limited to 'games-emulation') diff --git a/games-emulation/mupen64plus-core/metadata.xml b/games-emulation/mupen64plus-core/metadata.xml index 4e8fd61a24ba..d4cc98359e4b 100644 --- a/games-emulation/mupen64plus-core/metadata.xml +++ b/games-emulation/mupen64plus-core/metadata.xml @@ -7,7 +7,6 @@ Build the debugger - Use GLES2 instead of OpenGL Enable new experimental dynamic recompiler implementation (only for x86 and arm) Support video capture via media-libs/opencv Overlay emulator messages using on-screen-display diff --git a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r1.ebuild b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r1.ebuild new file mode 100644 index 000000000000..57dc6a6f2305 --- /dev/null +++ b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r1.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2020 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-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] ) + lirc? ( app-misc/lirc:0 ) + opencv? ( media-libs/opencv:= ) + osd? ( + media-fonts/dejavu + media-libs/freetype:2= + virtual/opengl:0= + virtual/glu:0= + )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +REQUIRED_USE="gles2-only? ( !osd )" +S=${WORKDIR}/${MY_P} + +PATCHES=( "${FILESDIR}"/${PN}-2.5.9-fix-gcc10-fno-common.patch ) + +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-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 +} diff --git a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9.ebuild b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9.ebuild deleted file mode 100644 index 5bf2f73d58f8..000000000000 --- a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2020 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= - )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -REQUIRED_USE="gles2? ( !osd )" -S=${WORKDIR}/${MY_P} - -PATCHES=( "${FILESDIR}"/${PN}-2.5.9-fix-gcc10-fno-common.patch ) - -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 -} -- cgit v1.2.3-18-g5258