From 8bd3b00dcb0b4e546d6c7cdc43a2122280873c8e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sun, 4 Oct 2015 11:59:28 +0200 Subject: [PATCH] games-emulation/mupen64plus*: Version bump to 2.5 Bump mupen64plus to 2.5 which brings a number of bug fixes. Switch to SDL2 as its support become stable and the default. Also switch m64py to SDL2 to match. Package-Manager: portage-2.2.22 --- ...4py-0.2.3.ebuild => m64py-0.2.3-r1.ebuild} | 15 +-- .../mupen64plus-audio-sdl/Manifest | 1 + .../mupen64plus-audio-sdl-2.5.ebuild | 85 +++++++++++++ games-emulation/mupen64plus-core/Manifest | 1 + games-emulation/mupen64plus-core/metadata.xml | 2 + .../mupen64plus-core-2.5.ebuild | 112 ++++++++++++++++++ .../mupen64plus-input-sdl/Manifest | 1 + .../mupen64plus-input-sdl-2.5.ebuild | 77 ++++++++++++ games-emulation/mupen64plus-rsp-hle/Manifest | 1 + .../mupen64plus-rsp-hle-2.5.ebuild | 69 +++++++++++ .../mupen64plus-ui-console/Manifest | 1 + .../mupen64plus-ui-console-2.5.ebuild | 78 ++++++++++++ .../mupen64plus-video-glide64mk2/Manifest | 1 + .../mupen64plus-video-glide64mk2/metadata.xml | 1 + .../mupen64plus-video-glide64mk2-2.5.ebuild | 89 ++++++++++++++ .../mupen64plus-video-rice/Manifest | 1 + .../mupen64plus-video-rice/metadata.xml | 3 + .../mupen64plus-video-rice-2.5.ebuild | 82 +++++++++++++ .../mupen64plus/mupen64plus-2.5.ebuild | 23 ++++ profiles/package.mask | 5 - 20 files changed, 633 insertions(+), 15 deletions(-) rename games-emulation/m64py/{m64py-0.2.3.ebuild => m64py-0.2.3-r1.ebuild} (82%) create mode 100644 games-emulation/mupen64plus-audio-sdl/mupen64plus-audio-sdl-2.5.ebuild create mode 100644 games-emulation/mupen64plus-core/mupen64plus-core-2.5.ebuild create mode 100644 games-emulation/mupen64plus-input-sdl/mupen64plus-input-sdl-2.5.ebuild create mode 100644 games-emulation/mupen64plus-rsp-hle/mupen64plus-rsp-hle-2.5.ebuild create mode 100644 games-emulation/mupen64plus-ui-console/mupen64plus-ui-console-2.5.ebuild create mode 100644 games-emulation/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-2.5.ebuild create mode 100644 games-emulation/mupen64plus-video-rice/mupen64plus-video-rice-2.5.ebuild create mode 100644 games-emulation/mupen64plus/mupen64plus-2.5.ebuild diff --git a/games-emulation/m64py/m64py-0.2.3.ebuild b/games-emulation/m64py/m64py-0.2.3-r1.ebuild similarity index 82% rename from games-emulation/m64py/m64py-0.2.3.ebuild rename to games-emulation/m64py/m64py-0.2.3-r1.ebuild index 18371403589f..6ba5a09fe0c4 100644 --- a/games-emulation/m64py/m64py-0.2.3.ebuild +++ b/games-emulation/m64py/m64py-0.2.3-r1.ebuild @@ -6,7 +6,7 @@ EAPI=5 PYTHON_COMPAT=( python3_4 ) -inherit distutils-r1 +inherit distutils-r1 versionator DESCRIPTION="A frontend for Mupen64Plus" HOMEPAGE="http://m64py.sourceforge.net/" @@ -18,9 +18,9 @@ KEYWORDS="~amd64 ~x86" IUSE="" # SDL & libmupen64plus are through ctypes, so they rely on specific ABI -RDEPEND="media-libs/libsdl:0/0[joystick] +RDEPEND="media-libs/libsdl2:0/0[joystick] dev-python/PyQt5[opengl,${PYTHON_USEDEP}] - >=games-emulation/mupen64plus-core-2.0-r1:0/2" + >=games-emulation/mupen64plus-core-2.5:0/2-sdl2" python_prepare_all() { # set the correct search path @@ -28,14 +28,9 @@ python_prepare_all() { SEARCH_DIRS = ["/usr/$(get_libdir)/mupen64plus"] _EOF_ - # comment out SDL2 support since our mupen64plus uses SDL1 - sed -e '/from m64py\.SDL2/s:^:#:' \ - -e '/QT2SDL2\[/s:^:#:' \ - -e '/KEYCODE2SCANCODE\[/s:^:#:' \ - -e '/SCANCODE2KEYCODE\[/s:^:#:' \ - -i src/m64py/frontend/keymap.py || die + # force SDL2 support to match >=mupen64plus-2.5 sed -e '/--sdl2/d' \ - -e '/SDL2/s:=.*$:= False:' \ + -e '/SDL2/s:=.*$:= True:' \ -i src/m64py/opts.py || die distutils-r1_python_prepare_all diff --git a/games-emulation/mupen64plus-audio-sdl/Manifest b/games-emulation/mupen64plus-audio-sdl/Manifest index 1def790ff8df..85aaa085b07e 100644 --- a/games-emulation/mupen64plus-audio-sdl/Manifest +++ b/games-emulation/mupen64plus-audio-sdl/Manifest @@ -1 +1,2 @@ DIST mupen64plus-audio-sdl-src-2.0.tar.gz 26084 SHA256 943ffa6b6cdaf0cda2a24469dfa1d8e951c88c41472ded9e5c9ecbc111363286 SHA512 92ee4755c22da5a753374c7c6f5e074bf6c1ab06a0ab27d475566d50f8ed75b636b59ffe1a8c9d3d63558bf5783b999a600703951679f7bab346643c0c86871d WHIRLPOOL 82a56a49f0ffe620917dba92bf135593c7e66e2944ec0688b29cc2d5362221b81f76e162840e315476d959b445d38f3bc1bf05538fbf1fa9de96b616835b2198 +DIST mupen64plus-audio-sdl-src-2.5.tar.gz 26147 SHA256 1c59f8c2d70206350c0b9067a9722cf2dd67e5686994d5a55adbf51ee8812f59 SHA512 0c63e16449c40f15abdeed968383a218ed9876a92b2c15cbeb6554b20008d6d12996c0fd3bc1c502084791596b8535340596e95a11fe5d27576342740e76db6a WHIRLPOOL ad141c8dbe996590eecada88e943a7d8b0e2d9f4db3d02a17c8b4b1e198580b02ef28ef2b19f2267c77f3060396d068ab2fcbcd2da11ff2e6ecfa61af10bb30f diff --git a/games-emulation/mupen64plus-audio-sdl/mupen64plus-audio-sdl-2.5.ebuild b/games-emulation/mupen64plus-audio-sdl/mupen64plus-audio-sdl-2.5.ebuild new file mode 100644 index 000000000000..4c5fd3c4ebc0 --- /dev/null +++ b/games-emulation/mupen64plus-audio-sdl/mupen64plus-audio-sdl-2.5.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2014 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, SDL audio plugin" +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" +KEYWORDS="~amd64 ~x86" +IUSE="libsamplerate oss speex" + +RDEPEND=">=games-emulation/mupen64plus-core-2.5:0= + media-libs/libsdl2:0=[sound] + libsamplerate? ( media-libs/libsamplerate:0= ) + speex? ( media-libs/speex:0= )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +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)" + + NO_SPEEX=$(usex speex 0 1) + NO_SRC=$(usex libsamplerate 0 1) + NO_OSS=$(usex oss 0 1) + # not packaged (https://github.com/nemomobile/libaudioresource) + USE_AUDIORESOURCE=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 +} diff --git a/games-emulation/mupen64plus-core/Manifest b/games-emulation/mupen64plus-core/Manifest index 19006ccfa9e7..4a2a712aa457 100644 --- a/games-emulation/mupen64plus-core/Manifest +++ b/games-emulation/mupen64plus-core/Manifest @@ -1 +1,2 @@ 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/metadata.xml b/games-emulation/mupen64plus-core/metadata.xml index c2134731fe1b..8345dfe1e7d3 100644 --- a/games-emulation/mupen64plus-core/metadata.xml +++ b/games-emulation/mupen64plus-core/metadata.xml @@ -10,6 +10,8 @@ Christian Birchinger + Build the debugger + Use GLES2 instead of OpenGL Enable new experimental dynamic recompiler implementation (only for x86 and arm) Overlay emulator messages using on-screen-display diff --git a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.ebuild b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.ebuild new file mode 100644 index 000000000000..a279007f2240 --- /dev/null +++ b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.ebuild @@ -0,0 +1,112 @@ +# 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-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/ttf-bitstream-vera + media-libs/freetype:2= + virtual/opengl:0= + virtual/glu:0= + ) + !Christian Birchinger + Use GLES2 instead of OpenGL Support hi-resolution textures (requires dev-libs/boost) diff --git a/games-emulation/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-2.5.ebuild b/games-emulation/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-2.5.ebuild new file mode 100644 index 000000000000..eb83f47987c5 --- /dev/null +++ b/games-emulation/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-2.5.ebuild @@ -0,0 +1,89 @@ +# 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, glide64mk2 video plugin" +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" +KEYWORDS="~amd64 ~x86" +IUSE="gles2 hires cpu_flags_x86_sse" + +RDEPEND=">=games-emulation/mupen64plus-core-2.5:0=[gles2=] + media-libs/libpng:0= + media-libs/libsdl2:0= + media-libs/libtxc_dxtn + sys-libs/zlib:0= + virtual/opengl:0= + hires? ( dev-libs/boost:0= )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +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)" + + NOSSE=$(usex cpu_flags_x86_sse 0 1) + HIRES=$(usex hires 1 0) + USE_FRAMESKIPPER=1 + USE_GLES=$(usex gles2 1 0) + # use external lib + TXCDXTN=1 + ) + + use amd64 && MAKEARGS+=( HOST_CPU=x86_64 ) + use x86 && MAKEARGS+=( HOST_CPU=i386 ) + + emake "${MAKEARGS[@]}" all +} + +src_install() { + emake "${MAKEARGS[@]}" DESTDIR="${D}" install + einstalldocs +} diff --git a/games-emulation/mupen64plus-video-rice/Manifest b/games-emulation/mupen64plus-video-rice/Manifest index 0ae3e56f2894..26e5de834a0f 100644 --- a/games-emulation/mupen64plus-video-rice/Manifest +++ b/games-emulation/mupen64plus-video-rice/Manifest @@ -1 +1,2 @@ DIST mupen64plus-video-rice-src-2.0.tar.gz 362013 SHA256 3eb076e7c38ab45c9ec752d30e00eca022a9e0c6ead1a22df13ad94902e08238 SHA512 bbab67be20b6d2ed6a246de8a2b955051489ac128ddecff0e3fc54782fc1d17ed8f9e1cded22d215b2c5c865b4b5fe831fffb28803247a2e494746565d23d764 WHIRLPOOL ab4399e0c70351e69995a5f40aa308b4d37489b7997d8a0eae97a183c62eea6976469c1e420c04cd24f9c32e9828d677264ce684e57af2500e7e57047bf98011 +DIST mupen64plus-video-rice-src-2.5.tar.gz 339012 SHA256 969f65b9f42f48bc7e840e4ed1342233e4371c2edca5aa8f36f69c4b20955828 SHA512 d3e9c3b3097ca9b9d896498bb34374a14ec1948fce8b795e755bb13a88f3066289fe2500666b4057e719bf3f1b38b840f8a60eaeccdcdddfab69b1986c953d61 WHIRLPOOL ff5f5fa9f74dc6110239998a2a0025b2fbf796dfd98a65f80d57ccb1197c4df7904890734445e073a2b89f90793da565527b6d7ab32a62e504d10fe6aaf9d6f5 diff --git a/games-emulation/mupen64plus-video-rice/metadata.xml b/games-emulation/mupen64plus-video-rice/metadata.xml index 9af84f31de74..31d3b719824b 100644 --- a/games-emulation/mupen64plus-video-rice/metadata.xml +++ b/games-emulation/mupen64plus-video-rice/metadata.xml @@ -9,6 +9,9 @@ joker@gentoo.org Christian Birchinger + + Use GLES2 instead of OpenGL + mupen64plus/mupen64plus-video-rice diff --git a/games-emulation/mupen64plus-video-rice/mupen64plus-video-rice-2.5.ebuild b/games-emulation/mupen64plus-video-rice/mupen64plus-video-rice-2.5.ebuild new file mode 100644 index 000000000000..73fa3813795e --- /dev/null +++ b/games-emulation/mupen64plus-video-rice/mupen64plus-video-rice-2.5.ebuild @@ -0,0 +1,82 @@ +# 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, rice video plugin" +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" +KEYWORDS="~amd64 ~x86" +IUSE="gles2 cpu_flags_x86_sse" + +RDEPEND=">=games-emulation/mupen64plus-core-2.5:0=[gles2=] + media-libs/libpng:0= + media-libs/libsdl2:0=[video] + virtual/opengl:0=" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +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)" + + NO_ASM=$(usex cpu_flags_x86_sse 0 1) + 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 +} diff --git a/games-emulation/mupen64plus/mupen64plus-2.5.ebuild b/games-emulation/mupen64plus/mupen64plus-2.5.ebuild new file mode 100644 index 000000000000..746a4d0e04a5 --- /dev/null +++ b/games-emulation/mupen64plus/mupen64plus-2.5.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, meta-package" +HOMEPAGE="http://www.mupen64plus.org/" +SRC_URI="" + +LICENSE="metapackage" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+audio-sdl +input-sdl +rsp-hle +ui-console +ui-m64py +video-glide64mk2 +video-rice" + +RDEPEND=">=games-emulation/mupen64plus-core-2.5 + audio-sdl? ( >=games-emulation/mupen64plus-audio-sdl-2.5 ) + input-sdl? ( >=games-emulation/mupen64plus-input-sdl-2.5 ) + rsp-hle? ( >=games-emulation/mupen64plus-rsp-hle-2.5 ) + ui-console? ( >=games-emulation/mupen64plus-ui-console-2.5 ) + ui-m64py? ( >=games-emulation/m64py-0.2.3-r1 ) + video-glide64mk2? ( >=games-emulation/mupen64plus-video-glide64mk2-2.5 ) + video-rice? ( >=games-emulation/mupen64plus-video-rice-2.5 )" diff --git a/profiles/package.mask b/profiles/package.mask index bedc6b0b52d5..0a23a7c066d6 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -38,11 +38,6 @@ =sys-kernel/vanilla-sources-4.1.9 =sys-kernel/gentoo-sources-4.1.9 -# Michał Górny (1 Oct 2015) -# Thoroughly broken for me since the switch to Python 3 / PyQt5. Masking -# to account for opt-in testing. -=games-emulation/m64py-0.2.3 - # Patrice Clement (1 Oct 2015) # Project is over 10 years old and seems to have stalled. # Masked for removal in 30 days. See bug 561954. -- 2.26.2