diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /games-emulation/dolphin | |
parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) |
gentoo resync : 25.08.2020
Diffstat (limited to 'games-emulation/dolphin')
-rw-r--r-- | games-emulation/dolphin/Manifest | 12 | ||||
-rw-r--r-- | games-emulation/dolphin/dolphin-5.0.ebuild | 183 | ||||
-rw-r--r-- | games-emulation/dolphin/dolphin-5.0_p20200705.ebuild | 181 | ||||
-rw-r--r-- | games-emulation/dolphin/dolphin-9999.ebuild | 28 | ||||
-rw-r--r-- | games-emulation/dolphin/files/dolphin-5.0-CHAR_WIDTH-collision.patch | 49 | ||||
-rw-r--r-- | games-emulation/dolphin/files/dolphin-5.0-no-pie.patch | 26 | ||||
-rw-r--r-- | games-emulation/dolphin/files/dolphin-5.0-soundtouch-exceptions.patch | 19 | ||||
-rw-r--r-- | games-emulation/dolphin/files/dolphin-5.0-xgetbv.patch | 24 | ||||
-rw-r--r-- | games-emulation/dolphin/metadata.xml | 1 |
9 files changed, 202 insertions, 321 deletions
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest index e2f42d47ee56..ac9926dedc66 100644 --- a/games-emulation/dolphin/Manifest +++ b/games-emulation/dolphin/Manifest @@ -1,8 +1,4 @@ -AUX dolphin-5.0-CHAR_WIDTH-collision.patch 2043 BLAKE2B d29f1f9ff360d79105d7020174bfc5063ad18c544d17056dca055174d8d0c837671f5d04f95de98e140d8634651f869e1a0d9e79b834f0f039ce59900c0696b0 SHA512 47c25a3fd5e6c47e34fe23d5faa71ea316c708fa2bbcbc5136a415fc25a0b207c4d18bfedb2d7c4e2a71394581d1e41fd7d4cca3544d34e3f4a6a84fee360314 -AUX dolphin-5.0-no-pie.patch 1068 BLAKE2B e941c7002b7adaaefc5c9ea2433a1362c1698b325c2804a31eac616c1185205c27b10466a9f4f1f3e2c2e3773f24f5cae6afb849cbf18a574dfbe08622f88ffa SHA512 8deacd47896003687e25117d758cba6423a6729e6bd54c1bdf39e904f6659ee42d5740338fd94301ef98befaaf02697e32d5fecb604ddc38186b1f81285aec56 -AUX dolphin-5.0-soundtouch-exceptions.patch 591 BLAKE2B 7a5f25041214f58e99f8e6d50544392be6f1336a070e812b8f4675c777a3e53482c49fdf578781d2a8bb6f7eb6517f6dde087965482756e7b156958c25c815fb SHA512 df9d1832ea2d844ec7ca79b01a3fe8463e21feb089105b79c91218db0d6426e1fc489d3b40688e02a13bef8782b80c50f09f0d0603822c035e8ed99b559a0f39 -AUX dolphin-5.0-xgetbv.patch 1137 BLAKE2B d736d25127fae4c552c1e28b0c152037a2c0a16c59dbec873596e1488f9a9872672684f23517c6ceeef0c8b50e0f1914882a1ccd123660e4458fc9e73d1e07bd SHA512 d627829270acc69ed3dc420c57762c6a68713482c29fd0b33a38864558380c5d9547ace9ab054d2892108ccfe7751147e51c0d5495a57d02fa29c02ac93ef391 -DIST dolphin-5.0.tar.gz 38246344 BLAKE2B 540eb5d0d3f2250d0b562caaef113bcae66ea47c3b6c2884f5612f36f990592d2c83ad0348cb83d71f5329414580f6cbf07081bdef2661bd277ee2f7613dc661 SHA512 8de76f811abfb82e19502336734e86ba600c11d9fa95bcf7f70a2a525165d07ead826854c39377602aab7856a057af9ba91bff458cf2dd008712527290489d3a -EBUILD dolphin-5.0.ebuild 4596 BLAKE2B 81fe5abe2b7779f189346605b6b3900066c6463d0e89be39984ee3ce92046c0ae3fff747e19467b3a105826ab5f1955d89a4e611d56111a15b173e0c77f01bad SHA512 6bf62074ba5f228119d19e23cac7621b96d63191367e60900ca5c82ae7deb5329c3eeb1cf2b898ca38e14d307f4f91703dcde53b753e85c841610070b9f2f382 -EBUILD dolphin-9999.ebuild 4238 BLAKE2B 9520643739ca295e5f4aaa2e02182de8382f485330c5b3ae733599b2cb0f1f8f6f0df7501b4ec79ee20227d835eea9762edbad03352c2b964684a7d3236e77f3 SHA512 ef5c0c081c8f55c38aa22b831f42aed57bf22e2e0e37a68cf9c710a0bb2129aa69e0bf20e899a92a753ec707fd568f4304aa4df2f74beb6c3758d034b49e24f1 -MISC metadata.xml 825 BLAKE2B 47bce78aa687f194ff5fb0252f3cdaf76336ab5460cdf72ddaa2913f36dd69aa916cbfc7684ae276248e14d092d8107ab67c7d8c37b71bfca15778b171d725f2 SHA512 33a3c378f2ed7fd25a155b29a03dd3b87730e9c910e7b2d35148a7f6eafbb75e96eab0a0f9608a9ae34e1aa2ccb5d6cc849d895cd28912c88193640a8ac5a6b5 +DIST dolphin-5.0_p20200705.tar.gz 41580877 BLAKE2B 78fce8cb10543857633d66789999b0ebb8f195e10652b9316f3346d5c84797dea96a31f509f86cb9470b4b9677ca58c4a865494121277cd0bc7dcc93932da9f4 SHA512 8b1aed8c98ff7205d7b1716aea3faad0bfa3d1ff3fe3a616431a421ae62592a57887e18295276b7a0fee52d19e641b72d5dc00e071cefea7fbe40adc9f3f01a1 +EBUILD dolphin-5.0_p20200705.ebuild 4420 BLAKE2B 4e7be2832c1723532c59fa0268e9c62bd68754296b26bea8728bbf2c3967e58678cc9421f0a3810c30bf83ac14c1c9ce674c44bceda179ae704ca7345fb68e1d SHA512 a52a06306f6e8482fa2acfd41f308b5a583e5fe1e5a51ab31b1504a1d8c0b6e70e7f9419ee4adeea9e33ffbd116c993e931c9f17891475921d8ce2110a825b3f +EBUILD dolphin-9999.ebuild 4421 BLAKE2B e147a08b0c7f9a1a8c8de714d4a0ecd8d325e5280efd000bf756007ccf999e039dd1190adb73a5a9248329f97b144150b0378723da53fb49fae9f7ca61de24cb SHA512 80ff62160b4d7740fc852e37728147029b898a02f305ef759239e9e6b012b409c9d756904bed2ef712b89193b25887366c8af243d22323d32f26d0df16216ca9 +MISC metadata.xml 780 BLAKE2B 554ecd30630f134ee9fef10c2bf3eea47bad771a0847f826c27325abe4d3737c3341b56001cec03d81e0153097aa51ec55cb7925550205489d17f6c7c82507b9 SHA512 e7820ec9adff748a38fcea3f078aa1a918ec1d6ecc230e8994b18b36a31649f2418b1839d7ebf447e3aa4684d38f074873f004d571d448c3fec847b50e9f1414 diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild b/games-emulation/dolphin/dolphin-5.0.ebuild deleted file mode 100644 index 156b83d9fd20..000000000000 --- a/games-emulation/dolphin/dolphin-5.0.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PLOCALES="ar ca cs da_DK de el en es fa fr hr hu it ja ko ms_MY nb nl pl pt pt_BR ro_RO ru sr sv tr zh_CN zh_TW" -PLOCALE_BACKUP="en" -WX_GTK_VER="3.0" - -inherit cmake-utils desktop gnome2-utils l10n pax-utils toolchain-funcs wxwidgets - -SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="amd64" - -DESCRIPTION="Gamecube and Wii game emulator" -HOMEPAGE="https://www.dolphin-emu.org/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="alsa ao bluetooth doc egl +evdev ffmpeg log lto openal +pch portaudio profile pulseaudio qt5 sdl upnp +wxwidgets" - -RESTRICT=test - -RDEPEND=" - >=media-libs/libsfml-2.1 - >net-libs/enet-1.3.7 - >=net-libs/mbedtls-2.1.1:0= - dev-libs/lzo - media-libs/libpng:0= - sys-libs/readline:0= - sys-libs/zlib:= - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - virtual/libusb:1 - virtual/opengl - alsa? ( media-libs/alsa-lib ) - ao? ( media-libs/libao ) - bluetooth? ( net-wireless/bluez ) - egl? ( media-libs/mesa[egl] ) - evdev? ( - dev-libs/libevdev - virtual/udev - ) - ffmpeg? ( media-video/ffmpeg:= ) - openal? ( - media-libs/openal - media-libs/libsoundtouch - ) - portaudio? ( media-libs/portaudio ) - profile? ( dev-util/oprofile ) - pulseaudio? ( media-sound/pulseaudio ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) - sdl? ( media-libs/libsdl2[haptic,joystick] ) - upnp? ( >=net-libs/miniupnpc-1.7 ) - wxwidgets? ( - dev-libs/glib:2 - x11-libs/gtk+:2 - x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] - )" -DEPEND="${RDEPEND} - app-arch/zip - media-libs/freetype - sys-devel/gettext - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${P}-CHAR_WIDTH-collision.patch - "${FILESDIR}"/${P}-xgetbv.patch - "${FILESDIR}"/${P}-no-pie.patch - "${FILESDIR}"/${P}-soundtouch-exceptions.patch -) - -src_prepare() { - cmake-utils_src_prepare - - # 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 - - # Unconditionally disable LLVM disassembler. - sed -i -e '/include(FindLLVM/d' CMakeLists.txt || die - - 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 - fi - - # Remove ALL the bundled libraries, aside from: - # - SOIL: The sources are not public. - # - Bochs-disasm: Don't know what it is. - # - gtest: Their build set up solely relies on the build in gtest. - # - xxhash: Not on the tree. - mv Externals/SOIL . || die - mv Externals/Bochs_disasm . || die - mv Externals/gtest . || die - mv Externals/xxhash . || die - rm -r Externals/* || die "Failed to delete Externals dir." - mv Bochs_disasm Externals || die - mv SOIL Externals || die - mv gtest Externals || die - mv xxhash Externals || die - - remove_locale() { - # Ensure preservation of the backup locale when no valid LINGUA is set - if [[ "${PLOCALE_BACKUP}" == "${1}" ]] && [[ "${PLOCALE_BACKUP}" == "$(l10n_get_locales)" ]]; then - return - else - rm "Languages/po/${1}.po" || die - fi - } - - l10n_find_plocales_changes "Languages/po/" "" '.po' - l10n_for_each_disabled_locale_do remove_locale -} - -src_configure() { - if use wxwidgets; then - need-wxwidgets unicode - fi - - local mycmakeargs=( - -DUSE_SHARED_ENET=ON - $( cmake-utils_use ffmpeg ENCODE_FRAMEDUMPS ) - $( cmake-utils_use log FASTLOG ) - $( cmake-utils_use profile OPROFILING ) - $( cmake-utils_use_disable wxwidgets WX ) - $( cmake-utils_use_enable evdev EVDEV ) - $( cmake-utils_use_enable lto LTO ) - $( cmake-utils_use_enable pch PCH ) - $( cmake-utils_use_enable qt5 QT2 ) - $( cmake-utils_use_enable sdl SDL ) - $( cmake-utils_use_use egl EGL ) - $( cmake-utils_use_use upnp UPNP ) - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - dodoc Readme.md - if use doc; then - dodoc -r docs/ActionReplay docs/DSP docs/WiiMote - fi - - doicon -s 48 Data/dolphin-emu.png - doicon -s scalable Data/dolphin-emu.svg - doicon Data/dolphin-emu.svg -} - -pkg_postinst() { - # Add pax markings for hardened systems - pax-mark -m "${EPREFIX}"/usr/games/bin/"${PN}"-emu - - if ! use portaudio; then - ewarn "If you want microphone capabilities in dolphin-emu, rebuild with" - ewarn "USE=\"portaudio\"" - fi - - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild b/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild new file mode 100644 index 000000000000..1b2cd79579d2 --- /dev/null +++ b/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild @@ -0,0 +1,181 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PLOCALES="ar ca cs da de el en es fa fr hr hu it ja ko ms nb nl pl pt pt_BR ro ru sr sv tr zh_CN zh_TW" +PLOCALE_BACKUP="en" + +inherit cmake desktop xdg-utils l10n pax-utils + +if [[ ${PV} == *9999 ]] +then + EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin" + inherit git-r3 +else + inherit vcs-snapshot + commit=0dbe8fb2eaa608a6540df3d269648a596c29cf4b + SRC_URI="https://github.com/dolphin-emu/dolphin/archive/${commit}.tar.gz -> ${P}.tar.gz" + KEYWORDS="amd64" +fi + +DESCRIPTION="Gamecube and Wii game emulator" +HOMEPAGE="https://www.dolphin-emu.org/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg log lto profile pulseaudio +qt5 systemd upnp" + +RDEPEND=" + dev-libs/hidapi:0= + dev-libs/libfmt:0= + dev-libs/lzo:2= + dev-libs/pugixml:0= + media-libs/libpng:0= + media-libs/libsfml + media-libs/mesa[egl] + net-libs/enet:1.3 + net-libs/mbedtls:0= + net-misc/curl:0= + sys-libs/readline:0= + sys-libs/zlib:0= + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrandr + virtual/libusb:1 + virtual/opengl + alsa? ( media-libs/alsa-lib ) + bluetooth? ( net-wireless/bluez ) + evdev? ( + dev-libs/libevdev + virtual/udev + ) + ffmpeg? ( media-video/ffmpeg:= ) + profile? ( dev-util/oprofile ) + pulseaudio? ( media-sound/pulseaudio ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) + systemd? ( sys-apps/systemd:0= ) + upnp? ( net-libs/miniupnpc ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig" + +# vulkan-loader required for vulkan backend which can be selected +# at runtime. +RDEPEND="${RDEPEND} + media-libs/vulkan-loader" + +src_prepare() { + cmake_src_prepare + + # Remove all the bundled libraries that support system-installed + # preference. See CMakeLists.txt for conditional 'add_subdirectory' calls. + local KEEP_SOURCES=( + Bochs_disasm + FreeSurround + + # vulkan's API is not backwards-compatible: + # new release dropped VK_PRESENT_MODE_RANGE_SIZE_KHR + # but dolphin still relies on it, bug #729832 + Vulkan + + cpp-optparse + # no support for for using system library + glslang + imgui + # FIXME: xxhash can't be found by cmake + xxhash + # no support for for using system library + minizip + # soundtouch uses shorts, not floats + soundtouch + cubeb + discord-rpc + # Their build set up solely relies on the build in gtest. + gtest + # gentoo's version requires exception support. + # dolphin disables exceptions and fails the build. + picojson + # No code to detect shared library. + zstd + ) + local s + for s in "${KEEP_SOURCES[@]}"; do + mv -v "Externals/${s}" . || die + done + einfo "removing sources: $(echo Externals/*)" + rm -r Externals/* || die "Failed to delete Externals dir." + for s in "${KEEP_SOURCES[@]}"; do + mv -v "${s}" "Externals/" || die + done + + remove_locale() { + # Ensure preservation of the backup locale when no valid LINGUA is set + if [[ "${PLOCALE_BACKUP}" == "${1}" ]] && [[ "${PLOCALE_BACKUP}" == "$(l10n_get_locales)" ]]; then + return + else + rm "Languages/po/${1}.po" || die + fi + } + + l10n_find_plocales_changes "Languages/po/" "" '.po' + l10n_for_each_disabled_locale_do remove_locale +} + +src_configure() { + local mycmakeargs=( + # Use ccache only when user did set FEATURES=ccache (or similar) + # not when ccache binary is present in system (automagic). + -DCCACHE_BIN=CCACHE_BIN-NOTFOUND + -DENABLE_ALSA=$(usex alsa) + -DENABLE_BLUEZ=$(usex bluetooth) + -DENABLE_EVDEV=$(usex evdev) + -DENCODE_FRAMEDUMPS=$(usex ffmpeg) + -DENABLE_LLVM=OFF + -DENABLE_LTO=$(usex lto) + -DENABLE_PULSEAUDIO=$(usex pulseaudio) + -DENABLE_QT=$(usex qt5) + -DENABLE_SDL=OFF # not supported: #666558 + -DFASTLOG=$(usex log) + -DOPROFILING=$(usex profile) + -DUSE_DISCORD_PRESENCE=$(usex discord-presence) + -DUSE_SHARED_ENET=ON + -DUSE_UPNP=$(usex upnp) + + # Undo cmake-utils.eclass's defaults. + # All dolphin's libraries are private + # and rely on circular dependency resolution. + -DBUILD_SHARED_LIBS=OFF + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + dodoc Readme.md + if use doc; then + dodoc -r docs/ActionReplay docs/DSP docs/WiiMote + fi + + doicon -s 48 Data/dolphin-emu.png + doicon -s scalable Data/dolphin-emu.svg + doicon Data/dolphin-emu.svg +} + +pkg_postinst() { + # Add pax markings for hardened systems + pax-mark -m "${EPREFIX}"/usr/games/bin/"${PN}"-emu + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild index 55392d47b0fd..56655d4613a0 100644 --- a/games-emulation/dolphin/dolphin-9999.ebuild +++ b/games-emulation/dolphin/dolphin-9999.ebuild @@ -1,19 +1,21 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PLOCALES="ar ca cs da de el en es fa fr hr hu it ja ko ms nb nl pl pt pt_BR ro ru sr sv tr zh_CN zh_TW" PLOCALE_BACKUP="en" -inherit cmake-utils desktop gnome2-utils l10n pax-utils +inherit cmake desktop xdg-utils l10n pax-utils if [[ ${PV} == *9999 ]] then EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin" inherit git-r3 else - SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip -> ${P}.zip" + inherit vcs-snapshot + commit=0dbe8fb2eaa608a6540df3d269648a596c29cf4b + SRC_URI="https://github.com/dolphin-emu/dolphin/archive/${commit}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64" fi @@ -59,9 +61,8 @@ RDEPEND=" systemd? ( sys-apps/systemd:0= ) upnp? ( net-libs/miniupnpc ) " -DEPEND="${RDEPEND} - app-arch/zip - media-libs/freetype +DEPEND="${RDEPEND}" +BDEPEND=" sys-devel/gettext virtual/pkgconfig" @@ -71,7 +72,7 @@ RDEPEND="${RDEPEND} media-libs/vulkan-loader" src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare # Remove all the bundled libraries that support system-installed # preference. See CMakeLists.txt for conditional 'add_subdirectory' calls. @@ -146,13 +147,18 @@ src_configure() { -DUSE_DISCORD_PRESENCE=$(usex discord-presence) -DUSE_SHARED_ENET=ON -DUSE_UPNP=$(usex upnp) + + # Undo cmake-utils.eclass's defaults. + # All dolphin's libraries are private + # and rely on circular dependency resolution. + -DBUILD_SHARED_LIBS=OFF ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install dodoc Readme.md if use doc; then @@ -167,9 +173,9 @@ src_install() { pkg_postinst() { # Add pax markings for hardened systems pax-mark -m "${EPREFIX}"/usr/games/bin/"${PN}"-emu - gnome2_icon_cache_update + xdg_icon_cache_update } pkg_postrm() { - gnome2_icon_cache_update + xdg_icon_cache_update } diff --git a/games-emulation/dolphin/files/dolphin-5.0-CHAR_WIDTH-collision.patch b/games-emulation/dolphin/files/dolphin-5.0-CHAR_WIDTH-collision.patch deleted file mode 100644 index d6e4c7a2dc0e..000000000000 --- a/games-emulation/dolphin/files/dolphin-5.0-CHAR_WIDTH-collision.patch +++ /dev/null @@ -1,49 +0,0 @@ -Avoid clash with TS 18661-1:2014 macros -https://bugs.gentoo.org/637986 - ---- a/Source/Core/VideoBackends/OGL/RasterFont.cpp -+++ b/Source/Core/VideoBackends/OGL/RasterFont.cpp -@@ -15,7 +15,7 @@ - namespace OGL - { - --static const int CHAR_WIDTH = 8; -+static const int DOLPHIN_CHAR_WIDTH = 8; - static const int CHAR_HEIGHT = 13; - static const int CHAR_OFFSET = 32; - static const int CHAR_COUNT = 95; -@@ -146,20 +146,20 @@ - glGenTextures(1, &texture); - glActiveTexture(GL_TEXTURE8); - glBindTexture(GL_TEXTURE_2D, texture); -- std::vector<u32> texture_data(CHAR_WIDTH * CHAR_COUNT * CHAR_HEIGHT); -+ std::vector<u32> texture_data(DOLPHIN_CHAR_WIDTH * CHAR_COUNT * CHAR_HEIGHT); - for (int y = 0; y < CHAR_HEIGHT; y++) - { - for (int c = 0; c < CHAR_COUNT; c++) - { -- for (int x = 0; x < CHAR_WIDTH; x++) -+ for (int x = 0; x < DOLPHIN_CHAR_WIDTH; x++) - { -- bool pixel = (0 != (rasters[c][y] & (1 << (CHAR_WIDTH - x - 1)))); -- texture_data[CHAR_WIDTH * CHAR_COUNT * y + CHAR_WIDTH * c + x] = pixel ? -1 : 0; -+ bool pixel = (0 != (rasters[c][y] & (1 << (DOLPHIN_CHAR_WIDTH - x - 1)))); -+ texture_data[DOLPHIN_CHAR_WIDTH * CHAR_COUNT * y + DOLPHIN_CHAR_WIDTH * c + x] = pixel ? -1 : 0; - } - } - } - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0); -- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, CHAR_WIDTH * CHAR_COUNT, CHAR_HEIGHT, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture_data.data()); -+ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, DOLPHIN_CHAR_WIDTH * CHAR_COUNT, CHAR_HEIGHT, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture_data.data()); - - // generate shader - ProgramShaderCache::CompileShader(s_shader, s_vertexShaderSrc, s_fragmentShaderSrc); -@@ -196,7 +196,7 @@ - std::vector<GLfloat> vertices(text.length() * 6 * 4); - - int usage = 0; -- GLfloat delta_x = GLfloat(2 * CHAR_WIDTH) / GLfloat(bbWidth); -+ GLfloat delta_x = GLfloat(2 * DOLPHIN_CHAR_WIDTH) / GLfloat(bbWidth); - GLfloat delta_y = GLfloat(2 * CHAR_HEIGHT) / GLfloat(bbHeight); - GLfloat border_x = 2.0f / GLfloat(bbWidth); - GLfloat border_y = 4.0f / GLfloat(bbHeight); diff --git a/games-emulation/dolphin/files/dolphin-5.0-no-pie.patch b/games-emulation/dolphin/files/dolphin-5.0-no-pie.patch deleted file mode 100644 index 949e42e50de9..000000000000 --- a/games-emulation/dolphin/files/dolphin-5.0-no-pie.patch +++ /dev/null @@ -1,26 +0,0 @@ -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() diff --git a/games-emulation/dolphin/files/dolphin-5.0-soundtouch-exceptions.patch b/games-emulation/dolphin/files/dolphin-5.0-soundtouch-exceptions.patch deleted file mode 100644 index ffd07cf0697f..000000000000 --- a/games-emulation/dolphin/files/dolphin-5.0-soundtouch-exceptions.patch +++ /dev/null @@ -1,19 +0,0 @@ -https://bugs.gentoo.org/686752 - -Description: Fix FTBFS with SoundTouch 2.1.2 - Explicitly disable exceptions in SoundTouch headers because Dolphin - is compiled with -fno-exceptions. -Author: James Cowgill <jcowgill@debian.org> -Bug-Debian: https://bugs.debian.org/917671 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/Source/Core/AudioCommon/OpenALStream.h -+++ b/Source/Core/AudioCommon/OpenALStream.h -@@ -32,6 +32,7 @@ - #define BOOL SoundTouch_BOOL - #endif - -+#define ST_NO_EXCEPTION_HANDLING - #include <soundtouch/SoundTouch.h> - #include <soundtouch/STTypes.h> - diff --git a/games-emulation/dolphin/files/dolphin-5.0-xgetbv.patch b/games-emulation/dolphin/files/dolphin-5.0-xgetbv.patch deleted file mode 100644 index ffa7cc81c13e..000000000000 --- a/games-emulation/dolphin/files/dolphin-5.0-xgetbv.patch +++ /dev/null @@ -1,24 +0,0 @@ -Workaround collision of _xgetbv intrinsic redeclaration: - -Source/Core/Common/x64CPUDetect.cpp:45:12: error: ambiguating new declaration of ‘u64 _xgetbv(u32)’ - static u64 _xgetbv(u32 index) - ^~~~~~~ -In file included from /usr/lib/gcc/x86_64-pc-linux-gnu/8.1.0/include/x86intrin.h:74, - from Source/Core/Common/Intrinsics.h:12, - from Source/Core/Common/x64CPUDetect.cpp:10: -/usr/lib/gcc/x86_64-pc-linux-gnu/8.1.0/include/xsaveintrin.h:60:1: note: old declaration ‘long long int _xgetbv(unsigned int)’ - _xgetbv (unsigned int __A) - ^~~~~~~ - -Upstream fied it in - commit 823fdda30c38be953c3d425874f2adeabed2b5a8 - intrinsics: stop defining _xgetbv/_XCR_XFEATURE_ENABLED_MASK, which are reserved - ---- a/Source/Core/Common/x64CPUDetect.cpp -+++ b/Source/Core/Common/x64CPUDetect.cpp -@@ -45 +45 @@ static inline void __cpuid(int info[4], int function_id) --static u64 _xgetbv(u32 index) -+static u64 _xgetbv_dolphin(u32 index) -@@ -137 +137 @@ void CPUInfo::Detect() -- if ((_xgetbv(_XCR_XFEATURE_ENABLED_MASK) & 0x6) == 0x6) -+ if ((_xgetbv_dolphin(_XCR_XFEATURE_ENABLED_MASK) & 0x6) == 0x6) diff --git a/games-emulation/dolphin/metadata.xml b/games-emulation/dolphin/metadata.xml index 34a2a16ae8ed..6c45a6966333 100644 --- a/games-emulation/dolphin/metadata.xml +++ b/games-emulation/dolphin/metadata.xml @@ -6,7 +6,6 @@ </maintainer> <use> <flag name="discord-presence">Enables Discord Rich Presence, show the current game on Discord</flag> - <flag name="egl">Enable EGL support</flag> <flag name="evdev">Enable evdev input support</flag> <flag name="log">Increase logging output</flag> <flag name="lto">Add support for link-time optimizations.</flag> |