commit: 60c62f5f89fb61a850f62734a233746b77c613dc Author: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr> AuthorDate: Mon Feb 13 00:09:27 2023 +0000 Commit: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr> CommitDate: Mon Feb 13 00:09:44 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=60c62f5f
games-emulation/yuzu: pkgcheck, >=dev-cpp/httplib-0.12 Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr> games-emulation/yuzu/yuzu-0_p20220725.ebuild | 118 --------------------------- games-emulation/yuzu/yuzu-0_p20230202.ebuild | 21 +++-- games-emulation/yuzu/yuzu-9999.ebuild | 12 +-- 3 files changed, 22 insertions(+), 129 deletions(-) diff --git a/games-emulation/yuzu/yuzu-0_p20220725.ebuild b/games-emulation/yuzu/yuzu-0_p20220725.ebuild deleted file mode 100644 index c1d3fd0d9..000000000 --- a/games-emulation/yuzu/yuzu-0_p20220725.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake toolchain-funcs xdg - -DESCRIPTION="An emulator for Nintendo Switch" -HOMEPAGE="https://yuzu-emu.org"; -SRC_URI="https://github.com/yuzu-emu/yuzu-mainline/archive/dfaab8f6571856ec3c75cfad303a50503d213665.tar.gz -> ${P}.tar.gz - https://github.com/merryhime/dynarmic/archive/91d1f944e3870e0f3c505b48f5ec00ca9a82b95d.tar.gz -> ${PN}-dynarmic-${PV}.tar.gz - https://github.com/herumi/xbyak/archive/c306b8e5786eeeb87b8925a8af5c3bf057ff5a90.tar.gz -> ${PN}-xbyak-${PV}.tar.gz - compatibility-list? ( https://gist.githubusercontent.com/mazes-80/db6fc80114f67dde9d680de6c4d60428/raw/59274e6e641027cb6bf5e2077a899edabaf88904/yuzu-0_p20220725-compatibility_list.json ) - discord? ( https://github.com/discord/discord-rpc/archive/963aa9f3e5ce81a4682c6ca3d136cddda614db33.tar.gz -> ${PN}-discord-${PV}.tar.gz )" -# Dynarmic is not intended to be generic, it is tweaked to fit emulated processor -# xbyak >= 5.96 still not in portage. sent version bump on gentoo BT, can't be in guru as package already exists -# discord-rpc: help appreciated to make ebuild, as I never use it I surely will stick to snapshot download -# TODO host compatibility_list.json - -LICENSE="|| ( Apache-2.0 GPL-2+ ) 0BSD BSD GPL-2+ ISC MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+compatibility-list +cubeb discord +qt5 sdl webengine +webservice" - -RDEPEND=" - <net-libs/mbedtls-3.1[cmac] - >=app-arch/zstd-1.5 - >=dev-libs/libfmt-8:= - >=dev-libs/openssl-1.1:= - >=media-video/ffmpeg-4.3:= - app-arch/lz4:= - dev-libs/boost:=[context] - dev-libs/sirit - media-libs/opus - sys-libs/zlib - virtual/libusb:1 - cubeb? ( media-libs/cubeb ) - qt5? ( - >=dev-qt/qtcore-5.15:5 - >=dev-qt/qtgui-5.15:5 - >=dev-qt/qtmultimedia-5.15:5 - >=dev-qt/qtwidgets-5.15:5 - ) - sdl? ( - >=media-libs/libsdl2-2.0.18 - >=dev-libs/inih-52 - ) -" -DEPEND="${RDEPEND} - dev-cpp/cpp-httplib - >=dev-util/vulkan-headers-1.3.216 -" -BDEPEND=" - >=dev-cpp/nlohmann_json-3.8.0 - dev-cpp/robin-map - dev-util/glslang - discord? ( >=dev-libs/rapidjson-1.1.0 ) -" -S="${WORKDIR}"/yuzu-mainline-dfaab8f6571856ec3c75cfad303a50503d213665 -PATCHES=( "${FILESDIR}/${P}.patch" ) - -REQUIRED_USE="|| ( qt5 sdl )" - -pkg_setup() { - if tc-is-gcc; then - [[ "$(gcc-major-version)" -lt 11 ]] && \ - die "You need gcc version 11 or clang to compile this package" - fi -} - -src_unpack() { - default - mv "${WORKDIR}"/xbyak* "${S}/externals/xbyak/xbyak" || die - mv "${WORKDIR}"/dynarmic*/* "${S}/externals/dynarmic" || die - if use discord; then - mv "${WORKDIR}"/discord*/* "${S}/externals/discord-rpc" || die - fi -} - -src_prepare() { - # Allow skip submodule downloading - rm .gitmodules || die - - if ! use discord; then - sed -i -e '/discord-rpc/d' externals/CMakeLists.txt || die - else - # Unbundle discord rapidjson - sed -i '/NOT RAPIDJSONTEST/,/endif(NOT RAPIDJSONTEST)/d;/find_file(RAPIDJSON/d;s:\${RAPIDJSON}:"/usr/include/rapidjson":' \ - externals/discord-rpc/CMakeLists.txt || die - fi - - cmake_src_prepare -} - -src_configure() { - local -a mycmakeargs=( - # Libraries are private and rely on circular dependency resolution. - -DBUILD_SHARED_LIBS=OFF # dynarmic - -DDYNARMIC_NO_BUNDLED_ROBIN_MAP=ON - -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=$(usex compatibility-list) - -DENABLE_CUBEB=$(usex cubeb) - -DENABLE_QT=$(usex qt5) - -DENABLE_QT_TRANSLATION=$(usex qt5) - -DENABLE_SDL2=$(usex sdl) - -DENABLE_WEB_SERVICE=$(usex webservice) - -DUSE_DISCORD_PRESENCE=$(usex discord) - -DYUZU_TESTS=OFF - -DYUZU_USE_BUNDLED_OPUS=OFF - -DYUZU_USE_EXTERNAL_SDL2=OFF - -DYUZU_USE_QT_WEB_ENGINE=$(usex webengine) - ) - - cmake_src_configure - - if use compatibility-list; then - cp "${DISTDIR}"/${P}-compatibility_list.json "${BUILD_DIR}"/dist/compatibility_list/ || die - fi -} diff --git a/games-emulation/yuzu/yuzu-0_p20230202.ebuild b/games-emulation/yuzu/yuzu-0_p20230202.ebuild index ef683cc24..0a33404db 100644 --- a/games-emulation/yuzu/yuzu-0_p20230202.ebuild +++ b/games-emulation/yuzu/yuzu-0_p20230202.ebuild @@ -7,12 +7,20 @@ inherit cmake toolchain-funcs xdg DESCRIPTION="An emulator for Nintendo Switch" HOMEPAGE="https://yuzu-emu.org"; -SRC_URI="https://github.com/yuzu-emu/yuzu-mainline/archive/d5f6201521cdfd0be09a187d62f95d3a38f18c3e.tar.gz -> ${P}.tar.gz - https://github.com/merryhime/dynarmic/archive/befe547d5631024a70d81d2ccee808bbfcb3854e.tar.gz -> ${PN}-dynarmic-${PV}.tar.gz - https://github.com/herumi/xbyak/archive/a1ac3750f9a639b5a6c6d6c7da4259b8d6790989.tar.gz -> ${PN}-xbyak-${PV}.tar.gz +SRC_URI="https://github.com/yuzu-emu/yuzu-mainline/archive/d5f6201521cdfd0be09a187d62f95d3a38f18c3e.tar.gz + -> ${P}.tar.gz + https://github.com/merryhime/dynarmic/archive/befe547d5631024a70d81d2ccee808bbfcb3854e.tar.gz + -> ${PN}-dynarmic-${PV}.tar.gz + https://github.com/herumi/xbyak/archive/a1ac3750f9a639b5a6c6d6c7da4259b8d6790989.tar.gz + -> ${PN}-xbyak-${PV}.tar.gz https://github.com/yuzu-emu/sirit/archive/ab75463999f4f3291976b079d42d52ee91eebf3f.tar.gz -> ${PN}-sirit-${PV}.tar.gz - compatibility-list? ( https://gist.githubusercontent.com/mazes-80/e3f1518e67c3292656a9055ba338994f/raw/b975f96366294d9cf65f844ed8df9189a488463d/yuzu-0_p20230202-compatibility_list.json ) - discord? ( https://github.com/yuzu-emu/discord-rpc/archive/20cc99aeffa08a4834f156b6ab49ed68618cf94a.tar.gz -> ${PN}-discord-${PV}.tar.gz )" + compatibility-list? ( + https://gist.githubusercontent.com/mazes-80/e3f1518e67c3292656a9055ba338994f/raw/b975f96366294d9cf65f844ed8df9189a488463d/${P}-compatibility_list.json + ) + discord? ( + https://github.com/yuzu-emu/discord-rpc/archive/20cc99aeffa08a4834f156b6ab49ed68618cf94a.tar.gz + -> ${PN}-discord-${PV}.tar.gz + )" # Dynarmic is not intended to be generic, it is tweaked to fit emulated processor # TODO wait 'xbyak' waiting version bump. see #860816 @@ -91,7 +99,8 @@ src_prepare() { sed -i -e '/^if.*discord-rpc/,/^endif()/d' externals/CMakeLists.txt || die else # Unbundle discord rapidjson - sed -i '/NOT RAPIDJSONTEST/,/endif(NOT RAPIDJSONTEST)/d;/find_file(RAPIDJSON/d;s:\${RAPIDJSON}:"/usr/include/rapidjson":' \ + sed -i -e '/NOT RAPIDJSONTEST/,/endif(NOT RAPIDJSONTEST)/d' \ + -e '/find_file(RAPIDJSON/d' -e 's:\${RAPIDJSON}:"/usr/include/rapidjson":' \ externals/discord-rpc/CMakeLists.txt || die fi diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild index b44eff45d..6bc23133b 100644 --- a/games-emulation/yuzu/yuzu-9999.ebuild +++ b/games-emulation/yuzu/yuzu-9999.ebuild @@ -28,8 +28,8 @@ RDEPEND=" >=net-libs/enet-1.3 app-arch/lz4:= dev-libs/boost:=[context] - media-libs/vulkan-loader media-libs/opus + media-libs/vulkan-loader sys-libs/zlib virtual/libusb:1 cubeb? ( media-libs/cubeb ) @@ -92,10 +92,10 @@ src_prepare() { # Unbundle inih sed -i -e '/^if.*inih/,/^endif()/d' externals/CMakeLists.txt || die - sed -i -e '1afind_package(PkgConfig REQUIRED)\npkg_check_modules(INIH REQUIRED INIReader)' src/yuzu_cmd/CMakeLists.txt || die + sed -i -e '1afind_package(PkgConfig REQUIRED)\npkg_check_modules(INIH REQUIRED INIReader)' \ + src/yuzu_cmd/CMakeLists.txt || die sed -i -e 's:inih/cpp/::' src/yuzu_cmd/config.cpp || die - # Unbundle mbedtls sed -i -e '/mbedtls/d' externals/CMakeLists.txt || die sed -i -e 's/mbedtls/& mbedcrypto mbedx509/' \ @@ -112,7 +112,8 @@ src_prepare() { sed -i -e '/^if.*discord-rpc/,/^endif()/d' externals/CMakeLists.txt || die else # Unbundle discord rapidjson - sed -i '/NOT RAPIDJSONTEST/,/endif(NOT RAPIDJSONTEST)/d;/find_file(RAPIDJSON/d;s:\${RAPIDJSON}:"/usr/include/rapidjson":' \ + sed -i -e '/NOT RAPIDJSONTEST/,/endif(NOT RAPIDJSONTEST)/d' \ + -e '/find_file(RAPIDJSON/d' -e 's:\${RAPIDJSON}:"/usr/include/rapidjson":' \ externals/discord-rpc/CMakeLists.txt || die fi @@ -121,7 +122,8 @@ src_prepare() { sed -i '/^if.*cubeb/,/^endif()/d' externals/CMakeLists.txt || die # Unbundle cpp-httplib - sed -i -e '/^ # httplib/,/^ endif()/d' externals/CMakeLists.txt || die + sed -i -e '/httplib/s/ 0.11//' CMakeLists.txt || die + sed -i -e '/^# httplib/,/^endif()/d' externals/CMakeLists.txt || die # Unbundle enet sed -i -e '/^if.*enet/,/^endif()/d' externals/CMakeLists.txt || die
