[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/, games-emulation/yuzu/files/
commit: f128f97d9171026d2be7beababda023412dbbedc Author: Viorel Munteanu gentoo org> AuthorDate: Thu Mar 7 13:01:29 2024 + Commit: Viorel Munteanu gentoo org> CommitDate: Thu Mar 7 13:01:29 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f128f97d games-emulation/yuzu: treeclean Upstream shutdown. Signed-off-by: Viorel Munteanu gentoo.org> games-emulation/yuzu/Manifest | 6 - games-emulation/yuzu/files/yuzu-0_p20220725.patch | 175 -- games-emulation/yuzu/files/yuzu-0_p20230202.patch | 169 - games-emulation/yuzu/metadata.xml | 20 --- games-emulation/yuzu/yuzu-0_p20230202.ebuild | 131 games-emulation/yuzu/yuzu-.ebuild | 171 - 6 files changed, 672 deletions(-) diff --git a/games-emulation/yuzu/Manifest b/games-emulation/yuzu/Manifest deleted file mode 100644 index bbe3bf3bd3..00 --- a/games-emulation/yuzu/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -DIST yuzu-0_p20230202-compatibility_list.json 1701739 BLAKE2B 204502a6c8e2838b126c857d7b39cbcfe25a577515f2272d80185a9543e95c324e069d3f3de41564ca24aab5988d38725423691b3a3e6415ea87fd6772c30f1d SHA512 6f380cc5736c7cf3001b4485095dd00d2ad8d5d3459dea0aed006c3361731823a181adf94edd612ffdc8a6fb0c697f7f70cfb1402953c95a9fdd0faaae42 -DIST yuzu-0_p20230202.tar.gz 5535753 BLAKE2B f9dbc43523a5745c3f73d18dc4f8b31811bb80fdc3ac362e584197e01db103324aa568143389cdba1d42d9639af88b49e24312f1ead085a6727afa6d470ca5b5 SHA512 faf597e0ed5837d3b358dfbb7d4cd8e535b4dc49be8781e556fc0b3677e48892c9c71c346bda49c5f6ac081502431480126c11b28a343bc5050341b8a384a7a2 -DIST yuzu-discord-0_p20230202.tar.gz 2106929 BLAKE2B 6e40c938cca5ef3feb8dc65265ef1a4cd3db58c0bbea2fb3d3a4e70748c451ead54932857d761b942a7018dcf461e43bc10ee5eab7907730319675b49564260a SHA512 323b6c8828a2e18f7986aa968ab2ce7ed876196c726d5114a07a536091090f4bd6d4080d87e7fdc4f96dff55871002d8a9a7daa50febd49b75d066e9e363c7ce -DIST yuzu-dynarmic-0_p20230202.tar.gz 3582382 BLAKE2B 46df3546287e6b591e346009ab86c4db80ab19fd0493d057145c20a26c61c8ff85147acc4aac0de36386a18a003d291e4c8ab9a3b2664fe2f9537de74f8fa2ed SHA512 13b2da826bb1de5e610d92979af466bd404bee447f0200277e976797b31ed6844d20541c980ed3a7e5a9aef6fac2a5bc9cb94b37dcc46272c7b51bcb878c3fc6 -DIST yuzu-sirit-0_p20230202.tar.gz 23853 BLAKE2B 4c4e69203a75cf849497e540bb0dcea694a72b4230f205b769447d3d11f7c0fb089ca262009396b9af55503d45b128edb1e99e438b89ab21ac842f789c5109a3 SHA512 43204596db5c6295cc8bdf9355fd71433fa5d1e28d9d8c01f12082d2cd8fb6f78e20d97b396e7bdf202afae2361386f1861a1012d2947569dcbb114996fc6b1d -DIST yuzu-xbyak-0_p20230202.tar.gz 249481 BLAKE2B 94eb81637f410ea88781cb3da94dfce4e4a6104458b0774d36c98f6cd2114f55772182f4535e502a5efa06290677fc67d0bac9db4effb7fa44a79561b16c1738 SHA512 87f6ba92a484738b3a75a4d2c5c7e3f4f9ca65cdc02f71b761dba72c8320a011dd38ea5350516d980b8370211977816de4c3357fc5ae8c9f0a86b4a595768c5e diff --git a/games-emulation/yuzu/files/yuzu-0_p20220725.patch b/games-emulation/yuzu/files/yuzu-0_p20220725.patch deleted file mode 100644 index ad0b53f969..00 --- a/games-emulation/yuzu/files/yuzu-0_p20220725.patch +++ /dev/null @@ -1,175 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 40ca8b1..c0f07e2 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -553,3 +553,4 @@ if(ENABLE_QT AND UNIX AND NOT APPLE) - install(FILES "dist/org.yuzu_emu.yuzu.metainfo.xml" - DESTINATION "share/metainfo") - endif() -+find_package(Threads REQUIRED) -diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt -index bd01f4c..a29dd5d 100644 a/externals/CMakeLists.txt -+++ b/externals/CMakeLists.txt -@@ -4,14 +4,6 @@ list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/CMakeModules") - list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/externals/find-modules") - include(DownloadExternals) - --# xbyak --if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) --add_library(xbyak INTERFACE) --file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/xbyak/include) --file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/xbyak/xbyak DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/xbyak/include) --target_include_directories(xbyak SYSTEM INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/xbyak/include) --target_compile_definitions(xbyak INTERFACE XBYAK_NO_OP_NAMES) --endif() - - # Dynarmic - if (ARCHITECTURE_x86_64) -@@ -29,12 +21,7 @@ endif() - # Glad - add_subdirectory(glad) - --# inih --add_subdirectory(inih) - --# mbedtls --add_subdirectory(mbedtls EXCLUDE_FROM_ALL) --target_include_directories(mbedtls PUBLIC ./mbedtls/include) - - # MicroProfile - add_library(microprofile INTERFACE) -@@ -76,7 +63,6 @@ endif() - # Cubeb - if(ENABLE_CUBEB) - set(BUILD_TESTS OFF CACHE BOOL "") --add_subdirectory(cubeb EXCLUDE_FROM_ALL) - endif() - - # DiscordRPC -@@ -86,7 +72,6 @@ if (USE_DISCORD_PRESENCE) - endif() - - # Sirit --add_subdirectory(sirit) - - if
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: 2c36fd3324a5c88d1cc6db39d09e1a5d4118deaf Author: Takuya Wakazono gmail com> AuthorDate: Mon Jan 8 06:03:40 2024 + Commit: Takuya Wakazono gmail com> CommitDate: Mon Jan 8 06:03:40 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2c36fd33 games-emulation/yuzu: fix build with USE=-cubeb Closes: https://bugs.gentoo.org/921566 Signed-off-by: Takuya Wakazono gmail.com> games-emulation/yuzu/yuzu-0_p20230202.ebuild | 5 + games-emulation/yuzu/yuzu-.ebuild| 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/games-emulation/yuzu/yuzu-0_p20230202.ebuild b/games-emulation/yuzu/yuzu-0_p20230202.ebuild index 0a33404db4..90270e6114 100644 --- a/games-emulation/yuzu/yuzu-0_p20230202.ebuild +++ b/games-emulation/yuzu/yuzu-0_p20230202.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -92,9 +92,6 @@ src_prepare() { # Allow skip submodule downloading rm .gitmodules || die - # Unbundle cubeb - use cubeb && sed -i '$afind_package(Threads REQUIRED)' CMakeLists.txt || die - if ! use discord; then sed -i -e '/^if.*discord-rpc/,/^endif()/d' externals/CMakeLists.txt || die else diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index b562223aa9..e6f42589a9 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -117,7 +117,6 @@ src_prepare() { fi # Unbundle cubeb - use cubeb && sed -i '$afind_package(Threads REQUIRED)' CMakeLists.txt || die sed -i '/^if.*cubeb/,/^endif()/d' externals/CMakeLists.txt || die # Unbundle cpp-httplib
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: 360ea775e40cc4110d30b62db6bec7e0a7d6b997 Author: Moritz Brunner posteo de> AuthorDate: Wed Jan 3 19:51:08 2024 + Commit: Moritz Brunner posteo de> CommitDate: Wed Jan 3 19:54:49 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=360ea775 games-emulation/yuzu: Increase needed Vulkan version The minimum required upstream version of Vulkan is 1.3.274 now. At this time, this version is not yet available in Gentoo. Using - is required. Also include libX11 in dependencies, since the headers are required by Vulkan. Signed-off-by: Moritz Brunner posteo.de> games-emulation/yuzu/yuzu-.ebuild | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index 8e4293715c..b562223aa9 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -8,7 +8,8 @@ inherit cmake git-r3 toolchain-funcs xdg DESCRIPTION="An emulator for Nintendo Switch" HOMEPAGE="https://yuzu-emu.org; EGIT_REPO_URI="https://github.com/yuzu-emu/yuzu-mainline; -EGIT_SUBMODULES=( '-*' 'dynarmic' 'sirit' 'xbyak' 'tzdb_to_nx' 'externals/nx_tzdb/tzdb_to_nx/externals/tz/tz' 'VulkanMemoryAllocator' ) +EGIT_SUBMODULES=( '-*' 'dynarmic' 'sirit' 'xbyak' 'tzdb_to_nx' + 'externals/nx_tzdb/tzdb_to_nx/externals/tz/tz' 'VulkanMemoryAllocator' ) # Dynarmic is not intended to be generic, it is tweaked to fit emulated processor # TODO wait 'xbyak' waiting version bump. see #860816 @@ -28,7 +29,7 @@ RDEPEND=" app-arch/lz4:= dev-libs/boost:=[context] media-libs/opus - media-libs/vulkan-loader + >=media-libs/vulkan-loader-1.3.274 sys-libs/zlib virtual/libusb:1 cubeb? ( media-libs/cubeb ) @@ -48,8 +49,10 @@ RDEPEND=" DEPEND="${RDEPEND} dev-cpp/cpp-httplib dev-cpp/cpp-jwt - system-vulkan? ( >=dev-util/vulkan-headers-1.3.250 - dev-util/spirv-headers ) + system-vulkan? ( >=dev-util/vulkan-headers-1.3.274 + dev-util/spirv-headers + x11-libs/libX11 + ) test? ( >dev-cpp/catch-3:0 ) " BDEPEND="
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: 14c6088d3f5b399441f27905cbe231b3cc619cb3 Author: Moritz Brunner posteo de> AuthorDate: Wed Jan 3 19:49:54 2024 + Commit: Moritz Brunner posteo de> CommitDate: Wed Jan 3 19:54:28 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=14c6088d games-emulation/yuzu: Replace inih with simpleini inih was replaced upstream with simpleini for config file support. Closes: https://bugs.gentoo.org/920675 Closes: https://bugs.gentoo.org/918648 Signed-off-by: Moritz Brunner posteo.de> games-emulation/yuzu/yuzu-.ebuild | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index 56db5e9755..8e4293715c 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -54,6 +54,7 @@ DEPEND="${RDEPEND} " BDEPEND=" >=dev-cpp/nlohmann_json-3.8.0 + dev-cpp/simpleini dev-cpp/robin-map dev-util/glslang discord? ( >=dev-libs/rapidjson-1.1.0 ) @@ -91,12 +92,6 @@ src_prepare() { # temporary fix sed -i -e '/Werror/d' src/CMakeLists.txt || die - # 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 's:inih/cpp/::' src/yuzu_cmd/config.cpp || die - # Unbundle mbedtls sed -i -e '/mbedtls/d' -e '/^if (NOT MSVC)/,/endif()/d' externals/CMakeLists.txt || die sed -i -e 's/mbedtls/& mbedcrypto mbedx509/' \
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: 84ad412348ec16c19667fdca83936ae80785fba3 Author: Samuel Bauer yahoo fr> AuthorDate: Thu Sep 28 06:14:42 2023 + Commit: Samuel Bauer yahoo fr> CommitDate: Thu Sep 28 06:14:42 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=84ad4123 games-emulation/yuzu: update live ebuild Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index 643b5c664b..56db5e9755 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -46,7 +46,7 @@ RDEPEND=" system-libfmt? ( >=dev-libs/libfmt-9:= ) " DEPEND="${RDEPEND} - <=dev-cpp/cpp-httplib-0.13.0 + dev-cpp/cpp-httplib dev-cpp/cpp-jwt system-vulkan? ( >=dev-util/vulkan-headers-1.3.250 dev-util/spirv-headers ) @@ -123,7 +123,7 @@ src_prepare() { sed -i '/^if.*cubeb/,/^endif()/d' externals/CMakeLists.txt || die # Unbundle cpp-httplib - sed -i -e '/httplib/s/ 0.11//' CMakeLists.txt || die + sed -i -e '/httplib/s/ 0.12//' CMakeLists.txt || die sed -i -e '/^# httplib/,/^endif()/d' externals/CMakeLists.txt || die # Unbundle enet
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: 76ea7f2f64417304149b26e88a7a20598856de71 Author: Samuel Bauer yahoo fr> AuthorDate: Fri Sep 1 19:12:42 2023 + Commit: Samuel Bauer yahoo fr> CommitDate: Fri Sep 1 19:12:42 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=76ea7f2f games-emulation/yuzu: update to build system Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index 7116a20e08..643b5c664b 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -46,7 +46,7 @@ RDEPEND=" system-libfmt? ( >=dev-libs/libfmt-9:= ) " DEPEND="${RDEPEND} - dev-cpp/cpp-httplib + <=dev-cpp/cpp-httplib-0.13.0 dev-cpp/cpp-jwt system-vulkan? ( >=dev-util/vulkan-headers-1.3.250 dev-util/spirv-headers ) @@ -98,7 +98,7 @@ src_prepare() { 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 '/mbedtls/d' -e '/^if (NOT MSVC)/,/endif()/d' externals/CMakeLists.txt || die sed -i -e 's/mbedtls/& mbedcrypto mbedx509/' \ src/dedicated_room/CMakeLists.txt \ src/core/CMakeLists.txt || die
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: cbebdcd20f8c55d1eaf0390088dec68c98b0325c Author: Samuel Bauer yahoo fr> AuthorDate: Thu Jul 13 06:36:13 2023 + Commit: Samuel Bauer yahoo fr> CommitDate: Thu Jul 13 06:36:13 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cbebdcd2 games-emulation/yuzu: allow =dev-util/glslang-1.3.250 Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-.ebuild | 11 --- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index 3b74ec067..7116a20e0 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -48,7 +48,7 @@ RDEPEND=" DEPEND="${RDEPEND} dev-cpp/cpp-httplib dev-cpp/cpp-jwt - system-vulkan? ( >=dev-util/vulkan-headers-1.3.246 + system-vulkan? ( >=dev-util/vulkan-headers-1.3.250 dev-util/spirv-headers ) test? ( >dev-cpp/catch-3:0 ) " @@ -82,6 +82,7 @@ src_unpack() { fi git-r3_src_unpack + # Do not fetch via sources because this file always changes use compatibility-list && curl https://api.yuzu-emu.org/gamedb/ > "${S}"/compatibility_list.json } @@ -137,12 +138,8 @@ src_prepare() { fi # Allow compiling using older glslang - if use system-vulkan -a has_version '
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: 15e61867c9f8b5b3f0b1203dc2b255f03f020f45 Author: Samuel Bauer yahoo fr> AuthorDate: Tue Jul 4 20:35:16 2023 + Commit: Samuel Bauer yahoo fr> CommitDate: Tue Jul 4 20:35:16 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=15e61867 games-emulation/yuzu-: forgot xbyak Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/metadata.xml | 5 +++-- games-emulation/yuzu/yuzu-.ebuild | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/games-emulation/yuzu/metadata.xml b/games-emulation/yuzu/metadata.xml index 70aa4d1f4..bf0cf0d71 100644 --- a/games-emulation/yuzu/metadata.xml +++ b/games-emulation/yuzu/metadata.xml @@ -6,14 +6,15 @@ samuel.ba...@yahoo.fr - Enables the cubeb audio backend Downloads the latest compatibility list + Enables the cubeb audio backend Enables Discord Rich Presence + Use system dev-libs/libfmt Use system dev-util/vulkan-headers Use QtWebEngine for web applet implementation Enable web services (telemetry, etc.) - herumi/xbyak + yuzu-emu/yuzu-mainline diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index 3c766c21b..3b74ec067 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -8,7 +8,7 @@ inherit cmake git-r3 toolchain-funcs xdg DESCRIPTION="An emulator for Nintendo Switch" HOMEPAGE="https://yuzu-emu.org; EGIT_REPO_URI="https://github.com/yuzu-emu/yuzu-mainline; -EGIT_SUBMODULES=( '-*' 'dynarmic' 'sirit' 'tzdb_to_nx' 'externals/nx_tzdb/tzdb_to_nx/externals/tz/tz' 'VulkanMemoryAllocator' ) +EGIT_SUBMODULES=( '-*' 'dynarmic' 'sirit' 'xbyak' 'tzdb_to_nx' 'externals/nx_tzdb/tzdb_to_nx/externals/tz/tz' 'VulkanMemoryAllocator' ) # Dynarmic is not intended to be generic, it is tweaked to fit emulated processor # TODO wait 'xbyak' waiting version bump. see #860816
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: 0617347f3761dbce5228a738e05f1ee14e1dda87 Author: Samuel Bauer yahoo fr> AuthorDate: Mon Jul 3 16:18:19 2023 + Commit: Samuel Bauer yahoo fr> CommitDate: Mon Jul 3 16:18:19 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0617347f games-emulation/yuzu-: update metadata.xml Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-.ebuild | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index 6b5af1f7c..3c766c21b 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -42,15 +42,13 @@ RDEPEND=" >=dev-qt/linguist-tools-5.15:5 webengine? ( >=dev-qt/qtwebengine-5.15:5 ) ) - sdl? ( - >=media-libs/libsdl2-2.0.18 - ) + sdl? ( >=media-libs/libsdl2-2.28 ) system-libfmt? ( >=dev-libs/libfmt-9:= ) " DEPEND="${RDEPEND} dev-cpp/cpp-httplib dev-cpp/cpp-jwt - system-vulkan? ( >=dev-util/vulkan-headers-1.3.246 ) + system-vulkan? ( >=dev-util/vulkan-headers-1.3.246 dev-util/spirv-headers ) test? ( >dev-cpp/catch-3:0 ) "
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: 1a6b571d506d5f7aee259a49a42370e3d82e8be3 Author: Samuel Bauer yahoo fr> AuthorDate: Mon Jul 3 15:52:52 2023 + Commit: Samuel Bauer yahoo fr> CommitDate: Mon Jul 3 15:52:52 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1a6b571d games-emulation/yuzu-: update submodules Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-.ebuild | 24 +--- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index 71ccdae2e..6b5af1f7c 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -8,7 +8,7 @@ inherit cmake git-r3 toolchain-funcs xdg DESCRIPTION="An emulator for Nintendo Switch" HOMEPAGE="https://yuzu-emu.org; EGIT_REPO_URI="https://github.com/yuzu-emu/yuzu-mainline; -EGIT_SUBMODULES=( '-*' 'dynarmic' 'sirit' 'xbyak' 'tzdb_to_nx' 'externals/nx_tzdb/tzdb_to_nx/externals/tz/tz' ) +EGIT_SUBMODULES=( '-*' 'dynarmic' 'sirit' 'tzdb_to_nx' 'externals/nx_tzdb/tzdb_to_nx/externals/tz/tz' 'VulkanMemoryAllocator' ) # Dynarmic is not intended to be generic, it is tweaked to fit emulated processor # TODO wait 'xbyak' waiting version bump. see #860816 @@ -16,13 +16,12 @@ LICENSE="|| ( Apache-2.0 GPL-2+ ) 0BSD BSD GPL-2+ ISC MIT !system-vulkan? ( Apache-2.0 )" SLOT="0" KEYWORDS="" -IUSE="+compatibility-list +cubeb discord +qt5 sdl +system-vulkan test webengine +webservice" +IUSE="+compatibility-list +cubeb discord +qt5 sdl +system-libfmt +system-vulkan test webengine +webservice" RDEPEND=" =app-arch/zstd-1.5 >=dev-libs/inih-52 - >=dev-libs/libfmt-9:= >=dev-libs/openssl-1.1:= >=media-video/ffmpeg-4.3:= >=net-libs/enet-1.3 @@ -33,7 +32,6 @@ RDEPEND=" sys-libs/zlib virtual/libusb:1 cubeb? ( media-libs/cubeb ) - dev-util/spirv-headers qt5? ( >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5 @@ -47,11 +45,13 @@ RDEPEND=" sdl? ( >=media-libs/libsdl2-2.0.18 ) + system-libfmt? ( >=dev-libs/libfmt-9:= ) " DEPEND="${RDEPEND} dev-cpp/cpp-httplib dev-cpp/cpp-jwt system-vulkan? ( >=dev-util/vulkan-headers-1.3.246 ) + dev-util/spirv-headers ) test? ( >dev-cpp/catch-3:0 ) " BDEPEND=" @@ -92,9 +92,6 @@ src_prepare() { # temporary fix sed -i -e '/Werror/d' src/CMakeLists.txt || die - # Allow skip submodule downloading - rm .gitmodules || die - # 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)' \ @@ -137,9 +134,13 @@ src_prepare() { # LZ4 temporary fix: https://github.com/yuzu-emu/yuzu/pull/9054/commits/a8021f5a18bc5251aef54468fa6033366c6b92d9 sed -i 's/lz4::lz4/lz4/' src/common/CMakeLists.txt || die + if ! use system-libfmt; then # libfmt >= 9 + sed -i '/fmt.*REQUIRED/d' CMakeLists.txt || die + fi + # Allow compiling using older glslang - if has_version '
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: 1dee546738af6aec870f785c1447ce98863bb2a7 Author: Henri Gasc eurecom fr> AuthorDate: Mon Jun 26 18:43:35 2023 + Commit: Henri Gasc eurecom fr> CommitDate: Mon Jun 26 19:13:41 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1dee5467 games-emulation/yuzu: update ebuild because of new submodule Signed-off-by: Henri Gasc eurecom.fr> games-emulation/yuzu/yuzu-.ebuild | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index 328d46033..71ccdae2e 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2022 Gentoo Authors +# Copyright 2020-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ inherit cmake git-r3 toolchain-funcs xdg DESCRIPTION="An emulator for Nintendo Switch" HOMEPAGE="https://yuzu-emu.org; EGIT_REPO_URI="https://github.com/yuzu-emu/yuzu-mainline; -EGIT_SUBMODULES=( '-*' 'dynarmic' 'sirit' 'xbyak' ) +EGIT_SUBMODULES=( '-*' 'dynarmic' 'sirit' 'xbyak' 'tzdb_to_nx' 'externals/nx_tzdb/tzdb_to_nx/externals/tz/tz' ) # Dynarmic is not intended to be generic, it is tweaked to fit emulated processor # TODO wait 'xbyak' waiting version bump. see #860816 @@ -33,11 +33,16 @@ RDEPEND=" sys-libs/zlib virtual/libusb:1 cubeb? ( media-libs/cubeb ) + dev-util/spirv-headers 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 + >=dev-qt/qtdbus-5.15:5 + >=dev-qt/qtconcurrent-5.15:5 + >=dev-qt/linguist-tools-5.15:5 + webengine? ( >=dev-qt/qtwebengine-5.15:5 ) ) sdl? ( >=media-libs/libsdl2-2.0.18 @@ -47,7 +52,7 @@ DEPEND="${RDEPEND} dev-cpp/cpp-httplib dev-cpp/cpp-jwt system-vulkan? ( >=dev-util/vulkan-headers-1.3.246 ) - test? ( dev-cpp/catch-3:0 ) " BDEPEND=" >=dev-cpp/nlohmann_json-3.8.0
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: 9443686b4a91ed06071e272c0a46043daa28e3c5 Author: YiFei Zhu gmail com> AuthorDate: Thu Jun 15 13:02:02 2023 + Commit: YiFei Zhu gmail com> CommitDate: Thu Jun 15 13:03:14 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9443686b games-emulation/yuzu: Bump vulkan to 1.3.246 Upstream bumped the requirements [1] in cmake. Reported on IRC. [1] https://github.com/yuzu-emu/yuzu-mainline/blob/8949287a0559bdf497056d119a446f3f67a4cb6c/CMakeLists.txt#L286 Signed-off-by: YiFei Zhu gmail.com> games-emulation/yuzu/yuzu-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index 77ba325b2..328d46033 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -46,7 +46,7 @@ RDEPEND=" DEPEND="${RDEPEND} dev-cpp/cpp-httplib dev-cpp/cpp-jwt - system-vulkan? ( >=dev-util/vulkan-headers-1.3.236 ) + system-vulkan? ( >=dev-util/vulkan-headers-1.3.246 ) test? (
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: 20d7e9d674763c44e2dd3eeced64a0fa39229221 Author: Samuel Bauer yahoo fr> AuthorDate: Tue Feb 14 11:31:05 2023 + Commit: Samuel Bauer yahoo fr> CommitDate: Tue Feb 14 11:31:05 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=20d7e9d6 games-emulation/yuzu: patch only when old glslang Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-.ebuild | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index 424b891a1..77ba325b2 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -132,12 +132,14 @@ src_prepare() { # LZ4 temporary fix: https://github.com/yuzu-emu/yuzu/pull/9054/commits/a8021f5a18bc5251aef54468fa6033366c6b92d9 sed -i 's/lz4::lz4/lz4/' src/common/CMakeLists.txt || die - # Temporary use lastest gentoo vulkan - sed -i -e '/Vulkan/s/238/236/' CMakeLists.txt || die - sed -i -e '/VK_ERROR_IMAGE_USAGE_NOT_SUPPORTED_KHR/d;' -e '/VK_ERROR_VIDEO_PICTURE_LAYOUT_NOT_SUPPORTED_KHR/d' \ - -e '/VK_ERROR_VIDEO_PROFILE_OPERATION_NOT_SUPPORTED_KHR/d' -e '/VK_ERROR_VIDEO_PROFILE_FORMAT_NOT_SUPPORTED_KHR/d' \ - -e '/VK_ERROR_VIDEO_PROFILE_CODEC_NOT_SUPPORTED_KHR/d' -e '/VK_ERROR_VIDEO_STD_VERSION_NOT_SUPPORTED_KHR/d' \ - src/video_core/vulkan_common/vulkan_wrapper.cpp + # Allow compiling using older glslang + if has_version '
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: c7f8ceb9ce51dd6b26182ec1c01f93e269fc3762 Author: Samuel Bauer yahoo fr> AuthorDate: Tue Feb 14 11:10:56 2023 + Commit: Samuel Bauer yahoo fr> CommitDate: Tue Feb 14 11:10:56 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c7f8ceb9 games-emulation/yuzu: libfmt and cpp-httplib need to be detected by cmake Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/metadata.xml | 27 +++ games-emulation/yuzu/yuzu-.ebuild | 4 +--- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/games-emulation/yuzu/metadata.xml b/games-emulation/yuzu/metadata.xml index d012102f5..1fbef0446 100644 --- a/games-emulation/yuzu/metadata.xml +++ b/games-emulation/yuzu/metadata.xml @@ -1,16 +1,19 @@ http://www.gentoo.org/dtd/metadata.dtd;> - - Samuel Bauer - samuel.ba...@yahoo.fr - - - Enables the cubeb audio backend - Downloads the latest compatibility list - Enables Discord Rich Presence - Use system dev-util/vulkan-headers - Use QtWebEngine for web applet implementation - Enable web services (telemetry, etc.) - + + Samuel Bauer + samuel.ba...@yahoo.fr + + + Enables the cubeb audio backend + Downloads the latest compatibility list + Enables Discord Rich Presence + Use system dev-util/vulkan-headers + Use QtWebEngine for web applet implementation + Enable web services (telemetry, etc.) + + + herumi/xbyak + diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index 6bc23133b..424b891a1 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -55,7 +55,7 @@ BDEPEND=" dev-util/glslang discord? ( >=dev-libs/rapidjson-1.1.0 ) " -REQUIRED_USE="|| ( qt5 sdl )" +REQUIRED_USE="|| ( qt5 sdl ) discord? ( webservice )" RESTRICT="!test? ( test )" pkg_setup() { @@ -132,8 +132,6 @@ src_prepare() { # LZ4 temporary fix: https://github.com/yuzu-emu/yuzu/pull/9054/commits/a8021f5a18bc5251aef54468fa6033366c6b92d9 sed -i 's/lz4::lz4/lz4/' src/common/CMakeLists.txt || die - sed -i '/fmt.*REQUIRED/d' CMakeLists.txt || die # libfmt >= 9 - # Temporary use lastest gentoo vulkan sed -i -e '/Vulkan/s/238/236/' CMakeLists.txt || die sed -i -e '/VK_ERROR_IMAGE_USAGE_NOT_SUPPORTED_KHR/d;' -e '/VK_ERROR_VIDEO_PICTURE_LAYOUT_NOT_SUPPORTED_KHR/d' \
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: a6665eb35415e5930fe579a6ee0735312c7f920a Author: Andrew Ammerlaan gentoo org> AuthorDate: Mon Feb 13 11:19:17 2023 + Commit: Andrew Ammerlaan gentoo org> CommitDate: Mon Feb 13 11:19:17 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a6665eb3 games-emulation/yuzu: update Manifest Signed-off-by: Andrew Ammerlaan gentoo.org> games-emulation/yuzu/Manifest | 5 - 1 file changed, 5 deletions(-) diff --git a/games-emulation/yuzu/Manifest b/games-emulation/yuzu/Manifest index 12a1ec9b7..bbe3bf3bd 100644 --- a/games-emulation/yuzu/Manifest +++ b/games-emulation/yuzu/Manifest @@ -1,11 +1,6 @@ -DIST yuzu-0_p20220725-compatibility_list.json 1255189 BLAKE2B e2f39f6703bfd49e918d62bcc05d03ae19e3c9be45ade4b266bf9ba8956fd3e8ef246db4804e72d4eb4782f0008ac63d118217e3ef95bbe4c148008c4b764407 SHA512 ba3b149c91d11be2f1033214f03a09e5a3b5cfd559acba40a78f3b3932a93675ff6751eb2701326adc15b90cb2508c03698c3a531fe1cb4ed445a5b189424410 -DIST yuzu-0_p20220725.tar.gz 4929471 BLAKE2B 0d7f633936ef571da02562a853576ad1acd5dcae9035e2539ea94269d3c266cc9ba60ad8c8b9cd1f15413de3ab2bbb9b9cb8fa0fb6d6d20561a4f42d89c99662 SHA512 8f2ab5dd406cdb26821ad621cb816f22866a83d92969fea6b90c77c8cb9e1d39e4179c1e3c5aa4be56ed8f1707c801071dd90807f6011bc8a631f62b22930d2e DIST yuzu-0_p20230202-compatibility_list.json 1701739 BLAKE2B 204502a6c8e2838b126c857d7b39cbcfe25a577515f2272d80185a9543e95c324e069d3f3de41564ca24aab5988d38725423691b3a3e6415ea87fd6772c30f1d SHA512 6f380cc5736c7cf3001b4485095dd00d2ad8d5d3459dea0aed006c3361731823a181adf94edd612ffdc8a6fb0c697f7f70cfb1402953c95a9fdd0faaae42 DIST yuzu-0_p20230202.tar.gz 5535753 BLAKE2B f9dbc43523a5745c3f73d18dc4f8b31811bb80fdc3ac362e584197e01db103324aa568143389cdba1d42d9639af88b49e24312f1ead085a6727afa6d470ca5b5 SHA512 faf597e0ed5837d3b358dfbb7d4cd8e535b4dc49be8781e556fc0b3677e48892c9c71c346bda49c5f6ac081502431480126c11b28a343bc5050341b8a384a7a2 -DIST yuzu-discord-0_p20220725.tar.gz 2108078 BLAKE2B e89ee4a196167cabaecfab82d191516eb0cf0fa89e35f95b6d118d5baad25f5d13d9002a8dcfe4aba099af7b9c1eb72835eb3baa9e4deaedd2754e99687b5967 SHA512 06205287addabfb343ccd9af997b693ed221fe564355d3629d4dee6c003e768b3f65f2b34eb04ef29807a15c5fa34b04c664212b7e0d15b09ad9a4e4be10a560 DIST yuzu-discord-0_p20230202.tar.gz 2106929 BLAKE2B 6e40c938cca5ef3feb8dc65265ef1a4cd3db58c0bbea2fb3d3a4e70748c451ead54932857d761b942a7018dcf461e43bc10ee5eab7907730319675b49564260a SHA512 323b6c8828a2e18f7986aa968ab2ce7ed876196c726d5114a07a536091090f4bd6d4080d87e7fdc4f96dff55871002d8a9a7daa50febd49b75d066e9e363c7ce -DIST yuzu-dynarmic-0_p20220725.tar.gz 2668960 BLAKE2B 5089f2d536664f5b38ee54eb17c37721a8dc8ffb80712f69461a94ddfd3cb2cd1a26df84720d2574b0156571ec6a9daf3861092de0669e195d6e49283c24fc11 SHA512 1915b0c8d06cf25f074b457e6e6a6944a01f4e3273e8979e71649d7b273484cff344c87a9da7115862a7c8c1f75c8b2ff5110e3079935d1212173fdc00a71a77 DIST yuzu-dynarmic-0_p20230202.tar.gz 3582382 BLAKE2B 46df3546287e6b591e346009ab86c4db80ab19fd0493d057145c20a26c61c8ff85147acc4aac0de36386a18a003d291e4c8ab9a3b2664fe2f9537de74f8fa2ed SHA512 13b2da826bb1de5e610d92979af466bd404bee447f0200277e976797b31ed6844d20541c980ed3a7e5a9aef6fac2a5bc9cb94b37dcc46272c7b51bcb878c3fc6 DIST yuzu-sirit-0_p20230202.tar.gz 23853 BLAKE2B 4c4e69203a75cf849497e540bb0dcea694a72b4230f205b769447d3d11f7c0fb089ca262009396b9af55503d45b128edb1e99e438b89ab21ac842f789c5109a3 SHA512 43204596db5c6295cc8bdf9355fd71433fa5d1e28d9d8c01f12082d2cd8fb6f78e20d97b396e7bdf202afae2361386f1861a1012d2947569dcbb114996fc6b1d -DIST yuzu-xbyak-0_p20220725.tar.gz 227168 BLAKE2B 6d03000be6a37704b86948ac58b9f2fd3809a892e59018be7e109eb6ce866727e83cb775307ae049b9aa5048028b3390e14b131f6cbda10e346be2acd866a20b SHA512 792146aefc2e3af9f412db383b4fcbd5e945f9814bde25cc18ea76a6f276c3bd6c38edb581074a2b48d11176a398cc6873556b5e2986449fe0417b7e46c09d95 DIST yuzu-xbyak-0_p20230202.tar.gz 249481 BLAKE2B 94eb81637f410ea88781cb3da94dfce4e4a6104458b0774d36c98f6cd2114f55772182f4535e502a5efa06290677fc67d0bac9db4effb7fa44a79561b16c1738 SHA512 87f6ba92a484738b3a75a4d2c5c7e3f4f9ca65cdc02f71b761dba72c8320a011dd38ea5350516d980b8370211977816de4c3357fc5ae8c9f0a86b4a595768c5e
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: 60c62f5f89fb61a850f62734a233746b77c613dc Author: Samuel Bauer yahoo fr> AuthorDate: Mon Feb 13 00:09:27 2023 + Commit: Samuel Bauer yahoo fr> CommitDate: Mon Feb 13 00:09:44 2023 + 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 yahoo.fr> games-emulation/yuzu/yuzu-0_p20220725.ebuild | 118 --- games-emulation/yuzu/yuzu-0_p20230202.ebuild | 21 +++-- games-emulation/yuzu/yuzu-.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..0 --- 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=" - =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) -
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: 79c0ac32ebb72516c8a7ecc484fc4d2eed287c77 Author: Samuel Bauer yahoo fr> AuthorDate: Sun Feb 5 18:26:19 2023 + Commit: Samuel Bauer yahoo fr> CommitDate: Sun Feb 5 18:26:19 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=79c0ac32 games-emulation/yuzu: add dependency to media-lib/vulkan-loader Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-0_p20230202.ebuild | 1 + games-emulation/yuzu/yuzu-.ebuild| 1 + 2 files changed, 2 insertions(+) diff --git a/games-emulation/yuzu/yuzu-0_p20230202.ebuild b/games-emulation/yuzu/yuzu-0_p20230202.ebuild index bb7832815..ef683cc24 100644 --- a/games-emulation/yuzu/yuzu-0_p20230202.ebuild +++ b/games-emulation/yuzu/yuzu-0_p20230202.ebuild @@ -33,6 +33,7 @@ RDEPEND=" app-arch/lz4:= dev-libs/boost:=[context] media-libs/opus + media-libs/vulkan-loader sys-libs/zlib virtual/libusb:1 cubeb? ( media-libs/cubeb ) diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index 324a241e9..b44eff45d 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -28,6 +28,7 @@ RDEPEND=" >=net-libs/enet-1.3 app-arch/lz4:= dev-libs/boost:=[context] + media-libs/vulkan-loader media-libs/opus sys-libs/zlib virtual/libusb:1
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: 7629b52ff7c4fe7a58baedbcf64326cae9904ffb Author: Samuel Bauer yahoo fr> AuthorDate: Sun Feb 5 18:14:57 2023 + Commit: Samuel Bauer yahoo fr> CommitDate: Sun Feb 5 18:14:57 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7629b52f games-emulation/yuzu: make dependency to inih mandatory Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-0_p20230202.ebuild | 2 +- games-emulation/yuzu/yuzu-.ebuild| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/games-emulation/yuzu/yuzu-0_p20230202.ebuild b/games-emulation/yuzu/yuzu-0_p20230202.ebuild index 3dc94d471..bb7832815 100644 --- a/games-emulation/yuzu/yuzu-0_p20230202.ebuild +++ b/games-emulation/yuzu/yuzu-0_p20230202.ebuild @@ -25,6 +25,7 @@ IUSE="+compatibility-list +cubeb discord +qt5 sdl +system-vulkan webengine webse RDEPEND=" =app-arch/zstd-1.5 + >=dev-libs/inih-52 >=dev-libs/libfmt-9:= >=dev-libs/openssl-1.1:= >=media-video/ffmpeg-4.3:= @@ -43,7 +44,6 @@ RDEPEND=" ) sdl? ( >=media-libs/libsdl2-2.0.18 - >=dev-libs/inih-52 ) " DEPEND="${RDEPEND} diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index 4d7d1e510..324a241e9 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -21,6 +21,7 @@ IUSE="+compatibility-list +cubeb discord +qt5 sdl +system-vulkan test webengine RDEPEND=" =app-arch/zstd-1.5 + >=dev-libs/inih-52 >=dev-libs/libfmt-9:= >=dev-libs/openssl-1.1:= >=media-video/ffmpeg-4.3:= @@ -39,7 +40,6 @@ RDEPEND=" ) sdl? ( >=media-libs/libsdl2-2.0.18 - >=dev-libs/inih-52 ) " DEPEND="${RDEPEND}
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: 87e7d48f842396dc937216b39ebf81ee852aec5a Author: Artemis Everfree artemis sh> AuthorDate: Thu Feb 2 20:01:36 2023 + Commit: Artemis Everfree artemis sh> CommitDate: Thu Feb 2 20:01:36 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=87e7d48f games-emulation/yuzu: update Manifest Signed-off-by: Artemis Everfree artemis.sh> games-emulation/yuzu/Manifest | 6 ++ 1 file changed, 6 insertions(+) diff --git a/games-emulation/yuzu/Manifest b/games-emulation/yuzu/Manifest index d48c4e7d7..12a1ec9b7 100644 --- a/games-emulation/yuzu/Manifest +++ b/games-emulation/yuzu/Manifest @@ -1,5 +1,11 @@ DIST yuzu-0_p20220725-compatibility_list.json 1255189 BLAKE2B e2f39f6703bfd49e918d62bcc05d03ae19e3c9be45ade4b266bf9ba8956fd3e8ef246db4804e72d4eb4782f0008ac63d118217e3ef95bbe4c148008c4b764407 SHA512 ba3b149c91d11be2f1033214f03a09e5a3b5cfd559acba40a78f3b3932a93675ff6751eb2701326adc15b90cb2508c03698c3a531fe1cb4ed445a5b189424410 DIST yuzu-0_p20220725.tar.gz 4929471 BLAKE2B 0d7f633936ef571da02562a853576ad1acd5dcae9035e2539ea94269d3c266cc9ba60ad8c8b9cd1f15413de3ab2bbb9b9cb8fa0fb6d6d20561a4f42d89c99662 SHA512 8f2ab5dd406cdb26821ad621cb816f22866a83d92969fea6b90c77c8cb9e1d39e4179c1e3c5aa4be56ed8f1707c801071dd90807f6011bc8a631f62b22930d2e +DIST yuzu-0_p20230202-compatibility_list.json 1701739 BLAKE2B 204502a6c8e2838b126c857d7b39cbcfe25a577515f2272d80185a9543e95c324e069d3f3de41564ca24aab5988d38725423691b3a3e6415ea87fd6772c30f1d SHA512 6f380cc5736c7cf3001b4485095dd00d2ad8d5d3459dea0aed006c3361731823a181adf94edd612ffdc8a6fb0c697f7f70cfb1402953c95a9fdd0faaae42 +DIST yuzu-0_p20230202.tar.gz 5535753 BLAKE2B f9dbc43523a5745c3f73d18dc4f8b31811bb80fdc3ac362e584197e01db103324aa568143389cdba1d42d9639af88b49e24312f1ead085a6727afa6d470ca5b5 SHA512 faf597e0ed5837d3b358dfbb7d4cd8e535b4dc49be8781e556fc0b3677e48892c9c71c346bda49c5f6ac081502431480126c11b28a343bc5050341b8a384a7a2 DIST yuzu-discord-0_p20220725.tar.gz 2108078 BLAKE2B e89ee4a196167cabaecfab82d191516eb0cf0fa89e35f95b6d118d5baad25f5d13d9002a8dcfe4aba099af7b9c1eb72835eb3baa9e4deaedd2754e99687b5967 SHA512 06205287addabfb343ccd9af997b693ed221fe564355d3629d4dee6c003e768b3f65f2b34eb04ef29807a15c5fa34b04c664212b7e0d15b09ad9a4e4be10a560 +DIST yuzu-discord-0_p20230202.tar.gz 2106929 BLAKE2B 6e40c938cca5ef3feb8dc65265ef1a4cd3db58c0bbea2fb3d3a4e70748c451ead54932857d761b942a7018dcf461e43bc10ee5eab7907730319675b49564260a SHA512 323b6c8828a2e18f7986aa968ab2ce7ed876196c726d5114a07a536091090f4bd6d4080d87e7fdc4f96dff55871002d8a9a7daa50febd49b75d066e9e363c7ce DIST yuzu-dynarmic-0_p20220725.tar.gz 2668960 BLAKE2B 5089f2d536664f5b38ee54eb17c37721a8dc8ffb80712f69461a94ddfd3cb2cd1a26df84720d2574b0156571ec6a9daf3861092de0669e195d6e49283c24fc11 SHA512 1915b0c8d06cf25f074b457e6e6a6944a01f4e3273e8979e71649d7b273484cff344c87a9da7115862a7c8c1f75c8b2ff5110e3079935d1212173fdc00a71a77 +DIST yuzu-dynarmic-0_p20230202.tar.gz 3582382 BLAKE2B 46df3546287e6b591e346009ab86c4db80ab19fd0493d057145c20a26c61c8ff85147acc4aac0de36386a18a003d291e4c8ab9a3b2664fe2f9537de74f8fa2ed SHA512 13b2da826bb1de5e610d92979af466bd404bee447f0200277e976797b31ed6844d20541c980ed3a7e5a9aef6fac2a5bc9cb94b37dcc46272c7b51bcb878c3fc6 +DIST yuzu-sirit-0_p20230202.tar.gz 23853 BLAKE2B 4c4e69203a75cf849497e540bb0dcea694a72b4230f205b769447d3d11f7c0fb089ca262009396b9af55503d45b128edb1e99e438b89ab21ac842f789c5109a3 SHA512 43204596db5c6295cc8bdf9355fd71433fa5d1e28d9d8c01f12082d2cd8fb6f78e20d97b396e7bdf202afae2361386f1861a1012d2947569dcbb114996fc6b1d DIST yuzu-xbyak-0_p20220725.tar.gz 227168 BLAKE2B 6d03000be6a37704b86948ac58b9f2fd3809a892e59018be7e109eb6ce866727e83cb775307ae049b9aa5048028b3390e14b131f6cbda10e346be2acd866a20b SHA512 792146aefc2e3af9f412db383b4fcbd5e945f9814bde25cc18ea76a6f276c3bd6c38edb581074a2b48d11176a398cc6873556b5e2986449fe0417b7e46c09d95 +DIST yuzu-xbyak-0_p20230202.tar.gz 249481 BLAKE2B 94eb81637f410ea88781cb3da94dfce4e4a6104458b0774d36c98f6cd2114f55772182f4535e502a5efa06290677fc67d0bac9db4effb7fa44a79561b16c1738 SHA512 87f6ba92a484738b3a75a4d2c5c7e3f4f9ca65cdc02f71b761dba72c8320a011dd38ea5350516d980b8370211977816de4c3357fc5ae8c9f0a86b4a595768c5e
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/files/, games-emulation/yuzu/
commit: bef015d946b03ba7fe5cabeeed1d0cec6017b9fe Author: Samuel Bauer yahoo fr> AuthorDate: Thu Feb 2 18:46:57 2023 + Commit: Samuel Bauer yahoo fr> CommitDate: Thu Feb 2 18:46:57 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bef015d9 games-emulation/yuzu: update snapshot Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/files/yuzu-0_p20230202.patch | 169 ++ games-emulation/yuzu/yuzu-0_p20230202.ebuild | 124 2 files changed, 293 insertions(+) diff --git a/games-emulation/yuzu/files/yuzu-0_p20230202.patch b/games-emulation/yuzu/files/yuzu-0_p20230202.patch new file mode 100644 index 0..df8a04d95 --- /dev/null +++ b/games-emulation/yuzu/files/yuzu-0_p20230202.patch @@ -0,0 +1,169 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8896fe0..f2a09e2 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -216,7 +215,7 @@ find_package(ZLIB 1.2 REQUIRED) + find_package(zstd 1.5 REQUIRED) + + if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS) +-find_package(Vulkan 1.3.238 REQUIRED) ++find_package(Vulkan 1.3.236 REQUIRED) + endif() + + if (ENABLE_LIBUSB) +diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt +index 8532fd7..67bed9a 100644 +--- a/externals/CMakeLists.txt b/externals/CMakeLists.txt +@@ -29,13 +29,7 @@ endif() + add_subdirectory(glad) + + # inih +-if (NOT TARGET inih::INIReader) +-add_subdirectory(inih) +-endif() + +-# mbedtls +-add_subdirectory(mbedtls EXCLUDE_FROM_ALL) +-target_include_directories(mbedtls PUBLIC ./mbedtls/include) + + # MicroProfile + add_library(microprofile INTERFACE) +@@ -77,18 +71,8 @@ if (YUZU_USE_EXTERNAL_SDL2) + endif() + + # ENet +-if (NOT TARGET enet::enet) +-add_subdirectory(enet EXCLUDE_FROM_ALL) +-target_include_directories(enet INTERFACE ./enet/include) +-add_library(enet::enet ALIAS enet) +-endif() + + # Cubeb +-if (ENABLE_CUBEB AND NOT TARGET cubeb::cubeb) +-set(BUILD_TESTS OFF) +-add_subdirectory(cubeb EXCLUDE_FROM_ALL) +-add_library(cubeb::cubeb ALIAS cubeb) +-endif() + + # DiscordRPC + if (USE_DISCORD_PRESENCE AND NOT TARGET DiscordRPC::discord-rpc) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index c7283e8..123a745 100644 +--- a/src/CMakeLists.txt b/src/CMakeLists.txt +@@ -101,11 +101,6 @@ if (MSVC) + set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/DEBUG /MANIFEST:NO /INCREMENTAL:NO /OPT:REF,ICF" CACHE STRING "" FORCE) + else() + add_compile_options( +--Werror=all +--Werror=extra +--Werror=missing-declarations +--Werror=shadow +--Werror=unused + + -Wno-attributes + -Wno-invalid-offsetof +diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt +index 9884a4a..46df96b 100644 +--- a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt +@@ -177,7 +177,7 @@ endif() + create_target_directory_groups(common) + + target_link_libraries(common PUBLIC ${Boost_LIBRARIES} fmt::fmt microprofile Threads::Threads) +-target_link_libraries(common PRIVATE lz4::lz4 zstd::zstd LLVM::Demangle) ++target_link_libraries(common PRIVATE lz4 zstd::zstd LLVM::Demangle) + + if (YUZU_USE_PRECOMPILED_HEADERS) + target_precompile_headers(common PRIVATE precompiled_headers.h) +diff --git a/src/common/scm_rev.cpp.in b/src/common/scm_rev.cpp.in +index f0c124d..739c4a6 100644 +--- a/src/common/scm_rev.cpp.in b/src/common/scm_rev.cpp.in +@@ -3,9 +3,9 @@ + + #include "common/scm_rev.h" + +-#define GIT_REV "@GIT_REV@" +-#define GIT_BRANCH "@GIT_BRANCH@" +-#define GIT_DESC "@GIT_DESC@" ++#define GIT_REV "d5f6201" ++#define GIT_BRANCH "master" ++#define GIT_DESC "d5f6201" + #define BUILD_NAME "@REPO_NAME@" + #define BUILD_DATE "@BUILD_DATE@" + #define BUILD_FULLNAME "@BUILD_FULLNAME@" +diff --git a/src/dedicated_room/CMakeLists.txt b/src/dedicated_room/CMakeLists.txt +index 136109a..6a6924c 100644 +--- a/src/dedicated_room/CMakeLists.txt b/src/dedicated_room/CMakeLists.txt +@@ -15,7 +15,7 @@ if (ENABLE_WEB_SERVICE) + target_link_libraries(yuzu-room PRIVATE web_service) + endif() + +-target_link_libraries(yuzu-room PRIVATE mbedtls mbedcrypto) ++target_link_libraries(yuzu-room PRIVATE mbedtls mbedcrypto mbedx509 mbedcrypto) + if (MSVC) + target_link_libraries(yuzu-room PRIVATE getopt) + endif() +diff --git a/src/network/network.cpp b/src/network/network.cpp +index 6652a18..8513d52 100644 +--- a/src/network/network.cpp b/src/network/network.cpp +@@ -3,7 +3,7 @@ + + #include "common/assert.h" + #include "common/logging/log.h" +-#include "enet/enet.h" ++#include + #include "network/network.h" + + namespace Network { +diff --git a/src/video_core/vulkan_common/vulkan_wrapper.cpp b/src/video_core/vulkan_common/vulkan_wrapper.cpp +index 486d4df..abad557 100644 +--- a/src/video_core/vulkan_common/vulkan_wrapper.cpp b/src/video_core/vulkan_common/vulkan_wrapper.cpp +@@ -337,18 +337,6 @@
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: d029a76c4c1534e19b7f4b6ceb4d55823328a61b Author: Samuel Bauer yahoo fr> AuthorDate: Thu Feb 2 15:13:45 2023 + Commit: Samuel Bauer yahoo fr> CommitDate: Thu Feb 2 15:13:45 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d029a76c games-emulation/yuzu-: allow to use current system vulkan headers Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-.ebuild | 26 +++--- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index 3e128ae0b..4d7d1e510 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -21,7 +21,7 @@ IUSE="+compatibility-list +cubeb discord +qt5 sdl +system-vulkan test webengine RDEPEND=" =app-arch/zstd-1.5 - >=dev-libs/libfmt-8:= + >=dev-libs/libfmt-9:= >=dev-libs/openssl-1.1:= >=media-video/ffmpeg-4.3:= >=net-libs/enet-1.3 @@ -45,7 +45,8 @@ RDEPEND=" DEPEND="${RDEPEND} dev-cpp/cpp-httplib dev-cpp/cpp-jwt - system-vulkan? ( >=dev-util/vulkan-headers-1.3.238 ) + system-vulkan? ( >=dev-util/vulkan-headers-1.3.236 ) + test? ( https://github.com/yuzu-emu/yuzu/pull/9054/commits/a8021f5a18bc5251aef54468fa6033366c6b92d9 sed -i 's/lz4::lz4/lz4/' src/common/CMakeLists.txt || die - # libfmt >= 9 - sed -i '/fmt.*REQUIRED/d' CMakeLists.txt || die + sed -i '/fmt.*REQUIRED/d' CMakeLists.txt || die # libfmt >= 9 + + # Temporary use lastest gentoo vulkan + sed -i -e '/Vulkan/s/238/236/' CMakeLists.txt || die + sed -i -e '/VK_ERROR_IMAGE_USAGE_NOT_SUPPORTED_KHR/d;' -e '/VK_ERROR_VIDEO_PICTURE_LAYOUT_NOT_SUPPORTED_KHR/d' \ + -e '/VK_ERROR_VIDEO_PROFILE_OPERATION_NOT_SUPPORTED_KHR/d' -e '/VK_ERROR_VIDEO_PROFILE_FORMAT_NOT_SUPPORTED_KHR/d' \ + -e '/VK_ERROR_VIDEO_PROFILE_CODEC_NOT_SUPPORTED_KHR/d' -e '/VK_ERROR_VIDEO_STD_VERSION_NOT_SUPPORTED_KHR/d' \ + src/video_core/vulkan_common/vulkan_wrapper.cpp + cmake_src_prepare } @@ -145,13 +147,15 @@ src_configure() { -DBUILD_SHARED_LIBS=OFF # dynarmic -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=$(usex compatibility-list) -DENABLE_CUBEB=$(usex cubeb) + -DENABLE_LIBUSB=ON -DENABLE_QT=$(usex qt5) -DENABLE_QT_TRANSLATION=$(usex qt5) -DENABLE_SDL2=$(usex sdl) -DENABLE_WEB_SERVICE=$(usex webservice) - -DSIRIT_USE_SYSTEM_SPIRV_HEADERS=ON + -DSIRIT_USE_SYSTEM_SPIRV_HEADERS=yes -DUSE_DISCORD_PRESENCE=$(usex discord) -DYUZU_TESTS=$(usex test) + -DYUZU_USE_EXTERNAL_VULKAN_HEADERS=$(use system-vulkan no yes) -DYUZU_USE_EXTERNAL_SDL2=OFF -DYUZU_USE_QT_WEB_ENGINE=$(usex webengine) )
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: ea42498ad5ddce06f61369e8fe443dd21a930a79 Author: Samuel Bauer yahoo fr> AuthorDate: Wed Dec 21 09:58:06 2022 + Commit: Samuel Bauer yahoo fr> CommitDate: Wed Dec 21 10:02:51 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ea42498a games-emulation/yuzu-: revert last commit Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index 56bd65947..6ab525990 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -98,7 +98,6 @@ src_prepare() { if use system-vulkan; then # Unbundle vulkan headers 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 || die - sed -i -e '/Vulkan/s/238/213/' CMakeLists.txt || die fi # Unbundle mbedtls
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: 6f036bf614113cef53b0eef4a97a65258e4c6591 Author: Samuel Bauer yahoo fr> AuthorDate: Wed Dec 21 09:59:59 2022 + Commit: Samuel Bauer yahoo fr> CommitDate: Wed Dec 21 10:02:51 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6f036bf6 games-emulation/yuzu-: system-vulkan: required vulkan-headers not yet available Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index 6ab525990..3e128ae0b 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -45,7 +45,7 @@ RDEPEND=" DEPEND="${RDEPEND} dev-cpp/cpp-httplib dev-cpp/cpp-jwt - system-vulkan? ( >=dev-util/vulkan-headers-1.3.216 ) + system-vulkan? ( >=dev-util/vulkan-headers-1.3.238 ) " BDEPEND=" >=dev-cpp/nlohmann_json-3.8.0
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: 908e23bb9c4dc80bf712b5be0afb02e53a5a3178 Author: Samuel Bauer yahoo fr> AuthorDate: Wed Dec 21 04:21:54 2022 + Commit: Samuel Bauer yahoo fr> CommitDate: Wed Dec 21 04:21:54 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=908e23bb games-emulation/yuzu-: unbundle vulkan: lower required version Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index 051b2b822..56bd65947 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -98,9 +98,10 @@ src_prepare() { if use system-vulkan; then # Unbundle vulkan headers 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 || die + sed -i -e '/Vulkan/s/238/213/' CMakeLists.txt || die fi - # Unbundle mbedtls: undefined reference to `mbedtls_cipher_cmac' + # Unbundle mbedtls sed -i -e '/mbedtls/d' externals/CMakeLists.txt || die sed -i -e 's/mbedtls/& mbedcrypto mbedx509/' \ src/dedicated_room/CMakeLists.txt \
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: c5fdfc1295e1db5b4957286a18fe9022c770d83e Author: Samuel Bauer yahoo fr> AuthorDate: Mon Dec 19 22:38:10 2022 + Commit: Samuel Bauer yahoo fr> CommitDate: Mon Dec 19 22:38:10 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c5fdfc12 games-emulation/yuzu-: rework unbundlings, re-bundle fmt and sirit Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-.ebuild | 22 +- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index 05423ff8b..051b2b822 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -8,7 +8,7 @@ inherit cmake git-r3 toolchain-funcs xdg DESCRIPTION="An emulator for Nintendo Switch" HOMEPAGE="https://yuzu-emu.org; EGIT_REPO_URI="https://github.com/yuzu-emu/yuzu-mainline; -EGIT_SUBMODULES=( '-*' 'dynarmic' 'xbyak' ) +EGIT_SUBMODULES=( '-*' 'dynarmic' 'sirit' 'xbyak' ) # Dynarmic is not intended to be generic, it is tweaked to fit emulated processor # TODO wait 'xbyak' waiting version bump. see #860816 @@ -27,7 +27,6 @@ RDEPEND=" >=net-libs/enet-1.3 app-arch/lz4:= dev-libs/boost:=[context] - dev-libs/sirit media-libs/opus sys-libs/zlib virtual/libusb:1 @@ -93,9 +92,8 @@ src_prepare() { rm .gitmodules || die # Unbundle inih - sed -i -e '/inih/d' externals/CMakeLists.txt || die - sed -i -e '1afind_package(PkgConfig REQUIRED)\npkg_check_modules(INIH REQUIRED INIReader)' \ - -e '/target_link_libraries/s/inih/${INIH_LIBRARIES}/' src/yuzu_cmd/CMakeLists.txt || die + 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 's:inih/cpp/::' src/yuzu_cmd/config.cpp || die if use system-vulkan; then # Unbundle vulkan headers @@ -115,7 +113,7 @@ src_prepare() { src/common/scm_rev.cpp.in || die if ! use discord; then - sed -i -e '/discord-rpc/d' externals/CMakeLists.txt || die + 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":' \ @@ -124,21 +122,20 @@ src_prepare() { # Unbundle cubeb use cubeb && sed -i '$afind_package(Threads REQUIRED)' CMakeLists.txt || die - sed -i '/cubeb/d' externals/CMakeLists.txt || die - - # Unbundle sirit - sed -i '/sirit/d' externals/CMakeLists.txt || die + sed -i '/^if.*cubeb/,/^endif()/d' externals/CMakeLists.txt || die # Unbundle cpp-httplib sed -i -e '/^ # httplib/,/^ endif()/d' externals/CMakeLists.txt || die # Unbundle enet - sed -i -e '/enet/d' externals/CMakeLists.txt || die + sed -i -e '/^if.*enet/,/^endif()/d' externals/CMakeLists.txt || die sed -i -e '/enet\/enet\.h/{s/"//}' src/network/network.cpp || die # LZ4 temporary fix: https://github.com/yuzu-emu/yuzu/pull/9054/commits/a8021f5a18bc5251aef54468fa6033366c6b92d9 sed -i 's/lz4::lz4/lz4/' src/common/CMakeLists.txt || die + # libfmt >= 9 + sed -i '/fmt.*REQUIRED/d' CMakeLists.txt || die cmake_src_prepare } @@ -146,16 +143,15 @@ 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) + -DSIRIT_USE_SYSTEM_SPIRV_HEADERS=ON -DUSE_DISCORD_PRESENCE=$(usex discord) -DYUZU_TESTS=$(usex test) - -DYUZU_USE_BUNDLED_OPUS=OFF -DYUZU_USE_EXTERNAL_SDL2=OFF -DYUZU_USE_QT_WEB_ENGINE=$(usex webengine) )
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: 87ef810d8b7b72b13004a291fb016fbfd701210a Author: Samuel Bauer yahoo fr> AuthorDate: Sun Nov 13 01:05:13 2022 + Commit: Samuel Bauer yahoo fr> CommitDate: Sun Nov 13 01:05:13 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=87ef810d games-emulation/yuzu-: suppress all Werror from extra project flags Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-.ebuild | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index 330329b0d..05423ff8b 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -83,8 +83,8 @@ src_unpack() { } src_prepare() { - # unused-result maybe temporary fix - sed -i -e '/Werror=unused-result/d' src/CMakeLists.txt || die + # temporary fix + sed -i -e '/Werror/d' src/CMakeLists.txt || die # headers is not a valid boost component sed -i -e '/find_package(Boost/{s/headers //;s/CONFIG //}' CMakeLists.txt || die @@ -98,9 +98,6 @@ src_prepare() { -e '/target_link_libraries/s/inih/${INIH_LIBRARIES}/' src/yuzu_cmd/CMakeLists.txt || die sed -i -e 's:inih/cpp/::' src/yuzu_cmd/config.cpp || die - # Unbundle xbyak ( uncomment when xbyak version is ok or never as it is only headers ) - # sed -i -e '/^# xbyak/,/^endif()/d' externals/CMakeLists.txt || die - if use system-vulkan; then # Unbundle vulkan headers 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 || die fi
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: da38365112232f79c1a79aa00c6bef9fb5936549 Author: Samuel Bauer yahoo fr> AuthorDate: Wed Oct 12 12:02:35 2022 + Commit: Samuel Bauer yahoo fr> CommitDate: Wed Oct 12 12:02:35 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=da383651 games-emulation/yuzu-: app-arch/lz4 detection Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index 7fdca80d6..330329b0d 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -107,7 +107,6 @@ src_prepare() { # Unbundle mbedtls: undefined reference to `mbedtls_cipher_cmac' sed -i -e '/mbedtls/d' externals/CMakeLists.txt || die - sed -i -e 's/mbedtls/& mbedcrypto mbedx509/' sed -i -e 's/mbedtls/& mbedcrypto mbedx509/' \ src/dedicated_room/CMakeLists.txt \ src/core/CMakeLists.txt || die @@ -140,6 +139,9 @@ src_prepare() { sed -i -e '/enet/d' externals/CMakeLists.txt || die sed -i -e '/enet\/enet\.h/{s/"//}' src/network/network.cpp || die + # LZ4 temporary fix: https://github.com/yuzu-emu/yuzu/pull/9054/commits/a8021f5a18bc5251aef54468fa6033366c6b92d9 + sed -i 's/lz4::lz4/lz4/' src/common/CMakeLists.txt || die + cmake_src_prepare }
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: 7073ef94dda7aa9f35922b54ba3e6f0a9f5739de Author: Andrew Ammerlaan gentoo org> AuthorDate: Thu Sep 8 10:13:37 2022 + Commit: Andrew Ammerlaan gentoo org> CommitDate: Thu Sep 8 10:13:37 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7073ef94 games-emulation/yuzu: quote S/FILESDIR variables Signed-off-by: Andrew Ammerlaan gentoo.org> games-emulation/yuzu/yuzu-0_p20220725.ebuild | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/games-emulation/yuzu/yuzu-0_p20220725.ebuild b/games-emulation/yuzu/yuzu-0_p20220725.ebuild index a307582e5..c1d3fd0d9 100644 --- a/games-emulation/yuzu/yuzu-0_p20220725.ebuild +++ b/games-emulation/yuzu/yuzu-0_p20220725.ebuild @@ -57,7 +57,7 @@ BDEPEND=" discord? ( >=dev-libs/rapidjson-1.1.0 ) " S="${WORKDIR}"/yuzu-mainline-dfaab8f6571856ec3c75cfad303a50503d213665 -PATCHES=( ${FILESDIR}/${P}.patch ) +PATCHES=( "${FILESDIR}/${P}.patch" ) REQUIRED_USE="|| ( qt5 sdl )" @@ -70,10 +70,10 @@ pkg_setup() { src_unpack() { default - mv "${WORKDIR}"/xbyak* ${S}/externals/xbyak/xbyak || die - mv "${WORKDIR}"/dynarmic*/* ${S}/externals/dynarmic || die + 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 + mv "${WORKDIR}"/discord*/* "${S}/externals/discord-rpc" || die fi }
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: 8d8a045581d950439a9ef6e4d30d4e8136c11b4e Author: Samuel Bauer yahoo fr> AuthorDate: Mon Aug 8 11:03:46 2022 + Commit: Samuel Bauer yahoo fr> CommitDate: Mon Aug 8 11:03:46 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8d8a0455 games-emulation/yuzu: depends on dev-qt/qtmultimedia Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-0_p20220725.ebuild | 1 + games-emulation/yuzu/yuzu-.ebuild| 1 + 2 files changed, 2 insertions(+) diff --git a/games-emulation/yuzu/yuzu-0_p20220725.ebuild b/games-emulation/yuzu/yuzu-0_p20220725.ebuild index 8bc53d5fc..a307582e5 100644 --- a/games-emulation/yuzu/yuzu-0_p20220725.ebuild +++ b/games-emulation/yuzu/yuzu-0_p20220725.ebuild @@ -38,6 +38,7 @@ RDEPEND=" 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? ( diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index 953cae7e0..0860eda94 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -35,6 +35,7 @@ RDEPEND=" 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? (
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: 275dd67cdd8b6b99ea8077cb067de9ce9e49a1f6 Author: Samuel Bauer yahoo fr> AuthorDate: Wed Oct 6 08:12:26 2021 + Commit: Samuel Bauer yahoo fr> CommitDate: Wed Oct 6 08:12:26 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=275dd67c games-emulation/yuzu: temporary disabling boxcat Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index f01ff4a76..6d0bd661d 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -123,7 +123,8 @@ src_configure() { -DENABLE_SDL2=$(usex sdl) -DENABLE_WEB_SERVICE=$(usex webservice) -DUSE_DISCORD_PRESENCE=$(usex discord) - -DYUZU_ENABLE_BOXCAT=$(usex boxcat) + # -DYUZU_ENABLE_BOXCAT=$(usex boxcat) # feature removed + # upstream is now fixing it, will be reintroduced -DYUZU_USE_EXTERNAL_SDL2=OFF -DYUZU_USE_QT_WEB_ENGINE=$(usex webengine) )
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: 7c654ca35959bc3ed0661c0a383162c899a1d171 Author: Samuel Bauer yahoo fr> AuthorDate: Fri Aug 20 22:20:44 2021 + Commit: Samuel Bauer yahoo fr> CommitDate: Fri Aug 20 22:20:44 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7c654ca3 games-emulation/yuzu: update sdl requirement Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-.ebuild | 8 +--- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index 8d51a6449..f01ff4a76 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -27,7 +27,7 @@ DEPEND=" >=dev-qt/qtwidgets-5.15 ) sdl? ( - >=media-libs/libsdl2-2.0.14 + >=media-libs/libsdl2-2.0.16 >=dev-libs/inih-52 ) system-vulkan? ( @@ -104,12 +104,6 @@ src_prepare() { # 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 - # Force disable bundled sdl2, use 2.0.14 in tree - if use sdl; then - sed -i '/find_package(SDL2/{s/2.0.15/2.0.14/;s/ QUIET//}' CMakeLists.txt || die - sed -i '/PS5_RUMBLE/d' src/input_common/sdl/sdl_impl.cpp - fi - # Workaround: GenerateSCMRev fails sed -i -e "s/@GIT_BRANCH@/${EGIT_BRANCH:-master}/" \ -e "s/@GIT_REV@/$(git rev-parse --short HEAD)/" \
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: 374d955d635128d4c29fd6b9cd3c58457d5483a5 Author: Samuel Bauer yahoo fr> AuthorDate: Wed Aug 4 00:35:44 2021 + Commit: Samuel Bauer yahoo fr> CommitDate: Wed Aug 4 00:35:44 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=374d955d games-emulation/yuzu: update metadata Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/games-emulation/yuzu/metadata.xml b/games-emulation/yuzu/metadata.xml index 948f2e846..b1edc6d5d 100644 --- a/games-emulation/yuzu/metadata.xml +++ b/games-emulation/yuzu/metadata.xml @@ -10,6 +10,7 @@ Enables the cubeb audio backend Downloads the latest compatibility list Enables Discord Rich Presence + Use system dev-util/vulkan-headers Use QtWebEngine for web applet implementation Enable web services (telemetry, etc.)
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: 4c7f4706fd69507963a706f5f15cf43d0f97e4de Author: Samuel Bauer yahoo fr> AuthorDate: Wed Aug 4 00:28:59 2021 + Commit: Samuel Bauer yahoo fr> CommitDate: Wed Aug 4 00:28:59 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4c7f4706 games-emulation/yuzu: now defaults to vulkan-headers 1.2.180 Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-.ebuild | 30 -- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index 9a6f4bd8f..8d51a6449 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -8,7 +8,7 @@ inherit cmake git-r3 flag-o-matic toolchain-funcs xdg DESCRIPTION="An emulator for Nintendo Switch" HOMEPAGE="https://yuzu-emu.org; EGIT_REPO_URI="https://github.com/yuzu-emu/yuzu; -EGIT_SUBMODULES=( '*' '-ffmpeg' '-inih' '-libressl' '-libusb' '-libzip' '-opus' '-SDL' '-Vulkan-Headers' ) +EGIT_SUBMODULES=( '*' '-ffmpeg' '-inih' '-libressl' '-libusb' '-libzip' '-opus' '-SDL' ) # TODO '-xbyak' wait for bump in tree # TODO cubeb auto-links to jack, pulse, alsa .., allow determining cubeb output # media-libs/cubeb would benefit to a lot of packages: dolphin-emu, firefox, citra, self, ... @@ -18,7 +18,7 @@ EGIT_SUBMODULES=( '*' '-ffmpeg' '-inih' '-libressl' '-libusb' '-libzip' '-opus' LICENSE="GPL-3" SLOT="0" KEYWORDS="" -IUSE="+boxcat +compatibility-list +cubeb discord +qt5 sdl webengine +webservice" +IUSE="+boxcat +compatibility-list +cubeb discord +qt5 sdl system-vulkan webengine +webservice" DEPEND=" discord? ( >=dev-libs/rapidjson-1.1.0 ) @@ -30,6 +30,9 @@ DEPEND=" >=media-libs/libsdl2-2.0.14 >=dev-libs/inih-52 ) + system-vulkan? ( + >=dev-util/vulkan-headers-1.2.180 + ) >=app-arch/lz4-1.8 >=app-arch/zstd-1.5 >=dev-cpp/catch-2.13:0 @@ -39,22 +42,27 @@ DEPEND=" >=dev-libs/libzip-1.5 >=media-libs/opus-1.3.1 >=sys-libs/zlib-1.2 - dev-util/vulkan-headers virtual/libusb:1 " -# >=dev-libs/xbyak-5.96 RDEPEND="${DEPEND}" REQUIRED_USE="boxcat? ( webservice ) || ( qt5 sdl )" PATCHES=( "${FILESDIR}"/${P}-assert.patch ) pkg_setup() { - if [ tc-is-gcc -a $(gcc-major-version) -lt 10 ]; then - die "You need gcc version 10 or clang to compile this package" + if [ tc-is-gcc ]; then + [ "$(gcc-major-version)" -lt 11 ] && \ + die "You need gcc version 11 or clang to compile this package" fi + grep -q 'ThreadEngineStarter' /usr/include/qt5/QtConcurrent/qtconcurrentthreadengine.h \ + || die "add user patch for dev-qt/qtconcurrent: https://github.com/qt/qtbase/commit/659f7a06e91c04b239e3f4c0bcfccbe3581af1c3.diff; } src_unpack() { + if use system-vulkan; then + EGIT_SUBMODULES+=('-Vulkan-Headers') + fi + git-r3_src_unpack # Do not fetch via sources because this file always changes @@ -88,9 +96,10 @@ src_prepare() { # Unbundle xbyak ( uncomment when xbyak version is ok or never as it is only headers ) # sed -i -e '/target_include_directories(xbyak/s:./xbyak/xbyak:/usr/include/xbyak/:' externals/CMakeLists.txt - # Unbundle vulkan headers - 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 || die - sed -i -e '/VK_ERROR_INCOMPATIBLE_VERSION_KHR/d' src/video_core/vulkan_common/vulkan_wrapper.cpp || die + if use system-vulkan; then # Unbundle vulkan headers + 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 || die + sed -i -e '/VK_ERROR_INCOMPATIBLE_VERSION_KHR/d' src/video_core/vulkan_common/vulkan_wrapper.cpp || die + fi # 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 @@ -120,10 +129,11 @@ src_configure() { -DENABLE_SDL2=$(usex sdl) -DENABLE_WEB_SERVICE=$(usex webservice) -DUSE_DISCORD_PRESENCE=$(usex discord) - -DYUZU_ALLOW_SYSTEM_SDL2=$(usex sdl) -DYUZU_ENABLE_BOXCAT=$(usex boxcat) + -DYUZU_USE_EXTERNAL_SDL2=OFF -DYUZU_USE_QT_WEB_ENGINE=$(usex webengine) ) + cmake_src_configure # This would be better in src_unpack but it would be unlinked
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: dd9e6a6548da4094798bf354d4d50900f5a7084e Author: Samuel Bauer yahoo fr> AuthorDate: Tue Jul 13 01:51:09 2021 + Commit: Samuel Bauer yahoo fr> CommitDate: Tue Jul 13 01:51:09 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=dd9e6a65 games-emulation/yuzu: GenerateSCMRev fails, fix titlebar Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-.ebuild | 6 ++ 1 file changed, 6 insertions(+) diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index fc3082cb2..9a6f4bd8f 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -101,6 +101,12 @@ src_prepare() { sed -i '/PS5_RUMBLE/d' src/input_common/sdl/sdl_impl.cpp fi + # Workaround: GenerateSCMRev fails + sed -i -e "s/@GIT_BRANCH@/${EGIT_BRANCH:-master}/" \ + -e "s/@GIT_REV@/$(git rev-parse --short HEAD)/" \ + -e "s/@GIT_DESC@/$(git describe --always --long)/" \ + src/common/scm_rev.cpp.in || die + cmake_src_prepare }
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: d7720f353aacf446dac6630f22a7aead7e5be8c1 Author: Samuel Bauer yahoo fr> AuthorDate: Sat Jun 26 01:15:34 2021 + Commit: Samuel Bauer yahoo fr> CommitDate: Sat Jun 26 01:15:34 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d7720f35 games-emulation/yuzu: require >=libfmt-8 Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index e7a2452f4..fc3082cb2 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -35,7 +35,7 @@ DEPEND=" >=dev-cpp/catch-2.13:0 >=dev-cpp/nlohmann_json-3.8.0 >=dev-libs/boost-1.73:=[context] - >=dev-libs/libfmt-7.1.0 + >=dev-libs/libfmt-8 >=dev-libs/libzip-1.5 >=media-libs/opus-1.3.1 >=sys-libs/zlib-1.2
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: c8f021cc410ddd56f1318191bb1e0f04e700b625 Author: Samuel Bauer yahoo fr> AuthorDate: Sat Jun 5 00:57:10 2021 + Commit: Samuel Bauer yahoo fr> CommitDate: Sat Jun 5 00:57:10 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c8f021cc games-emulation/yuzu: fix metadata.xml Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/metadata.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/games-emulation/yuzu/metadata.xml b/games-emulation/yuzu/metadata.xml index 3974ff3d6..948f2e846 100644 --- a/games-emulation/yuzu/metadata.xml +++ b/games-emulation/yuzu/metadata.xml @@ -2,8 +2,8 @@ http://www.gentoo.org/dtd/metadata.dtd;> - mazes-80 - mazes...@github.com + Samuel Bauer + samuel.ba...@yahoo.fr Enable the Boxcat service, a yuzu high-level implementation of BCAT
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: 643377b8784df7e5deec1ba73dd5297eebb3e952 Author: Samuel Bauer yahoo fr> AuthorDate: Sun May 30 19:20:45 2021 + Commit: Samuel Bauer yahoo fr> CommitDate: Sun May 30 19:20:45 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=643377b8 games-emulation/yuzu: compatibility list: add flag Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/metadata.xml | 5 +++-- games-emulation/yuzu/yuzu-.ebuild | 9 ++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/games-emulation/yuzu/metadata.xml b/games-emulation/yuzu/metadata.xml index ac55d48f0..3974ff3d6 100644 --- a/games-emulation/yuzu/metadata.xml +++ b/games-emulation/yuzu/metadata.xml @@ -2,12 +2,13 @@ http://www.gentoo.org/dtd/metadata.dtd;> - Samuel Bauer - samuel.ba...@yahoo.fr + mazes-80 + mazes...@github.com Enable the Boxcat service, a yuzu high-level implementation of BCAT Enables the cubeb audio backend + Downloads the latest compatibility list Enables Discord Rich Presence Use QtWebEngine for web applet implementation Enable web services (telemetry, etc.) diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index ce3240a30..e7a2452f4 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -18,7 +18,7 @@ EGIT_SUBMODULES=( '*' '-ffmpeg' '-inih' '-libressl' '-libusb' '-libzip' '-opus' LICENSE="GPL-3" SLOT="0" KEYWORDS="" -IUSE="+boxcat +cubeb discord +qt5 sdl webengine +webservice" +IUSE="+boxcat +compatibility-list +cubeb discord +qt5 sdl webengine +webservice" DEPEND=" discord? ( >=dev-libs/rapidjson-1.1.0 ) @@ -58,7 +58,7 @@ src_unpack() { git-r3_src_unpack # Do not fetch via sources because this file always changes - curl https://api.yuzu-emu.org/gamedb/ > "${S}"/compatibility_list.json + use compatibility-list && curl https://api.yuzu-emu.org/gamedb/ > "${S}"/compatibility_list.json } src_prepare() { @@ -107,6 +107,7 @@ src_prepare() { src_configure() { local -a mycmakeargs=( -DBUILD_SHARED_LIBS=OFF + -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=$(usex compatibility-list) -DENABLE_CUBEB=$(usex cubeb) -DENABLE_QT=$(usex qt5) -DENABLE_QT_TRANSLATION=$(usex qt5) @@ -120,5 +121,7 @@ src_configure() { cmake_src_configure # This would be better in src_unpack but it would be unlinked - mv "${S}"/compatibility_list.json "${BUILD_DIR}"/dist/compatibility_list/ || die + if use compatibility-list; then + mv "${S}"/compatibility_list.json "${BUILD_DIR}"/dist/compatibility_list/ || die + fi }
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: 89af8ce70562259d66541cf44d7c08c68ada3758 Author: Samuel Bauer yahoo fr> AuthorDate: Sun May 30 19:02:45 2021 + Commit: Samuel Bauer yahoo fr> CommitDate: Sun May 30 19:06:31 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=89af8ce7 games-emulation/yuzu: enable compatibility list support Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-.ebuild | 13 - 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index 2942877d6..ce3240a30 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -54,8 +54,12 @@ pkg_setup() { fi } -# May fetch this file from src_unpack to provide compatibility list support -# curl https://api.yuzu-emu.org/gamedb/ > "${S}"/compatibility_list.json +src_unpack() { + git-r3_src_unpack + + # Do not fetch via sources because this file always changes + curl https://api.yuzu-emu.org/gamedb/ > "${S}"/compatibility_list.json +} src_prepare() { # Set yuzu dev flags @@ -112,10 +116,9 @@ src_configure() { -DYUZU_ALLOW_SYSTEM_SDL2=$(usex sdl) -DYUZU_ENABLE_BOXCAT=$(usex boxcat) -DYUZU_USE_QT_WEB_ENGINE=$(usex webengine) - -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF ) cmake_src_configure - ## This would be better in src_unpack but it would be unlinked - #mv "${S}"/compatibility_list.json "${BUILD_DIR}"/dist/compatibility_list/ || die + # This would be better in src_unpack but it would be unlinked + mv "${S}"/compatibility_list.json "${BUILD_DIR}"/dist/compatibility_list/ || die }
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: a71725695bd9c12126c1397d4c884cab1d85cfac Author: Samuel Bauer yahoo fr> AuthorDate: Sun May 30 18:54:53 2021 + Commit: Samuel Bauer yahoo fr> CommitDate: Sun May 30 18:54:53 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a7172569 games-emulation/yuzu: requires >=app-arch/zstd-1.5.0 Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index 0f50d353d..2942877d6 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -31,7 +31,7 @@ DEPEND=" >=dev-libs/inih-52 ) >=app-arch/lz4-1.8 - >=app-arch/zstd-1.4 + >=app-arch/zstd-1.5 >=dev-cpp/catch-2.13:0 >=dev-cpp/nlohmann_json-3.8.0 >=dev-libs/boost-1.73:=[context]
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: 8e03ef5c5b5f2a883a339f754ee41dc7b2398d52 Author: Samuel Bauer yahoo fr> AuthorDate: Tue May 25 17:33:37 2021 + Commit: Samuel Bauer yahoo fr> CommitDate: Tue May 25 18:22:46 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8e03ef5c games-emulation/yuzu: sdl detection + cosmetic changes Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-.ebuild | 24 ++-- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index 7db25934a..0f50d353d 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2020-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -85,14 +85,17 @@ src_prepare() { # sed -i -e '/target_include_directories(xbyak/s:./xbyak/xbyak:/usr/include/xbyak/:' externals/CMakeLists.txt # Unbundle vulkan headers - 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 - sed -i -e '/VK_ERROR_INCOMPATIBLE_VERSION_KHR/d' src/video_core/vulkan_common/vulkan_wrapper.cpp + 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 || die + sed -i -e '/VK_ERROR_INCOMPATIBLE_VERSION_KHR/d' src/video_core/vulkan_common/vulkan_wrapper.cpp || die # 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 - # media-libs/libsdl2: use 2.0.14 in tree - sed -i 's/2.0.15/2.0.14/' CMakeLists.txt + # Force disable bundled sdl2, use 2.0.14 in tree + if use sdl; then + sed -i '/find_package(SDL2/{s/2.0.15/2.0.14/;s/ QUIET//}' CMakeLists.txt || die + sed -i '/PS5_RUMBLE/d' src/input_common/sdl/sdl_impl.cpp + fi cmake_src_prepare } @@ -100,14 +103,15 @@ src_prepare() { src_configure() { local -a mycmakeargs=( -DBUILD_SHARED_LIBS=OFF - -DENABLE_CUBEB=$(usex cubeb ON OFF) + -DENABLE_CUBEB=$(usex cubeb) -DENABLE_QT=$(usex qt5) -DENABLE_QT_TRANSLATION=$(usex qt5) -DENABLE_SDL2=$(usex sdl) - -DENABLE_WEB_SERVICE=$(usex webservice ON OFF) - -DUSE_DISCORD_PRESENCE=$(usex discord ON OFF) - -DYUZU_ENABLE_BOXCAT=$(usex boxcat ON OFF) - -DYUZU_USE_QT_WEB_ENGINE=$(usex webengine ON OFF) + -DENABLE_WEB_SERVICE=$(usex webservice) + -DUSE_DISCORD_PRESENCE=$(usex discord) + -DYUZU_ALLOW_SYSTEM_SDL2=$(usex sdl) + -DYUZU_ENABLE_BOXCAT=$(usex boxcat) + -DYUZU_USE_QT_WEB_ENGINE=$(usex webengine) -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF ) cmake_src_configure
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: 2876aacaba70425ab1b320620b3d4887ac712b58 Author: Samuel Bauer yahoo fr> AuthorDate: Sun May 16 13:47:00 2021 + Commit: Samuel Bauer yahoo fr> CommitDate: Sun May 16 13:47:00 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2876aaca games-emulation/yuzu: allow ~media-libs/libsdl2-2.0.14 Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-.ebuild | 3 +++ 1 file changed, 3 insertions(+) diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index 40befd426..7db25934a 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -91,6 +91,9 @@ src_prepare() { # 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 + # media-libs/libsdl2: use 2.0.14 in tree + sed -i 's/2.0.15/2.0.14/' CMakeLists.txt + cmake_src_prepare }
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/, games-emulation/mupen64plus-qt/, games-action/blackvoxel/, ...
commit: 0159b932482a7aa327e3f7f33612a6a454c0d8fd Author: Samuel Bauer yahoo fr> AuthorDate: Mon May 3 17:27:43 2021 + Commit: Samuel Bauer yahoo fr> CommitDate: Mon May 3 17:27:43 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0159b932 update maintainer data metadata.xml Signed-off-by: Samuel Bauer yahoo.fr> app-emulation/arnold/metadata.xml | 4 ++-- games-action/blackvoxel/metadata.xml| 4 ++-- games-emulation/mupen64plus-qt/metadata.xml | 4 ++-- games-emulation/yuzu/metadata.xml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app-emulation/arnold/metadata.xml b/app-emulation/arnold/metadata.xml index 257786bed..86a1bf921 100644 --- a/app-emulation/arnold/metadata.xml +++ b/app-emulation/arnold/metadata.xml @@ -2,8 +2,8 @@ http://www.gentoo.org/dtd/metadata.dtd;> - mazes-80 - mazes...@none.org + Samuel Bauer + samuel.ba...@yahoo.fr Use inkz80 processor emulation diff --git a/games-action/blackvoxel/metadata.xml b/games-action/blackvoxel/metadata.xml index e4022..c04f7b664 100644 --- a/games-action/blackvoxel/metadata.xml +++ b/games-action/blackvoxel/metadata.xml @@ -2,7 +2,7 @@ http://www.gentoo.org/dtd/metadata.dtd;> - mazes-80 - mazes...@none.org + Samuel Bauer + samuel.ba...@yahoo.fr diff --git a/games-emulation/mupen64plus-qt/metadata.xml b/games-emulation/mupen64plus-qt/metadata.xml index e4022..c04f7b664 100644 --- a/games-emulation/mupen64plus-qt/metadata.xml +++ b/games-emulation/mupen64plus-qt/metadata.xml @@ -2,7 +2,7 @@ http://www.gentoo.org/dtd/metadata.dtd;> - mazes-80 - mazes...@none.org + Samuel Bauer + samuel.ba...@yahoo.fr diff --git a/games-emulation/yuzu/metadata.xml b/games-emulation/yuzu/metadata.xml index de9ad3b9b..ac55d48f0 100644 --- a/games-emulation/yuzu/metadata.xml +++ b/games-emulation/yuzu/metadata.xml @@ -2,8 +2,8 @@ http://www.gentoo.org/dtd/metadata.dtd;> - mazes-80 - mazes...@github.com + Samuel Bauer + samuel.ba...@yahoo.fr Enable the Boxcat service, a yuzu high-level implementation of BCAT
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: 5b4ad18a24c2983b5d36dc534c5dcbfe008a6126 Author: Samuel Bauer yahoo fr> AuthorDate: Mon May 3 16:40:25 2021 + Commit: Samuel Bauer yahoo fr> CommitDate: Mon May 3 16:40:25 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5b4ad18a games-emulation/yuzu: fix cmake detection Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index ae1aac907..40befd426 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -64,7 +64,7 @@ src_prepare() { append-cxxflags '-O3 -DNDEBUG' # headers is not a valid boost component - sed -i -e '/find_package(Boost/s/headers //' CMakeLists.txt || die + sed -i -e '/find_package(Boost/{s/headers //;s/CONFIG //}' CMakeLists.txt || die # Allow skip submodule downloading rm .gitmodules
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: 5acf308c9431a30925d0381398391c0bb806d390 Author: Samuel Bauer yahoo fr> AuthorDate: Fri Apr 30 01:09:17 2021 + Commit: Samuel Bauer yahoo fr> CommitDate: Fri Apr 30 01:09:17 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5acf308c games-emulation/yuzu: unbundle vulkan-headers Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-.ebuild | 11 --- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index 93184..ae1aac907 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -2,23 +2,18 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -# PYTHON_COMPAT=( python2_7 ) -#inherit cmake git-r3 flag-o-matic python-any-r1 toolchain-funcs xdg inherit cmake git-r3 flag-o-matic toolchain-funcs xdg DESCRIPTION="An emulator for Nintendo Switch" HOMEPAGE="https://yuzu-emu.org; EGIT_REPO_URI="https://github.com/yuzu-emu/yuzu; -EGIT_SUBMODULES=( '*' '-ffmpeg' '-inih' '-libressl' '-libusb' '-libzip' '-opus' '-SDL' ) -# TODO '-Vulkan-Headers' need to fix API in code +EGIT_SUBMODULES=( '*' '-ffmpeg' '-inih' '-libressl' '-libusb' '-libzip' '-opus' '-SDL' '-Vulkan-Headers' ) # TODO '-xbyak' wait for bump in tree # TODO cubeb auto-links to jack, pulse, alsa .., allow determining cubeb output # media-libs/cubeb would benefit to a lot of packages: dolphin-emu, firefox, citra, self, ... # TODO many submodules produce static libraries which forces to unset BUILD_SHARED_LIBS # this may be better to generate shared libraries and install them under /usr/$(get_libdir)/yuzu -# TODO python2 code should be needed only for submodules test -# until verified keep track of python specific ebuild stuffs as comment LICENSE="GPL-3" SLOT="0" @@ -44,6 +39,7 @@ DEPEND=" >=dev-libs/libzip-1.5 >=media-libs/opus-1.3.1 >=sys-libs/zlib-1.2 + dev-util/vulkan-headers virtual/libusb:1 " # >=dev-libs/xbyak-5.96 @@ -89,7 +85,8 @@ src_prepare() { # sed -i -e '/target_include_directories(xbyak/s:./xbyak/xbyak:/usr/include/xbyak/:' externals/CMakeLists.txt # Unbundle vulkan headers - # 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 + 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 + sed -i -e '/VK_ERROR_INCOMPATIBLE_VERSION_KHR/d' src/video_core/vulkan_common/vulkan_wrapper.cpp # 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
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: 0bc42939052c20522a125c2af6f5821217d4a7a2 Author: Samuel Bauer yahoo fr> AuthorDate: Thu Apr 29 14:19:29 2021 + Commit: Samuel Bauer yahoo fr> CommitDate: Thu Apr 29 14:19:29 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0bc42939 games-emulation/yuzu: update sdl requirements Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index fe7ee3c0b..93184 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -10,7 +10,7 @@ inherit cmake git-r3 flag-o-matic toolchain-funcs xdg DESCRIPTION="An emulator for Nintendo Switch" HOMEPAGE="https://yuzu-emu.org; EGIT_REPO_URI="https://github.com/yuzu-emu/yuzu; -EGIT_SUBMODULES=( '*' '-ffmpeg' '-inih' '-libressl' '-libusb' '-libzip' '-opus' ) +EGIT_SUBMODULES=( '*' '-ffmpeg' '-inih' '-libressl' '-libusb' '-libzip' '-opus' '-SDL' ) # TODO '-Vulkan-Headers' need to fix API in code # TODO '-xbyak' wait for bump in tree # TODO cubeb auto-links to jack, pulse, alsa .., allow determining cubeb output @@ -32,7 +32,7 @@ DEPEND=" >=dev-qt/qtwidgets-5.15 ) sdl? ( - media-libs/libsdl2 + >=media-libs/libsdl2-2.0.14 >=dev-libs/inih-52 ) >=app-arch/lz4-1.8
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: 3ad9fe8f741b1fe67da5652a0b553e11044c2564 Author: Samuel Bauer yahoo fr> AuthorDate: Thu Apr 29 12:52:08 2021 + Commit: Samuel Bauer yahoo fr> CommitDate: Thu Apr 29 12:52:08 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3ad9fe8f games-emulation/yuzu: drop compatibility list support Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index 545451680..fe7ee3c0b 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -112,6 +112,6 @@ src_configure() { ) cmake_src_configure - # This would be better in src_unpack but it would be unlinked - mv "${S}"/compatibility_list.json "${BUILD_DIR}"/dist/compatibility_list/ || die + ## This would be better in src_unpack but it would be unlinked + #mv "${S}"/compatibility_list.json "${BUILD_DIR}"/dist/compatibility_list/ || die }
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: dfec75eac25fdaee909b372fd0d25292f8ab0afc Author: Samuel Bauer yahoo fr> AuthorDate: Wed Apr 28 23:33:54 2021 + Commit: Samuel Bauer yahoo fr> CommitDate: Wed Apr 28 23:33:54 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=dfec75ea games-emulation/yuzu: drop compatibility list support Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index ff94baa92..545451680 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -108,6 +108,7 @@ src_configure() { -DUSE_DISCORD_PRESENCE=$(usex discord ON OFF) -DYUZU_ENABLE_BOXCAT=$(usex boxcat ON OFF) -DYUZU_USE_QT_WEB_ENGINE=$(usex webengine ON OFF) + -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF ) cmake_src_configure
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: c358abf1322aedda07fe6a834f83a3c0a06806e3 Author: Samuel Bauer yahoo fr> AuthorDate: Wed Apr 28 23:10:41 2021 + Commit: Samuel Bauer yahoo fr> CommitDate: Wed Apr 28 23:10:41 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c358abf1 games-emulation/yuzu: drop compatibility list support Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-.ebuild | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index 434007ef8..ff94baa92 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -58,12 +58,8 @@ pkg_setup() { fi } -src_unpack() { - git-r3_src_unpack - - # Do not fetch via sources because this file always changes - curl https://api.yuzu-emu.org/gamedb/ > "${S}"/compatibility_list.json -} +# May fetch this file from src_unpack to provide compatibility list support +# curl https://api.yuzu-emu.org/gamedb/ > "${S}"/compatibility_list.json src_prepare() { # Set yuzu dev flags
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
commit: db724fb6ae61e83e677fb4241216c999e9c81101 Author: Andrew Ammerlaan riseup net> AuthorDate: Wed Apr 28 20:09:34 2021 + Commit: Andrew Ammerlaan riseup net> CommitDate: Wed Apr 28 20:09:34 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=db724fb6 games-emulation/yuzu: fix VisibleVcsPkg and UnnecessaryManifest Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan riseup.net> games-emulation/yuzu/Manifest | 3 --- games-emulation/yuzu/yuzu-.ebuild | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/games-emulation/yuzu/Manifest b/games-emulation/yuzu/Manifest deleted file mode 100644 index b86ef1467..0 --- a/games-emulation/yuzu/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -AUX yuzu--assert.patch 2145 BLAKE2B 140ace2db8a6621205b65e8f7585a624a792198ded7949b2baafc549dbe70afc3faa0eae62d440d8d02a6f7272c2a5290aa185d68cf92417c50b20fafb96daf1 SHA512 89930366f369ccb1a978cd0eb7c32ecd03f77ffa04a5439450e5e3264a79b92cdddc9468f88e5b1adacbf340c8aa2c7614ca5b12cf7062a069bb519a6dc009b1 -EBUILD yuzu-.ebuild 4296 BLAKE2B 487ef667564ad7e04afcfe5f13276c547311432a435381a9dae7b8a317ae527ac2fa7f9ade61c20577c42bf7b3484621a3a3c1471d0a78e39a151491da7df95f SHA512 a53f40d05363fb5059b4318026a130f84c2f97ca9be9222688c9f93a0382621d9b53193db47e7acef48b1c0cacb0b59828ace26fcdf38e0155dc21ef6dcf -MISC metadata.xml 613 BLAKE2B 4d4bddfd2fa545273ac302e325fccff48bd3690009f76533a0fc1240ed543bb940096f8918e0c22700ea55e0cc2b5211e98cef067f96afaaa76563762b3c6ea3 SHA512 a816a2e2dd9bf374ed15128fb87d5db011dcc42e913f6f24eb98eee9642b302fd2b5d9e50ec07f2a11f2cfe65c3e819c3b6cb36f4f401cbb7ddc86ac0b0ab573 diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild index 27ff0368f..434007ef8 100644 --- a/games-emulation/yuzu/yuzu-.ebuild +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -22,7 +22,7 @@ EGIT_SUBMODULES=( '*' '-ffmpeg' '-inih' '-libressl' '-libusb' '-libzip' '-opus' LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="" IUSE="+boxcat +cubeb discord +qt5 sdl webengine +webservice" DEPEND="
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/files/, games-emulation/yuzu/
commit: 4b611a5c84b3a3d33b7f428cbd0ca638d1e50ca5 Author: Samuel Bauer yahoo fr> AuthorDate: Wed Apr 28 15:59:36 2021 + Commit: Samuel Bauer yahoo fr> CommitDate: Wed Apr 28 15:59:36 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4b611a5c games-emulation/yuzu: new ebuild Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/Manifest | 3 + games-emulation/yuzu/files/yuzu--assert.patch | 34 ++ games-emulation/yuzu/metadata.xml | 15 +++ games-emulation/yuzu/yuzu-.ebuild | 120 ++ 4 files changed, 172 insertions(+) diff --git a/games-emulation/yuzu/Manifest b/games-emulation/yuzu/Manifest new file mode 100644 index 0..b86ef1467 --- /dev/null +++ b/games-emulation/yuzu/Manifest @@ -0,0 +1,3 @@ +AUX yuzu--assert.patch 2145 BLAKE2B 140ace2db8a6621205b65e8f7585a624a792198ded7949b2baafc549dbe70afc3faa0eae62d440d8d02a6f7272c2a5290aa185d68cf92417c50b20fafb96daf1 SHA512 89930366f369ccb1a978cd0eb7c32ecd03f77ffa04a5439450e5e3264a79b92cdddc9468f88e5b1adacbf340c8aa2c7614ca5b12cf7062a069bb519a6dc009b1 +EBUILD yuzu-.ebuild 4296 BLAKE2B 487ef667564ad7e04afcfe5f13276c547311432a435381a9dae7b8a317ae527ac2fa7f9ade61c20577c42bf7b3484621a3a3c1471d0a78e39a151491da7df95f SHA512 a53f40d05363fb5059b4318026a130f84c2f97ca9be9222688c9f93a0382621d9b53193db47e7acef48b1c0cacb0b59828ace26fcdf38e0155dc21ef6dcf +MISC metadata.xml 613 BLAKE2B 4d4bddfd2fa545273ac302e325fccff48bd3690009f76533a0fc1240ed543bb940096f8918e0c22700ea55e0cc2b5211e98cef067f96afaaa76563762b3c6ea3 SHA512 a816a2e2dd9bf374ed15128fb87d5db011dcc42e913f6f24eb98eee9642b302fd2b5d9e50ec07f2a11f2cfe65c3e819c3b6cb36f4f401cbb7ddc86ac0b0ab573 diff --git a/games-emulation/yuzu/files/yuzu--assert.patch b/games-emulation/yuzu/files/yuzu--assert.patch new file mode 100644 index 0..cd342ffba --- /dev/null +++ b/games-emulation/yuzu/files/yuzu--assert.patch @@ -0,0 +1,34 @@ +--- a/src/common/assert.h b/src/common/assert.h +@@ -28,22 +28,19 @@ __declspec(noinline, noreturn) + } + + #define ASSERT(_a_) \ +-do \ +-if (!(_a_)) { \ +-assert_noinline_call([] { LOG_CRITICAL(Debug, "Assertion Failed!"); });\ +-} \ +-while (0) ++if (!(_a_)) { \ ++LOG_CRITICAL(Debug, "Assertion Failed!"); \ ++} + + #define ASSERT_MSG(_a_, ...) \ +-do \ +-if (!(_a_)) { \ +-assert_noinline_call([&] { LOG_CRITICAL(Debug, "Assertion Failed!\n" __VA_ARGS__); }); \ +-} \ +-while (0) ++if (!(_a_)) { \ ++LOG_CRITICAL(Debug, "Assertion Failed! " __VA_ARGS__); \ ++} + +-#define UNREACHABLE() assert_noinline_call([] { LOG_CRITICAL(Debug, "Unreachable code!"); }) ++#define UNREACHABLE() \ ++{ LOG_CRITICAL(Debug, "Unreachable code!"); } + #define UNREACHABLE_MSG(...) \ +-assert_noinline_call([&] { LOG_CRITICAL(Debug, "Unreachable code!\n" __VA_ARGS__); }) ++{ LOG_CRITICAL(Debug, "Unreachable code!\n" __VA_ARGS__); } + + #ifdef _DEBUG + #define DEBUG_ASSERT(_a_) ASSERT(_a_) diff --git a/games-emulation/yuzu/metadata.xml b/games-emulation/yuzu/metadata.xml new file mode 100644 index 0..de9ad3b9b --- /dev/null +++ b/games-emulation/yuzu/metadata.xml @@ -0,0 +1,15 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + + mazes-80 + mazes...@github.com + + + Enable the Boxcat service, a yuzu high-level implementation of BCAT + Enables the cubeb audio backend + Enables Discord Rich Presence + Use QtWebEngine for web applet implementation + Enable web services (telemetry, etc.) + + diff --git a/games-emulation/yuzu/yuzu-.ebuild b/games-emulation/yuzu/yuzu-.ebuild new file mode 100644 index 0..27ff0368f --- /dev/null +++ b/games-emulation/yuzu/yuzu-.ebuild @@ -0,0 +1,120 @@ +#