Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/files/, games-emulation/dolphin/
Date: Mon, 05 Sep 2022 05:33:53
Message-Id: 1662355897.aef1e63af94bd8da749aaef6ad6baf04c683622d.mgorny@gentoo
1 commit: aef1e63af94bd8da749aaef6ad6baf04c683622d
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 5 05:31:20 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 5 05:31:37 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aef1e63a
7
8 games-emulation/dolphin: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 games-emulation/dolphin/Manifest | 1 -
13 .../dolphin/dolphin-5.0_p20210506-r3.ebuild | 196 ---------------------
14 .../dolphin/files/dolphin-5.0_p20210506-musl.patch | 24 ---
15 3 files changed, 221 deletions(-)
16
17 diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
18 index eaf5b6495ec4..a50d52217ba3 100644
19 --- a/games-emulation/dolphin/Manifest
20 +++ b/games-emulation/dolphin/Manifest
21 @@ -1,3 +1,2 @@
22 -DIST dolphin-5.0_p20210506.tar.gz 42098693 BLAKE2B bb9e5b5eb344bd944753c0198d5835109399fdfae46e6858833e5f279ff1979d39e0c512bedb96a91a1241fff525c6f945d16ce1a6b6cc22798490d73b853862 SHA512 5d23e9356995011a0e7b07622d58c8dddc5134a4ec83b3d9343b9eca8d0d2c200ea8c9a299c6aa2550ca74d8e28e258531368f7c167fe620053eb2a0f73b1f2f
23 DIST dolphin-5.0_p20220520.tar.gz 34880474 BLAKE2B 925cddfe8a5d6febced5721bea6ced7c8d2855619f74ca8940b95dc78ea523b4a1083b9ef6efe3561d833b8e9ecb742cb2adf5a1864c06b629b3ecd9e92cc871 SHA512 4993cb10061b142f6627c96493885a5f9d88857d8949c2e8e8d5df5ba6e19b4f98d199da5e641d3d61294884e1cbbe8191bc5b4445c60bf80723046b2524aad5
24 DIST mgba-40d4c430fc36caeb7ea32fd39624947ed487d2f2.tar.gz 12921593 BLAKE2B 8c5cf7b9b53f897f6248ad6bc51efafaa8a9d5df137d42d30f4b042b6d1527049644595938626c8cae1385d329bc45bf42db8dcc4424b963a3899e0df53246eb SHA512 26d7b60cbc7415652bb9ca2a42ccd532856867db57bf6dd91d8204551970109b6b9f4a96c42d643ea96b9d071d6aec924d3c1bb79c251c95183b7fb8536456c9
25
26 diff --git a/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild b/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild
27 deleted file mode 100644
28 index 6ff4a8dd29b9..000000000000
29 --- a/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild
30 +++ /dev/null
31 @@ -1,196 +0,0 @@
32 -# Copyright 1999-2022 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=7
36 -
37 -inherit cmake desktop xdg-utils pax-utils
38 -
39 -if [[ ${PV} == *9999 ]]
40 -then
41 - EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin"
42 - inherit git-r3
43 -else
44 - EGIT_COMMIT=eb5cd9be78c76b9ccbab9e5fbd1721ef6876cd68
45 - SRC_URI="
46 - https://github.com/dolphin-emu/dolphin/archive/${EGIT_COMMIT}.tar.gz
47 - -> ${P}.tar.gz"
48 - S=${WORKDIR}/${PN}-${EGIT_COMMIT}
49 - KEYWORDS="amd64 ~arm64"
50 -fi
51 -
52 -DESCRIPTION="Gamecube and Wii game emulator"
53 -HOMEPAGE="https://dolphin-emu.org/"
54 -
55 -LICENSE="GPL-2+ Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT ZLIB"
56 -SLOT="0"
57 -IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg +gui log
58 - profile pulseaudio systemd upnp vulkan"
59 -
60 -RDEPEND="
61 - dev-libs/hidapi:0=
62 - <dev-libs/libfmt-8.1:0=
63 - dev-libs/lzo:2=
64 - dev-libs/pugixml:0=
65 - media-libs/libpng:0=
66 - media-libs/libsfml
67 - media-libs/mesa[egl(+)]
68 - net-libs/enet:1.3
69 - net-libs/mbedtls:0=
70 - net-misc/curl:0=
71 - sys-libs/readline:0=
72 - sys-libs/zlib:0=
73 - x11-libs/libXext
74 - x11-libs/libXi
75 - x11-libs/libXrandr
76 - virtual/libusb:1
77 - virtual/opengl
78 - alsa? ( media-libs/alsa-lib )
79 - bluetooth? ( net-wireless/bluez )
80 - evdev? (
81 - dev-libs/libevdev
82 - virtual/udev
83 - )
84 - ffmpeg? ( media-video/ffmpeg:= )
85 - gui? (
86 - dev-qt/qtcore:5
87 - dev-qt/qtgui:5
88 - dev-qt/qtwidgets:5
89 - )
90 - profile? ( dev-util/oprofile )
91 - pulseaudio? ( media-sound/pulseaudio )
92 - systemd? ( sys-apps/systemd:0= )
93 - upnp? ( net-libs/miniupnpc )
94 -"
95 -DEPEND="${RDEPEND}"
96 -BDEPEND="
97 - sys-devel/gettext
98 - virtual/pkgconfig"
99 -
100 -# vulkan-loader required for vulkan backend which can be selected
101 -# at runtime.
102 -RDEPEND="${RDEPEND}
103 - vulkan? ( media-libs/vulkan-loader )"
104 -
105 -PATCHES=("${FILESDIR}"/${P}-musl.patch)
106 -
107 -# [directory]=license
108 -declare -A KEEP_BUNDLED=(
109 - [Bochs_disasm]=LGPL-2.1+
110 - [FreeSurround]=GPL-2+
111 -
112 - # vulkan's API is not backwards-compatible:
113 - # new release dropped VK_PRESENT_MODE_RANGE_SIZE_KHR
114 - # but dolphin still relies on it, bug #729832
115 - [Vulkan]=Apache-2.0
116 -
117 - [cpp-optparse]=MIT
118 - # no support for for using system library
119 - [glslang]=BSD
120 - [imgui]=MIT
121 -
122 - # not packaged, tiny header library
123 - [rangeset]=ZLIB
124 -
125 - # FIXME: xxhash can't be found by cmake
126 - [xxhash]=BSD-2
127 - # no support for for using system library
128 - [minizip]=ZLIB
129 - # soundtouch uses shorts, not floats
130 - [soundtouch]=LGPL-2.1+
131 - [cubeb]=ISC
132 - [discord-rpc]=MIT
133 - # Their build set up solely relies on the build in gtest.
134 - [gtest]= # (build-time only)
135 - # gentoo's version requires exception support.
136 - # dolphin disables exceptions and fails the build.
137 - [picojson]=BSD-2
138 - # No code to detect shared library.
139 - [zstd]=BSD
140 -)
141 -
142 -src_prepare() {
143 - cmake_src_prepare
144 -
145 - local s remove=()
146 - for s in Externals/*; do
147 - [[ -f ${s} ]] && continue
148 - if ! has "${s#Externals/}" "${!KEEP_BUNDLED[@]}"; then
149 - remove+=( "${s}" )
150 - fi
151 - done
152 -
153 - einfo "removing sources: ${remove[*]}"
154 - rm -r "${remove[@]}" || die
155 -
156 - # About 50% compile-time speedup
157 - if ! use vulkan; then
158 - sed -i -e '/Externals\/glslang/d' CMakeLists.txt || die
159 - fi
160 -
161 - # Remove dirty suffix: needed for netplay
162 - sed -i -e 's/--dirty/&=""/' CMakeLists.txt || die
163 -
164 - # Force Qt5 rather than automagic until support is properly handled here
165 - sed -i -e '/NAMES Qt6 COMP/d' Source/Core/DolphinQt/CMakeLists.txt || die
166 -}
167 -
168 -src_configure() {
169 - local mycmakeargs=(
170 - # Use ccache only when user did set FEATURES=ccache (or similar)
171 - # not when ccache binary is present in system (automagic).
172 - -DCCACHE_BIN=CCACHE_BIN-NOTFOUND
173 - -DENABLE_ALSA=$(usex alsa)
174 - -DENABLE_BLUEZ=$(usex bluetooth)
175 - -DENABLE_EVDEV=$(usex evdev)
176 - -DENCODE_FRAMEDUMPS=$(usex ffmpeg)
177 - -DENABLE_LLVM=OFF
178 - # just adds -flto, user can do that via flags
179 - -DENABLE_LTO=OFF
180 - -DENABLE_PULSEAUDIO=$(usex pulseaudio)
181 - -DENABLE_QT=$(usex gui)
182 - -DENABLE_SDL=OFF # not supported: #666558
183 - -DENABLE_VULKAN=$(usex vulkan)
184 - -DFASTLOG=$(usex log)
185 - -DOPROFILING=$(usex profile)
186 - -DUSE_DISCORD_PRESENCE=$(usex discord-presence)
187 - -DUSE_SHARED_ENET=ON
188 - -DUSE_UPNP=$(usex upnp)
189 -
190 - # Undo cmake.eclass's defaults.
191 - # All dolphin's libraries are private
192 - # and rely on circular dependency resolution.
193 - -DBUILD_SHARED_LIBS=OFF
194 -
195 - # Avoid warning spam around unset variables.
196 - -Wno-dev
197 - )
198 -
199 - cmake_src_configure
200 -}
201 -
202 -src_test() {
203 - cmake_build unittests
204 -}
205 -
206 -src_install() {
207 - cmake_src_install
208 -
209 - dodoc Readme.md
210 - if use doc; then
211 - dodoc -r docs/ActionReplay docs/DSP docs/WiiMote
212 - fi
213 -
214 - doicon -s 48 Data/dolphin-emu.png
215 - doicon -s scalable Data/dolphin-emu.svg
216 - doicon Data/dolphin-emu.svg
217 -}
218 -
219 -pkg_postinst() {
220 - # Add pax markings for hardened systems
221 - pax-mark -m "${EPREFIX}"/usr/games/bin/"${PN}"-emu
222 - xdg_icon_cache_update
223 -}
224 -
225 -pkg_postrm() {
226 - xdg_icon_cache_update
227 -}
228
229 diff --git a/games-emulation/dolphin/files/dolphin-5.0_p20210506-musl.patch b/games-emulation/dolphin/files/dolphin-5.0_p20210506-musl.patch
230 deleted file mode 100644
231 index 51570151c112..000000000000
232 --- a/games-emulation/dolphin/files/dolphin-5.0_p20210506-musl.patch
233 +++ /dev/null
234 @@ -1,24 +0,0 @@
235 -https://bugs.gentoo.org/799281
236 -https://github.com/dolphin-emu/dolphin/commit/7a1922fd8f0f6686188d179732c9757faf2d1b4f.patch
237 -
238 -From 7a1922fd8f0f6686188d179732c9757faf2d1b4f Mon Sep 17 00:00:00 2001
239 -From: thyrc <thyrc@××××××××××××××××××××.com>
240 -Date: Mon, 14 Jun 2021 10:18:34 +0200
241 -Subject: [PATCH] Fix includes for musl libc
242 -
243 ----
244 - Source/Core/Core/MemoryWatcher.cpp | 1 +
245 - 1 file changed, 1 insertion(+)
246 -
247 -diff --git a/Source/Core/Core/MemoryWatcher.cpp b/Source/Core/Core/MemoryWatcher.cpp
248 -index 491ecd83150a..13843e2021ca 100644
249 ---- a/Source/Core/Core/MemoryWatcher.cpp
250 -+++ b/Source/Core/Core/MemoryWatcher.cpp
251 -@@ -2,6 +2,7 @@
252 - // Licensed under GPLv2+
253 - // Refer to the license.txt file included.
254 -
255 -+#include <cstring>
256 - #include <fstream>
257 - #include <iostream>
258 - #include <sstream>