[gentoo-commits] repo/gentoo:master commit in: games-emulation/mupen64plus-core/, games-emulation/mupen64plus-core/files/
commit: ce2e3812cc5855aa85df4c16bc5cd6b4562f10c3
Author: Andrew Udvare gmail com>
AuthorDate: Mon Jul 17 18:41:57 2023 +
Commit: Michał Górny gentoo org>
CommitDate: Tue Jul 18 06:02:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce2e3812
games-emulation/mupen64plus-core: fix USE=debugger with >=binutils-2.39
Signed-off-by: Andrew Udvare gmail.com>
Closes: https://bugs.gentoo.org/904162
Closes: https://github.com/gentoo/gentoo/pull/31933
Signed-off-by: Michał Górny gentoo.org>
...e-2.5.9-debugger-fix-binutils-2.39-compat.patch | 53 ++
...-r3.ebuild => mupen64plus-core-2.5.9-r4.ebuild} | 4 +-
2 files changed, 56 insertions(+), 1 deletion(-)
diff --git
a/games-emulation/mupen64plus-core/files/mupen64plus-core-2.5.9-debugger-fix-binutils-2.39-compat.patch
b/games-emulation/mupen64plus-core/files/mupen64plus-core-2.5.9-debugger-fix-binutils-2.39-compat.patch
new file mode 100644
index ..b87a259ff809
--- /dev/null
+++
b/games-emulation/mupen64plus-core/files/mupen64plus-core-2.5.9-debugger-fix-binutils-2.39-compat.patch
@@ -0,0 +1,53 @@
+diff --git a/projects/unix/Makefile b/projects/unix/Makefile
+index d48d8830..e4792b4e 100755
+--- a/projects/unix/Makefile
b/projects/unix/Makefile
+@@ -714,15 +714,19 @@ ifeq ($(DEBUGGER), 1)
+ $(SRCDIR)/debugger/dbg_breakpoints.c
+ LDLIBS += -lopcodes -lbfd
+
+- # UGLY libopcodes version check (we check for > 2.28)
++ # UGLY libopcodes/libbfd version check (we check for >= 2.28 and >= 2.39)
+ LIBOPCODES_VERSION := $(shell $(STRINGS) --version | head -n1 | rev | cut
-d ' ' -f1 | rev)
+ LIBOPCODES_MAJOR := $(shell echo $(LIBOPCODES_VERSION) | cut -f1 -d.)
+ LIBOPCODES_MINOR := $(shell echo $(LIBOPCODES_VERSION) | cut -f2 -d.)
+ LIBOPCODES_POINT := $(shell echo $(LIBOPCODES_VERSION) | cut -f3 -d.)
+ LIBOPCODES_GE_2_29 := $(shell [ $(LIBOPCODES_MAJOR) -gt 2 -o \(
$(LIBOPCODES_MAJOR) -eq 2 -a $(LIBOPCODES_MINOR) -ge 29 \) -o \(
$(LIBOPCODES_MAJOR) -eq 2 -a $(LIBOPCODES_MINOR) -eq 28 -a $(LIBOPCODES_POINT)
-ge 1 \) ] && echo true)
++ LIBBFD_GE_2_39 := $(shell [ $(LIBOPCODES_MAJOR) -gt 2 -o \(
$(LIBOPCODES_MAJOR) -eq 2 -a $(LIBOPCODES_MINOR) -ge 29 \) -o \(
$(LIBOPCODES_MAJOR) -eq 2 -a $(LIBOPCODES_MINOR) -eq 39 -a $(LIBOPCODES_POINT)
-ge 1 \) ] && echo true)
+ ifeq ($(LIBOPCODES_GE_2_29),true)
+ CFLAGS += -DUSE_LIBOPCODES_GE_2_29
+ endif
++ ifeq ($(LIBBFD_GE_2_39),true)
++CFLAGS += -DUSE_LIBBFD_GE_2_39
++ endif
+ endif
+
+ ifeq ($(OPENCV), 1)
+diff --git a/src/debugger/dbg_memory.c b/src/debugger/dbg_memory.c
+index e98bf081..32c2af27 100644
+--- a/src/debugger/dbg_memory.c
b/src/debugger/dbg_memory.c
+@@ -97,9 +97,23 @@ static int read_memory_func(bfd_vma memaddr, bfd_byte
*myaddr, unsigned int leng
+ return (0);
+ }
+
++#ifdef USE_LIBBFD_GE_2_39
++static int fprintf_styled_nop(void *out __attribute__((unused)),
++ enum disassembler_style s
__attribute__((unused)),
++ const char *fmt __attribute__((unused)),
++ ...)
++{
++ return 0;
++}
++#endif
++
+ void init_host_disassembler(void)
+ {
++#ifdef USE_LIBBFD_GE_2_39
++INIT_DISASSEMBLE_INFO(dis_info, stderr, process_opcode_out,
fprintf_styled_nop);
++#else
+ INIT_DISASSEMBLE_INFO(dis_info, stderr, process_opcode_out);
++#endif
+ dis_info.fprintf_func = (fprintf_ftype) process_opcode_out;
+ dis_info.stream = stderr;
+ dis_info.bytes_per_line=1;
diff --git a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r3.ebuild
b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r4.ebuild
similarity index 94%
rename from games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r3.ebuild
rename to games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r4.ebuild
index 38e80fb81924..c9879d3b220f 100644
--- a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r3.ebuild
+++ b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -42,6 +42,8 @@ BDEPEND="
"
PATCHES=(
+ # https://github.com/mupen64plus/mupen64plus-core/pull/1015
+ "${FILESDIR}"/${P}-debugger-fix-binutils-2.39-compat.patch
"${FILESDIR}"/${P}-fix-gcc10-fno-common.patch
"${FILESDIR}"/${P}-pitch.patch
)
[gentoo-commits] repo/gentoo:master commit in: games-emulation/mupen64plus-core/files/, games-emulation/mupen64plus-core/
commit: 2fb0b1af8eaca82d0eef36eaa5de9145f5bc9919
Author: Michał Górny gentoo org>
AuthorDate: Fri Sep 9 12:16:50 2022 +
Commit: Michał Górny gentoo org>
CommitDate: Fri Sep 9 12:18:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fb0b1af
games-emulation/mupen64plus-core: Backport crash fix
Closes: https://bugs.gentoo.org/869326
Signed-off-by: Michał Górny gentoo.org>
.../files/mupen64plus-core-2.5.9-pitch.patch | 29 +
...-r2.ebuild => mupen64plus-core-2.5.9-r3.ebuild} | 47 +-
2 files changed, 57 insertions(+), 19 deletions(-)
diff --git
a/games-emulation/mupen64plus-core/files/mupen64plus-core-2.5.9-pitch.patch
b/games-emulation/mupen64plus-core/files/mupen64plus-core-2.5.9-pitch.patch
new file mode 100644
index ..449e4252dae2
--- /dev/null
+++ b/games-emulation/mupen64plus-core/files/mupen64plus-core-2.5.9-pitch.patch
@@ -0,0 +1,29 @@
+From 8fac78d8cb54da960ca85a49547dcc4fb952457d Mon Sep 17 00:00:00 2001
+From: VarNepvius <14352929+varnepv...@users.noreply.github.com>
+Date: Tue, 6 Sep 2022 20:31:03 +0200
+Subject: [PATCH] Fix wrong pitch argument in call to SDL_CreateRGBSurfaceFrom.
+
+---
+ src/api/vidext_sdl2_compat.h | 8 +++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/api/vidext_sdl2_compat.h b/src/api/vidext_sdl2_compat.h
+index 06d778dd9..071a64402 100644
+--- a/src/api/vidext_sdl2_compat.h
b/src/api/vidext_sdl2_compat.h
+@@ -474,8 +474,14 @@ SDL_SetVideoMode(int width, int height, int bpp, Uint32
flags)
+ if (SDL_GL_MakeCurrent(SDL_VideoWindow, SDL_VideoContext) < 0) {
+ return NULL;
+ }
++
++/* Pitch: size of of line in bytes */
++/* Add 7 to bpp before division, to ensure correct rounding towards
infinity
++ * in cases where bits per pixel do not cleanly divide by 8 (such as
15)
++ */
++int pitch = (bpp + 7) / 8 * width;
+ SDL_VideoSurface =
+-SDL_CreateRGBSurfaceFrom(NULL, width, height, bpp, 0, 0, 0, 0, 0);
++SDL_CreateRGBSurfaceFrom(NULL, width, height, bpp, pitch, 0, 0,
0, 0);
+ if (!SDL_VideoSurface) {
+ return NULL;
+ }
diff --git a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r2.ebuild
b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r3.ebuild
similarity index 81%
rename from games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r2.ebuild
rename to games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r3.ebuild
index 459fd3cd6239..38e80fb81924 100644
--- a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r2.ebuild
+++ b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r3.ebuild
@@ -1,41 +1,50 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-MY_P=${PN}-src-${PV}
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;
+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 new-dynarec opencv +osd cpu_flags_x86_sse"
+REQUIRED_USE="gles2-only? ( !osd )"
-RDEPEND="media-libs/libpng:0=
- media-libs/libsdl2:0=[joystick,opengl,video]
- sys-libs/zlib:0=[minizip]
- gles2-only? ( media-libs/libsdl2:0[gles2] )
- lirc? ( app-misc/lirc:0 )
+DEPEND="
+ media-libs/libpng:=
+ media-libs/libsdl2[joystick,opengl,video]
+ sys-libs/zlib[minizip]
+ gles2-only? ( media-libs/libsdl2[gles2] )
+ lirc? ( app-misc/lirc )
opencv? ( media-libs/opencv:= )
osd? (
media-fonts/dejavu
- media-libs/freetype:2=
- virtual/opengl:0=
- virtual/glu:0=
- )"
-DEPEND="${RDEPEND}"
+ media-libs/freetype:2
+ virtual/opengl
+ virtual/glu
+ )
+"
+RDEPEND="
+ ${DEPEND}
+"
BDEPEND="
cpu_flags_x86_sse? ( dev-lang/nasm )
- virtual/pkgconfig"
-
-REQUIRED_USE="gles2-only? ( !osd )"
-S=${WORKDIR}/${MY_P}
+ virtual/pkgconfig
+"
-PATCHES=( "${FILESDIR}"/${PN}-2.5.9-fix-gcc10-fno-common.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-gcc10-fno-common.patch
+ "${FILESDIR}"/${P}-pitch.patch
+)
src_prepare() {
default
[gentoo-commits] repo/gentoo:master commit in: games-emulation/mupen64plus-core/
commit: 4dca9d042d3d4d8bc3a71bdcae8e7544c39f1590
Author: Michał Górny gentoo org>
AuthorDate: Fri May 21 15:18:31 2021 +
Commit: Michał Górny gentoo org>
CommitDate: Fri May 21 15:19:15 2021 +
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 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() {
[gentoo-commits] repo/gentoo:master commit in: games-emulation/mupen64plus-core/
commit: 73649de3d9793c425cc5b3e96936222e99cf513c
Author: Michał Górny gentoo org>
AuthorDate: Wed Jul 15 06:00:29 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Wed Jul 15 08:10:37 2020 +
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 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 )"
[gentoo-commits] repo/gentoo:master commit in: games-emulation/mupen64plus-core/
commit: 35bf87fc542d104cd04d9d62d4f86ab46624b678 Author: James Le Cuirot gentoo org> AuthorDate: Sun Apr 5 21:31:28 2020 + Commit: James Le Cuirot gentoo org> CommitDate: Sun Apr 5 21:33:09 2020 + 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 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? (
[gentoo-commits] repo/gentoo:master commit in: games-emulation/mupen64plus-core/
commit: 173a72ab19ebfb5807cb9d712421fdc078f15182
Author: Haelwenn (lanodan) Monnier hacktivis me>
AuthorDate: Sat Nov 23 09:51:05 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Apr 3 14:56:43 2020 +
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 hacktivis.me>
Signed-off-by: Andreas Sturmlechner 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 @@
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.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 )
[gentoo-commits] repo/gentoo:master commit in: games-emulation/mupen64plus-core/, games-emulation/mupen64plus-core/files/
commit: 447ad3ceef7905cc45267886632da13f6a2bc8ed
Author: David Seifert gentoo org>
AuthorDate: Wed Feb 26 14:33:58 2020 +
Commit: David Seifert gentoo org>
CommitDate: Wed Feb 26 14:33:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=447ad3ce
games-emulation/mupen64plus-core: Fix GCC 10 / -fno-common
Closes: https://bugs.gentoo.org/708054
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: David Seifert gentoo.org>
...mupen64plus-core-2.5.9-fix-gcc10-fno-common.patch | 20
.../mupen64plus-core/mupen64plus-core-2.5.9.ebuild | 2 ++
2 files changed, 22 insertions(+)
diff --git
a/games-emulation/mupen64plus-core/files/mupen64plus-core-2.5.9-fix-gcc10-fno-common.patch
b/games-emulation/mupen64plus-core/files/mupen64plus-core-2.5.9-fix-gcc10-fno-common.patch
new file mode 100644
index 000..cfc7d5a9fb4
--- /dev/null
+++
b/games-emulation/mupen64plus-core/files/mupen64plus-core-2.5.9-fix-gcc10-fno-common.patch
@@ -0,0 +1,20 @@
+--- a/src/device/r4300/idec.h
b/src/device/r4300/idec.h
+@@ -82,6 +82,6 @@
+
+ #define IDEC_U53(r4300, iw, u53, u5) (void*)(((char*)(r4300)) +
idec_u53((iw), (u53), (u5)))
+
+-const char* g_r4300_opcodes[R4300_OPCODES_COUNT];
++extern const char* g_r4300_opcodes[R4300_OPCODES_COUNT];
+
+ #endif
+--- a/src/main/workqueue.h
b/src/main/workqueue.h
+@@ -27,7 +27,6 @@
+
+ struct work_struct;
+
+-struct work_struct *work;
+ typedef void (*work_func_t)(struct work_struct *work);
+ struct work_struct {
+ work_func_t func;
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 f7e5603250c..5bf2f73d58f 100644
--- a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9.ebuild
+++ b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9.ebuild
@@ -33,6 +33,8 @@ DEPEND="${RDEPEND}
REQUIRED_USE="gles2? ( !osd )"
S=${WORKDIR}/${MY_P}
+PATCHES=( "${FILESDIR}"/${PN}-2.5.9-fix-gcc10-fno-common.patch )
+
src_prepare() {
default
[gentoo-commits] repo/gentoo:master commit in: games-emulation/mupen64plus-core/
commit: bc6220386b2e80f32ddfceeefd844358f69bf53c Author: Michał Górny gentoo org> AuthorDate: Fri Jan 3 17:02:07 2020 + Commit: Michał Górny gentoo org> CommitDate: Fri Jan 3 20:39:54 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc622038 games-emulation/mupen64plus-core: Remove outdated blockers Signed-off-by: Michał Górny 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= - ) - !
[gentoo-commits] repo/gentoo:master commit in: games-emulation/mupen64plus-core/
commit: dde93a8d42b2aaebcd034045572b1a667b3fc119
Author: Michał Górny gentoo org>
AuthorDate: Sat Sep 28 05:34:03 2019 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Sep 28 05:35:09 2019 +
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 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
6d43789873c6866dc7d268e4a2cc1febc4a8ce6615a51e4dabfc3d37156bf8d7c157ddccd45ae3b57852388c591b86d1cf401c7d78962ec6780272ef912d
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..000
--- 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=
- )
- !
[gentoo-commits] repo/gentoo:master commit in: games-emulation/mupen64plus-core/
commit: 5ab7f01bbe39e14567e136a01ecf0f934c6da648
Author: Michał Górny gentoo org>
AuthorDate: Sun Sep 15 08:03:56 2019 +
Commit: Michał Górny gentoo org>
CommitDate: Sun Sep 15 09:51:05 2019 +
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 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"
[gentoo-commits] repo/gentoo:master commit in: games-emulation/mupen64plus-core/
commit: b3c02bbc8f09abcd959d6c5e51c9936aa3253aa9 Author: Michał Górny gentoo org> AuthorDate: Sun Sep 15 09:18:41 2019 + Commit: Michał Górny gentoo org> CommitDate: Sun Sep 15 09:51:19 2019 + 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 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? (
[gentoo-commits] repo/gentoo:master commit in: games-emulation/mupen64plus-core/
commit: f26d0a146b25bff1290aadb1e766dc82883039ae
Author: Michał Górny gentoo org>
AuthorDate: Sun Sep 15 08:36:48 2019 +
Commit: Michał Górny gentoo org>
CommitDate: Sun Sep 15 09:51:12 2019 +
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 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
6d43789873c6866dc7d268e4a2cc1febc4a8ce6615a51e4dabfc3d37156bf8d7c157ddccd45ae3b57852388c591b86d1cf401c7d78962ec6780272ef912d
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 @@
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
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 000..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=
+ )
+ !
[gentoo-commits] repo/gentoo:master commit in: games-emulation/mupen64plus-core/
commit: ec5cf3687347e890de8079d48ecdaa73240cb3e7
Author: Pacho Ramos gentoo org>
AuthorDate: Sat Oct 8 06:27:16 2016 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sat Oct 8 06:27:16 2016 +
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..
--- 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=
- )
- !
[gentoo-commits] repo/gentoo:master commit in: games-emulation/mupen64plus-core/
commit: 4341927a0074e03cc92396ba5f0f54bc033126cf Author: Pacho Ramos gentoo org> AuthorDate: Sat Jun 11 20:33:20 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sat Jun 11 20:38:22 2016 + 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 @@ mgo...@gentoo.org Michał Górny - - jo...@gentoo.org - Christian Birchinger - Build the debugger Use GLES2 instead of OpenGL
[gentoo-commits] repo/gentoo:master commit in: games-emulation/mupen64plus-core/, games-emulation/mupen64plus-rsp-hle/, ...
commit: 8d121ae11165f831d365047569eb763873bf6aec
Author: Michał Górny gentoo org>
AuthorDate: Sun Oct 4 08:44:52 2015 +
Commit: Michał Górny gentoo org>
CommitDate: Sun Oct 4 08:44:52 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d121ae1
games-emulation/mupen64plus-*: Clean up old 2.0-r0 ebuilds
Package-Manager: portage-2.2.22
.../mupen64plus-audio-sdl-2.0.ebuild | 86 -
.../mupen64plus-core/mupen64plus-core-2.0.ebuild | 104 -
.../mupen64plus-input-sdl-2.0.ebuild | 80
.../mupen64plus-rsp-hle-2.0.ebuild | 71 --
.../mupen64plus-ui-console-2.0.ebuild | 83
.../mupen64plus-video-glide64mk2-2.0.ebuild| 87 -
.../mupen64plus-video-rice-2.0.ebuild | 84 -
7 files changed, 595 deletions(-)
diff --git
a/games-emulation/mupen64plus-audio-sdl/mupen64plus-audio-sdl-2.0.ebuild
b/games-emulation/mupen64plus-audio-sdl/mupen64plus-audio-sdl-2.0.ebuild
deleted file mode 100644
index 5380f9d..000
--- a/games-emulation/mupen64plus-audio-sdl/mupen64plus-audio-sdl-2.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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 toolchain-funcs games
-
-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:0=
- media-libs/libsdl: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="$(games_get_libdir)"
- PLUGINDIR="$(games_get_libdir)"/mupen64plus
- SHAREDIR="${GAMES_DATADIR}"/mupen64plus
-
- # 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)"
-
- NO_SPEEX=$(usex speex 0 1)
- NO_SRC=$(usex libsamplerate 0 1)
- NO_OSS=$(usex oss 0 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
- prepgamesdirs
-}
diff --git a/games-emulation/mupen64plus-core/mupen64plus-core-2.0.ebuild
b/games-emulation/mupen64plus-core/mupen64plus-core-2.0.ebuild
deleted file mode 100644
index b9e95c0..000
--- a/games-emulation/mupen64plus-core/mupen64plus-core-2.0.ebuild
+++ /dev/null
@@ -1,104 +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 toolchain-funcs games
-
-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=
- )
- !http://www.mupen64plus.org/;
[gentoo-commits] repo/gentoo:master commit in: games-emulation/mupen64plus-core/
commit: 345da67d5ddeffcb7253af320e2a121690aec53f
Author: Michał Górny gentoo org>
AuthorDate: Sun Oct 4 10:58:52 2015 +
Commit: Michał Górny gentoo org>
CommitDate: Sun Oct 4 10:58:52 2015 +
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
}
[gentoo-commits] repo/gentoo:master commit in: games-emulation/mupen64plus-core/
commit: e8525bf8a72aed6106327608bcd3b2b207fdbb73
Author: Tobias Klausmann gentoo org>
AuthorDate: Tue Sep 1 19:34:20 2015 +
Commit: Tobias Klausmann gentoo org>
CommitDate: Tue Sep 1 19:34:20 2015 +
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"
