| 1 |
commit: 4cb2722b22da8e81c5603c91cfaff36b7a616578 |
| 2 |
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> |
| 3 |
AuthorDate: Sun Nov 7 06:22:16 2021 +0000 |
| 4 |
Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> |
| 5 |
CommitDate: Sun Nov 7 13:56:25 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4cb2722b |
| 7 |
|
| 8 |
games-emulation/yuzu: correct deps |
| 9 |
|
| 10 |
* remove 'filter-flags' |
| 11 |
|
| 12 |
* add dev-util/glslang dep |
| 13 |
|
| 14 |
* move some deps to BDEPEND |
| 15 |
|
| 16 |
* remove libzip |
| 17 |
|
| 18 |
* opus is unbundled upstream |
| 19 |
|
| 20 |
* add licenses |
| 21 |
|
| 22 |
* EAPI 7 -> 8 |
| 23 |
|
| 24 |
Closes: https://bugs.gentoo.org/807953 |
| 25 |
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in> |
| 26 |
|
| 27 |
games-emulation/yuzu/yuzu-9999.ebuild | 59 +++++++++++++++++------------------ |
| 28 |
1 file changed, 28 insertions(+), 31 deletions(-) |
| 29 |
|
| 30 |
diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild |
| 31 |
index 6d0bd661d..7bb3ff721 100644 |
| 32 |
--- a/games-emulation/yuzu/yuzu-9999.ebuild |
| 33 |
+++ b/games-emulation/yuzu/yuzu-9999.ebuild |
| 34 |
@@ -1,57 +1,65 @@ |
| 35 |
# Copyright 2020-2021 Gentoo Authors |
| 36 |
# Distributed under the terms of the GNU General Public License v2 |
| 37 |
|
| 38 |
-EAPI=7 |
| 39 |
+EAPI=8 |
| 40 |
|
| 41 |
-inherit cmake git-r3 flag-o-matic toolchain-funcs xdg |
| 42 |
+inherit cmake git-r3 toolchain-funcs xdg |
| 43 |
|
| 44 |
DESCRIPTION="An emulator for Nintendo Switch" |
| 45 |
HOMEPAGE="https://yuzu-emu.org" |
| 46 |
EGIT_REPO_URI="https://github.com/yuzu-emu/yuzu" |
| 47 |
-EGIT_SUBMODULES=( '*' '-ffmpeg' '-inih' '-libressl' '-libusb' '-libzip' '-opus' '-SDL' ) |
| 48 |
+EGIT_SUBMODULES=( '*' '-ffmpeg' '-inih' '-libressl' '-libusb' '-opus' '-SDL' ) |
| 49 |
+# TODO '-libzip' when boxcat feature is reintroduced |
| 50 |
# TODO '-xbyak' wait for bump in tree |
| 51 |
# TODO cubeb auto-links to jack, pulse, alsa .., allow determining cubeb output |
| 52 |
# media-libs/cubeb would benefit to a lot of packages: dolphin-emu, firefox, citra, self, ... |
| 53 |
# TODO many submodules produce static libraries which forces to unset BUILD_SHARED_LIBS |
| 54 |
# this may be better to generate shared libraries and install them under /usr/$(get_libdir)/yuzu |
| 55 |
|
| 56 |
-LICENSE="GPL-3" |
| 57 |
+LICENSE="|| ( Apache-2.0 GPL-2+ ) 0BSD BSD GPL-2+ ISC MIT |
| 58 |
+ !system-vulkan? ( Apache-2.0 )" |
| 59 |
SLOT="0" |
| 60 |
KEYWORDS="" |
| 61 |
IUSE="+boxcat +compatibility-list +cubeb discord +qt5 sdl system-vulkan webengine +webservice" |
| 62 |
|
| 63 |
-DEPEND=" |
| 64 |
- discord? ( >=dev-libs/rapidjson-1.1.0 ) |
| 65 |
+RDEPEND=" |
| 66 |
+ >=app-arch/lz4-1.8:= |
| 67 |
+ >=app-arch/zstd-1.5 |
| 68 |
+ >=dev-libs/boost-1.73:=[context] |
| 69 |
+ >=dev-libs/libfmt-8:= |
| 70 |
+ >=dev-libs/openssl-1.1:= |
| 71 |
+ >=media-libs/opus-1.3 |
| 72 |
+ media-video/ffmpeg:= |
| 73 |
+ >=sys-libs/zlib-1.2 |
| 74 |
+ virtual/libusb:1 |
| 75 |
qt5? ( |
| 76 |
- >=dev-qt/qtgui-5.15 |
| 77 |
- >=dev-qt/qtwidgets-5.15 |
| 78 |
+ >=dev-qt/qtcore-5.15:5 |
| 79 |
+ >=dev-qt/qtgui-5.15:5 |
| 80 |
+ >=dev-qt/qtwidgets-5.15:5 |
| 81 |
) |
| 82 |
sdl? ( |
| 83 |
>=media-libs/libsdl2-2.0.16 |
| 84 |
>=dev-libs/inih-52 |
| 85 |
) |
| 86 |
+" |
| 87 |
+DEPEND="${RDEPEND} |
| 88 |
system-vulkan? ( |
| 89 |
>=dev-util/vulkan-headers-1.2.180 |
| 90 |
) |
| 91 |
- >=app-arch/lz4-1.8 |
| 92 |
- >=app-arch/zstd-1.5 |
| 93 |
+" |
| 94 |
+BDEPEND=" |
| 95 |
>=dev-cpp/catch-2.13:0 |
| 96 |
>=dev-cpp/nlohmann_json-3.8.0 |
| 97 |
- >=dev-libs/boost-1.73:=[context] |
| 98 |
- >=dev-libs/libfmt-8 |
| 99 |
- >=dev-libs/libzip-1.5 |
| 100 |
- >=media-libs/opus-1.3.1 |
| 101 |
- >=sys-libs/zlib-1.2 |
| 102 |
- virtual/libusb:1 |
| 103 |
+ dev-util/glslang |
| 104 |
+ discord? ( >=dev-libs/rapidjson-1.1.0 ) |
| 105 |
" |
| 106 |
-RDEPEND="${DEPEND}" |
| 107 |
REQUIRED_USE="boxcat? ( webservice ) || ( qt5 sdl )" |
| 108 |
|
| 109 |
PATCHES=( "${FILESDIR}"/${P}-assert.patch ) |
| 110 |
|
| 111 |
pkg_setup() { |
| 112 |
- if [ tc-is-gcc ]; then |
| 113 |
- [ "$(gcc-major-version)" -lt 11 ] && \ |
| 114 |
+ if tc-is-gcc; then |
| 115 |
+ [[ "$(gcc-major-version)" -lt 11 ]] && \ |
| 116 |
die "You need gcc version 11 or clang to compile this package" |
| 117 |
fi |
| 118 |
grep -q 'ThreadEngineStarter<void>' /usr/include/qt5/QtConcurrent/qtconcurrentthreadengine.h \ |
| 119 |
@@ -70,22 +78,11 @@ src_unpack() { |
| 120 |
} |
| 121 |
|
| 122 |
src_prepare() { |
| 123 |
- # Set yuzu dev flags |
| 124 |
- filter-flags '-*' |
| 125 |
- append-cflags '-O3 -DNDEBUG' |
| 126 |
- append-cxxflags '-O3 -DNDEBUG' |
| 127 |
- |
| 128 |
# headers is not a valid boost component |
| 129 |
sed -i -e '/find_package(Boost/{s/headers //;s/CONFIG //}' CMakeLists.txt || die |
| 130 |
|
| 131 |
# Allow skip submodule downloading |
| 132 |
- rm .gitmodules |
| 133 |
- |
| 134 |
- # unbundle opus (thx to https://github.com/Alex-Aralis/yuzu-overlay/blob/master/games-emulation/yuzu/files/unbundle-opus.patch) |
| 135 |
- sed -i -e "s!add_subdirectory(opus)!add_library(opus INTERFACE)\ntarget_include_directories(opus SYSTEM INTERFACE /usr/include/opus)\ntarget_link_libraries(opus INTERFACE /usr/$(get_libdir)/libopus.so)!" externals/CMakeLists.txt || die |
| 136 |
- |
| 137 |
- # Fix libzip detection |
| 138 |
- sed -i -e '/Libzip/s:.*:include(find-modules/FindLibzip.cmake)\n&:' externals/CMakeLists.txt || die |
| 139 |
+ rm .gitmodules || die |
| 140 |
|
| 141 |
# Unbundle inih |
| 142 |
sed -i -e '/inih/d' externals/CMakeLists.txt || die |
Archives