[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/files/, games-emulation/dolphin/
commit: aef1e63af94bd8da749aaef6ad6baf04c683622d
Author: Michał Górny gentoo org>
AuthorDate: Mon Sep 5 05:31:20 2022 +
Commit: Michał Górny gentoo org>
CommitDate: Mon Sep 5 05:31:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aef1e63a
games-emulation/dolphin: Remove old
Signed-off-by: Michał Górny gentoo.org>
games-emulation/dolphin/Manifest | 1 -
.../dolphin/dolphin-5.0_p20210506-r3.ebuild| 196 -
.../dolphin/files/dolphin-5.0_p20210506-musl.patch | 24 ---
3 files changed, 221 deletions(-)
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index eaf5b6495ec4..a50d52217ba3 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1,3 +1,2 @@
-DIST dolphin-5.0_p20210506.tar.gz 42098693 BLAKE2B
bb9e5b5eb344bd944753c0198d5835109399fdfae46e6858833e5f279ff1979d39e0c512bedb96a91a1241fff525c6f945d16ce1a6b6cc22798490d73b853862
SHA512
5d23e9356995011a0e7b07622d58c8dddc5134a4ec83b3d9343b9eca8d0d2c200ea8c9a299c6aa2550ca74d8e28e258531368f7c167fe620053eb2a0f73b1f2f
DIST dolphin-5.0_p20220520.tar.gz 34880474 BLAKE2B
925cddfe8a5d6febced5721bea6ced7c8d2855619f74ca8940b95dc78ea523b4a1083b9ef6efe3561d833b8e9ecb742cb2adf5a1864c06b629b3ecd9e92cc871
SHA512
4993cb10061b142f6627c96493885a5f9d88857d8949c2e8e8d5df5ba6e19b4f98d199da5e641d3d61294884e1cbbe8191bc5b4445c60bf80723046b2524aad5
DIST mgba-40d4c430fc36caeb7ea32fd39624947ed487d2f2.tar.gz 12921593 BLAKE2B
8c5cf7b9b53f897f6248ad6bc51efafaa8a9d5df137d42d30f4b042b6d1527049644595938626c8cae1385d329bc45bf42db8dcc4424b963a3899e0df53246eb
SHA512
26d7b60cbc7415652bb9ca2a42ccd532856867db57bf6dd91d8204551970109b6b9f4a96c42d643ea96b9d071d6aec924d3c1bb79c251c95183b7fb8536456c9
diff --git a/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild
b/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild
deleted file mode 100644
index 6ff4a8dd29b9..
--- a/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg-utils pax-utils
-
-if [[ ${PV} == * ]]
-then
- EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin;
- inherit git-r3
-else
- EGIT_COMMIT=eb5cd9be78c76b9ccbab9e5fbd1721ef6876cd68
- SRC_URI="
-
https://github.com/dolphin-emu/dolphin/archive/${EGIT_COMMIT}.tar.gz
- -> ${P}.tar.gz"
- S=${WORKDIR}/${PN}-${EGIT_COMMIT}
- KEYWORDS="amd64 ~arm64"
-fi
-
-DESCRIPTION="Gamecube and Wii game emulator"
-HOMEPAGE="https://dolphin-emu.org/;
-
-LICENSE="GPL-2+ Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT ZLIB"
-SLOT="0"
-IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg +gui log
- profile pulseaudio systemd upnp vulkan"
-
-RDEPEND="
- dev-libs/hidapi:0=
- https://bugs.gentoo.org/799281
-https://github.com/dolphin-emu/dolphin/commit/7a1922fd8f0f6686188d179732c9757faf2d1b4f.patch
-
-From 7a1922fd8f0f6686188d179732c9757faf2d1b4f Mon Sep 17 00:00:00 2001
-From: thyrc
-Date: Mon, 14 Jun 2021 10:18:34 +0200
-Subject: [PATCH] Fix includes for musl libc
-
- Source/Core/Core/MemoryWatcher.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Source/Core/Core/MemoryWatcher.cpp
b/Source/Core/Core/MemoryWatcher.cpp
-index 491ecd83150a..13843e2021ca 100644
a/Source/Core/Core/MemoryWatcher.cpp
-+++ b/Source/Core/Core/MemoryWatcher.cpp
-@@ -2,6 +2,7 @@
- // Licensed under GPLv2+
- // Refer to the license.txt file included.
-
-+#include
- #include
- #include
- #include
[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/files/, games-emulation/dolphin/
commit: 5c1629567172efd3e05e6b9629d18f8fb98c485e
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sun Jul 22 20:59:04 2018 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Jul 22 21:06:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c162956
games-emulation/dolphin: fix crash on pie-by-default profiles
Disable PIE-compatible code generation via CXXFLAGS+=-fno-pie.
Before upstream fix:
https://github.com/dolphin-emu/dolphin/commit/daa03cd1060cc826aca93a1dffc6e94bc6af6d5f
dolphin assumed executable image to be in low addresses (<2GB)
and hardcoded 32-bit absolute addresses during JIT phase.
PIE-compatible code does not have this restriction and
allows mapping binaries above 2GB area (and breaks dolphin's JIT).
Strictly speaking -no-pie (link-time flag) does not or guarantee
or require low address mapping for binary if it was already built
as PIC/PIE.
But -fno-pie imposes additional restrictions on generated code by GCC
and makes -no-pie to take effect.
We don't need this fix for live ebuild.
Closes: https://bugs.gentoo.org/640124
Package-Manager: Portage-2.3.43, Repoman-2.3.10
games-emulation/dolphin/dolphin-5.0.ebuild | 1 +
.../dolphin/files/dolphin-5.0-no-pie.patch | 26 ++
2 files changed, 27 insertions(+)
diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild
b/games-emulation/dolphin/dolphin-5.0.ebuild
index 65b49e8a79d..908b571cf42 100644
--- a/games-emulation/dolphin/dolphin-5.0.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0.ebuild
@@ -73,6 +73,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${P}-CHAR_WIDTH-collision.patch
"${FILESDIR}"/${P}-xgetbv.patch
+ "${FILESDIR}"/${P}-no-pie.patch
)
src_prepare() {
diff --git a/games-emulation/dolphin/files/dolphin-5.0-no-pie.patch
b/games-emulation/dolphin/files/dolphin-5.0-no-pie.patch
new file mode 100644
index 000..949e42e50de
--- /dev/null
+++ b/games-emulation/dolphin/files/dolphin-5.0-no-pie.patch
@@ -0,0 +1,26 @@
+Disable PIE-compatible code generation via -fno-pie.
+
+Before upstream fix:
+https://github.com/dolphin-emu/dolphin/commit/daa03cd1060cc826aca93a1dffc6e94bc6af6d5f
+dolphin assumed executable image to be in low addresses (<2GB)
+and hardcoded 32-bit absolute addresses during JIT phase.
+
+PIE-compatible code does not have this restriction and
+allows mapping binaries above 2GB area (and breaks dolphin's JIT).
+
+Strictly speaking -no-pie (link-time flag) does not or guarantee
+or require low address mapping for binary if it was already built
+as PIC/PIE.
+
+But -fno-pie imposes additional restrictions on generated code by GCC
+and makes -no-pie to take effect.
+Bug: https://bugs.gentoo.org/640124
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -189,4 +189,4 @@ if(NOT ENABLE_GENERIC)
+ set(_M_X86_64 1)
+- add_definitions(-D_M_X86=1 -D_M_X86_64=1 -msse2)
+- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}
-fno-pie")
++ add_definitions(-D_M_X86=1 -D_M_X86_64=1 -msse2
-fno-pie)
++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}
-fno-pie -no-pie")
+ else()
[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/files/, games-emulation/dolphin/
commit: 793914c32d038d8aba300c0be19418a2a0b85394
Author: Devan Franchini gentoo org>
AuthorDate: Sat Dec 12 04:57:24 2015 +
Commit: Devan Franchini gentoo org>
CommitDate: Sat Dec 12 04:58:47 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=793914c3
games-emulation/dolphin - Bumps to version 5.0
Package-Manager: portage-2.2.24
games-emulation/dolphin/Manifest | 1 +
games-emulation/dolphin/dolphin-5.0.ebuild | 153 +
.../files/dolphin-5.0-dynamic-llvm-detect.patch| 54
.../files/dolphin-5.0-miniupnpc-abi-14.patch | 137 ++
4 files changed, 345 insertions(+)
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index e127728..7bdb097 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1,2 +1,3 @@
DIST dolphin-4.0.2.zip 28261421 SHA256
f20c824ee83c3a495fd019747d2f8254477b94c135415b386142f89716d05d66 SHA512
5b1931a133fd431b8f03f47c4c1cfe89f752de17f792e2729421df439564d15a8e35b17e82e31cef99230157de4aa16b2572b28ad67f23ca23c5492972df2938
WHIRLPOOL
48dcc47de02e6aa25e5318bc2564df1ab510210556e3e7c9442f405abd04879b8cff85afb5f1fa7a36364902a472f18bf5fa8da3a9db59b915d41d4e60f3b235
DIST dolphin-4.0.zip 23439392 SHA256
a698caf05f47a55c30e09d0aab053a412df683de2e139a6348156b03c502a0ec SHA512
02e366c2fa95ab5f37b0a66b94a5b56a632ef81e13febd982d6385cfaf7fa3edb4364180d4b8312e82bc7b8f150d02cde10248996f6a12286a20d684024aca20
WHIRLPOOL
0cb7b28b91f4b7bf93c56f2dd31d080e7e0418fb53d9cc9093ca995d2c99a1fa7d5d82111e2c8db363e2b07384be39ec0062ab0252233f480b8e45e9304e
+DIST dolphin-5.0.zip 28317729 SHA256
2b1003360d52baf12a1bcd4d75f379749b0fd4001948ec1a24d0539c37aae055 SHA512
1b1c0dd6da4ba7e9ffe30499fae582b922c9bbd8b3d8159fbf9f4bfa1e744ef5b4c00a85d34f7cdd6e01efa32133f59b2a1f42cafc9d620f7fc7462c4ba73615
WHIRLPOOL
73cc25bafcb0d32592e8ad799b0a3d458cfa944ad15380a3b8f1cf27f3e024c314b08469a17f6d92edced95631bba38e39e1ccd625227c0520813abbd399e0f4
diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild
b/games-emulation/dolphin/dolphin-5.0.ebuild
new file mode 100644
index 000..9ef670f
--- /dev/null
+++ b/games-emulation/dolphin/dolphin-5.0.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+
+inherit cmake-utils eutils pax-utils toolchain-funcs versionator wxwidgets
games
+
+SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}-rc.zip -> ${P}.zip"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Gamecube and Wii game emulator"
+HOMEPAGE="https://www.dolphin-emu.org/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="alsa ao bluetooth doc ffmpeg lto +lzo openal opengl openmp portaudio
pulseaudio"
+
+S=${WORKDIR}/${P}-rc/
+RDEPEND=">=media-libs/glew-1.10
+ >=media-libs/libsfml-2.1
+ >=net-libs/miniupnpc-1.8
+ sys-libs/readline:=
+ x11-libs/libXext
+ x11-libs/libXrandr
+ media-libs/libsdl2[haptic,joystick]
+ net-libs/polarssl[havege]
+ alsa? ( media-libs/alsa-lib )
+ ao? ( media-libs/libao )
+ bluetooth? ( net-wireless/bluez )
+ ffmpeg? ( virtual/ffmpeg
+ !!>=media-video/libav-10 )
+ lzo? ( dev-libs/lzo )
+ openal? ( media-libs/openal )
+ opengl? ( virtual/opengl )
+ portaudio? ( media-libs/portaudio )
+ pulseaudio? ( media-sound/pulseaudio )
+ "
+DEPEND="${RDEPEND}
+ app-arch/zip
+ media-gfx/nvidia-cg-toolkit
+ media-libs/freetype
+ media-libs/libsoundtouch
+ >net-libs/enet-1.3.7
+ >=sys-devel/gcc-4.9.0
+ x11-libs/wxGTK:${WX_GTK_VER}
+ "
+
+pkg_pretend() {
+
+ local ver=4.9.0
+ local msg="${PN} needs at least GCC ${ver} set to compile."
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ if ! version_is_at_least ${ver} $(gcc-fullversion); then
+ eerror ${msg}
+ die ${msg}
+ fi
+ fi
+
+}
+
+src_prepare() {
+
+ epatch "${FILESDIR}"/"${P}"-dynamic-llvm-detect.patch
+ epatch "${FILESDIR}"/"${P}"-miniupnpc-abi-14.patch
+
+ # Remove automatic dependencies to prevent building without flags
enabled.
+ if use !alsa; then
+ sed -i -e '/include(FindALSA/d' CMakeLists.txt || die
+ fi
+ if use !ao; then
+ sed -i -e '/check_lib(AO/d' CMakeLists.txt || die
+ fi
+ if use !bluetooth; then
+ sed -i -e '/check_lib(BLUEZ/d' CMakeLists.txt || die
+ fi
+ if use !openal; then
+ sed -i -e '/include(FindOpenAL/d' CMakeLists.txt || die
+ fi
+ if use !portaudio; then
+ sed -i -e '/CMAKE_REQUIRED_LIBRARIES portaudio/d'
CMakeLists.txt || die
+ fi
+ if use !pulseaudio; then
+ sed -i -e '/check_lib(PULSEAUDIO/d' CMakeLists.txt || die
+
