| 1 |
commit: 5acf308c9431a30925d0381398391c0bb806d390 |
| 2 |
Author: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr> |
| 3 |
AuthorDate: Fri Apr 30 01:09:17 2021 +0000 |
| 4 |
Commit: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr> |
| 5 |
CommitDate: Fri Apr 30 01:09:17 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5acf308c |
| 7 |
|
| 8 |
games-emulation/yuzu: unbundle vulkan-headers |
| 9 |
|
| 10 |
Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr> |
| 11 |
|
| 12 |
games-emulation/yuzu/yuzu-9999.ebuild | 11 ++++------- |
| 13 |
1 file changed, 4 insertions(+), 7 deletions(-) |
| 14 |
|
| 15 |
diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild |
| 16 |
index 9ffff3184..ae1aac907 100644 |
| 17 |
--- a/games-emulation/yuzu/yuzu-9999.ebuild |
| 18 |
+++ b/games-emulation/yuzu/yuzu-9999.ebuild |
| 19 |
@@ -2,23 +2,18 @@ |
| 20 |
# Distributed under the terms of the GNU General Public License v2 |
| 21 |
|
| 22 |
EAPI=7 |
| 23 |
-# PYTHON_COMPAT=( python2_7 ) |
| 24 |
|
| 25 |
-#inherit cmake git-r3 flag-o-matic python-any-r1 toolchain-funcs xdg |
| 26 |
inherit cmake git-r3 flag-o-matic toolchain-funcs xdg |
| 27 |
|
| 28 |
DESCRIPTION="An emulator for Nintendo Switch" |
| 29 |
HOMEPAGE="https://yuzu-emu.org" |
| 30 |
EGIT_REPO_URI="https://github.com/yuzu-emu/yuzu" |
| 31 |
-EGIT_SUBMODULES=( '*' '-ffmpeg' '-inih' '-libressl' '-libusb' '-libzip' '-opus' '-SDL' ) |
| 32 |
-# TODO '-Vulkan-Headers' need to fix API in code |
| 33 |
+EGIT_SUBMODULES=( '*' '-ffmpeg' '-inih' '-libressl' '-libusb' '-libzip' '-opus' '-SDL' '-Vulkan-Headers' ) |
| 34 |
# TODO '-xbyak' wait for bump in tree |
| 35 |
# TODO cubeb auto-links to jack, pulse, alsa .., allow determining cubeb output |
| 36 |
# media-libs/cubeb would benefit to a lot of packages: dolphin-emu, firefox, citra, self, ... |
| 37 |
# TODO many submodules produce static libraries which forces to unset BUILD_SHARED_LIBS |
| 38 |
# this may be better to generate shared libraries and install them under /usr/$(get_libdir)/yuzu |
| 39 |
-# TODO python2 code should be needed only for submodules test |
| 40 |
-# until verified keep track of python specific ebuild stuffs as comment |
| 41 |
|
| 42 |
LICENSE="GPL-3" |
| 43 |
SLOT="0" |
| 44 |
@@ -44,6 +39,7 @@ DEPEND=" |
| 45 |
>=dev-libs/libzip-1.5 |
| 46 |
>=media-libs/opus-1.3.1 |
| 47 |
>=sys-libs/zlib-1.2 |
| 48 |
+ dev-util/vulkan-headers |
| 49 |
virtual/libusb:1 |
| 50 |
" |
| 51 |
# >=dev-libs/xbyak-5.96 |
| 52 |
@@ -89,7 +85,8 @@ src_prepare() { |
| 53 |
# sed -i -e '/target_include_directories(xbyak/s:./xbyak/xbyak:/usr/include/xbyak/:' externals/CMakeLists.txt |
| 54 |
|
| 55 |
# Unbundle vulkan headers |
| 56 |
- # sed -i -e 's:../../externals/Vulkan-Headers/include:/usr/include/vulkan/:' src/video_core/CMakeLists.txt src/yuzu/CMakeLists.txt src/yuzu_cmd/CMakeLists.txt |
| 57 |
+ sed -i -e 's:../../externals/Vulkan-Headers/include:/usr/include/vulkan/:' src/video_core/CMakeLists.txt src/yuzu/CMakeLists.txt src/yuzu_cmd/CMakeLists.txt |
| 58 |
+ sed -i -e '/VK_ERROR_INCOMPATIBLE_VERSION_KHR/d' src/video_core/vulkan_common/vulkan_wrapper.cpp |
| 59 |
|
| 60 |
# Unbundle discord rapidjson |
| 61 |
sed -i '/NOT RAPIDJSONTEST/,/endif(NOT RAPIDJSONTEST)/d;/find_file(RAPIDJSON/d;s:\${RAPIDJSON}:"/usr/include/rapidjson":' externals/discord-rpc/CMakeLists.txt || die |
Archives