[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2021-04-28 20:09 Andrew Ammerlaan
  0 siblings, 0 replies; 57+ messages in thread
From: Andrew Ammerlaan @ 2021-04-28 20:09 UTC (permalink / raw
  To: gentoo-commits

commit:     db724fb6ae61e83e677fb4241216c999e9c81101
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Wed Apr 28 20:09:34 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Wed Apr 28 20:09:34 2021 +0000
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 <andrewammerlaan <AT> riseup.net>

 games-emulation/yuzu/Manifest         | 3 ---
 games-emulation/yuzu/yuzu-9999.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..000000000
--- a/games-emulation/yuzu/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX yuzu-9999-assert.patch 2145 BLAKE2B 140ace2db8a6621205b65e8f7585a624a792198ded7949b2baafc549dbe70afc3faa0eae62d440d8d02a6f7272c2a5290aa185d68cf92417c50b20fafb96daf1 SHA512 89930366f369ccb1a978cd0eb7c32ecd03f77ffa04a5439450e5e3264a79b92cdddc9468f88e5b1adacbf340c8aa2c7614ca5b12cf7062a069bb519a6dc009b1
-EBUILD yuzu-9999.ebuild 4296 BLAKE2B 487ef667564ad7e04afcfe5f13276c547311432a435381a9dae7b8a317ae527ac2fa7f9ade61c20577c42bf7b3484621a3a3c1471d0a78e39a151491da7df95f SHA512 a53f40d05363fb5059b4318026a130f84c2f97ca9be9222688c9f93a0382621d9b53193db47e7acef48b1c0cacb0b598233338ace26fcdf38e0155dc21ef6dcf
-MISC metadata.xml 613 BLAKE2B 4d4bddfd2fa545273ac302e325fccff48bd3690009f76533a0fc1240ed543bb940096f8918e0c22700ea55e0cc2b5211e98cef067f96afaaa76563762b3c6ea3 SHA512 a816a2e2dd9bf374ed15128fb87d5db011dcc42e913f6f24eb98eee9642b302fd2b5d9e50ec07f2a11f2cfe65c3e819c3b6cb36f4f401cbb7ddc86ac0b0ab573

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 27ff0368f..434007ef8 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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="


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2021-04-28 23:11 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2021-04-28 23:11 UTC (permalink / raw
  To: gentoo-commits

commit:     c358abf1322aedda07fe6a834f83a3c0a06806e3
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Wed Apr 28 23:10:41 2021 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Wed Apr 28 23:10:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c358abf1

games-emulation/yuzu: drop compatibility list support

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 434007ef8..ff94baa92 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2021-04-28 23:34 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2021-04-28 23:34 UTC (permalink / raw
  To: gentoo-commits

commit:     dfec75eac25fdaee909b372fd0d25292f8ab0afc
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Wed Apr 28 23:33:54 2021 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Wed Apr 28 23:33:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=dfec75ea

games-emulation/yuzu: drop compatibility list support

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index ff94baa92..545451680 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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
 


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2021-04-29 12:53 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2021-04-29 12:53 UTC (permalink / raw
  To: gentoo-commits

commit:     3ad9fe8f741b1fe67da5652a0b553e11044c2564
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Thu Apr 29 12:52:08 2021 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Thu Apr 29 12:52:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3ad9fe8f

games-emulation/yuzu: drop compatibility list support

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 545451680..fe7ee3c0b 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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
 }


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2021-04-29 14:19 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2021-04-29 14:19 UTC (permalink / raw
  To: gentoo-commits

commit:     0bc42939052c20522a125c2af6f5821217d4a7a2
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Thu Apr 29 14:19:29 2021 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Thu Apr 29 14:19:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0bc42939

games-emulation/yuzu: update sdl requirements

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index fe7ee3c0b..9ffff3184 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2021-04-30  1:10 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2021-04-30  1:10 UTC (permalink / raw
  To: gentoo-commits

commit:     5acf308c9431a30925d0381398391c0bb806d390
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Fri Apr 30 01:09:17 2021 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Fri Apr 30 01:09:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5acf308c

games-emulation/yuzu: unbundle vulkan-headers

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 9ffff3184..ae1aac907 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2021-05-03 16:41 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2021-05-03 16:41 UTC (permalink / raw
  To: gentoo-commits

commit:     5b4ad18a24c2983b5d36dc534c5dcbfe008a6126
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Mon May  3 16:40:25 2021 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Mon May  3 16:40:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5b4ad18a

games-emulation/yuzu: fix cmake detection

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index ae1aac907..40befd426 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2021-05-16 13:50 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2021-05-16 13:50 UTC (permalink / raw
  To: gentoo-commits

commit:     2876aacaba70425ab1b320620b3d4887ac712b58
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Sun May 16 13:47:00 2021 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Sun May 16 13:47:00 2021 +0000
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 <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 40befd426..7db25934a 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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
 }
 


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2021-05-25 18:24 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2021-05-25 18:24 UTC (permalink / raw
  To: gentoo-commits

commit:     8e03ef5c5b5f2a883a339f754ee41dc7b2398d52
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Tue May 25 17:33:37 2021 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Tue May 25 18:22:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8e03ef5c

games-emulation/yuzu: sdl detection + cosmetic changes

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 7db25934a..0f50d353d 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2021-05-30 18:55 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2021-05-30 18:55 UTC (permalink / raw
  To: gentoo-commits

commit:     a71725695bd9c12126c1397d4c884cab1d85cfac
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Sun May 30 18:54:53 2021 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Sun May 30 18:54:53 2021 +0000
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 <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 0f50d353d..2942877d6 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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]


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2021-05-30 19:06 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2021-05-30 19:06 UTC (permalink / raw
  To: gentoo-commits

commit:     89af8ce70562259d66541cf44d7c08c68ada3758
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Sun May 30 19:02:45 2021 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Sun May 30 19:06:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=89af8ce7

games-emulation/yuzu: enable compatibility list support

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 2942877d6..ce3240a30 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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
 }


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2021-05-30 19:21 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2021-05-30 19:21 UTC (permalink / raw
  To: gentoo-commits

commit:     643377b8784df7e5deec1ba73dd5297eebb3e952
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Sun May 30 19:20:45 2021 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Sun May 30 19:20:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=643377b8

games-emulation/yuzu: compatibility list: add flag

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/metadata.xml     | 5 +++--
 games-emulation/yuzu/yuzu-9999.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 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
-	<name>Samuel Bauer</name>
-	<email>samuel.bauer@yahoo.fr</email>
+	<name>mazes-80</name>
+	<email>mazes-80@github.com</email>
 </maintainer>
 <use>
 	<flag name="boxcat">Enable the Boxcat service, a yuzu high-level implementation of BCAT</flag>
 	<flag name="cubeb">Enables the cubeb audio backend</flag>
+	<flag name="compatibility-list">Downloads the latest compatibility list</flag>
 	<flag name="discord">Enables Discord Rich Presence</flag>
 	<flag name="webengine">Use QtWebEngine for web applet implementation</flag>
 	<flag name="webservice">Enable web services (telemetry, etc.)</flag>

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index ce3240a30..e7a2452f4 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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
 }


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2021-06-05  0:57 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2021-06-05  0:57 UTC (permalink / raw
  To: gentoo-commits

commit:     c8f021cc410ddd56f1318191bb1e0f04e700b625
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Sat Jun  5 00:57:10 2021 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Sat Jun  5 00:57:10 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c8f021cc

games-emulation/yuzu: fix metadata.xml

Signed-off-by: Samuel Bauer <samuel.bauer <AT> 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 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
-	<name>mazes-80</name>
-	<email>mazes-80@github.com</email>
+	<name>Samuel Bauer</name>
+	<email>samuel.bauer@yahoo.fr</email>
 </maintainer>
 <use>
 	<flag name="boxcat">Enable the Boxcat service, a yuzu high-level implementation of BCAT</flag>


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2021-06-26  1:16 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2021-06-26  1:16 UTC (permalink / raw
  To: gentoo-commits

commit:     d7720f353aacf446dac6630f22a7aead7e5be8c1
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Sat Jun 26 01:15:34 2021 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Sat Jun 26 01:15:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d7720f35

games-emulation/yuzu: require >=libfmt-8

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index e7a2452f4..fc3082cb2 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2021-07-13  1:52 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2021-07-13  1:52 UTC (permalink / raw
  To: gentoo-commits

commit:     dd9e6a6548da4094798bf354d4d50900f5a7084e
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Tue Jul 13 01:51:09 2021 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Tue Jul 13 01:51:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=dd9e6a65

games-emulation/yuzu: GenerateSCMRev fails, fix titlebar

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index fc3082cb2..9a6f4bd8f 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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
 }
 


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2021-08-04  0:30 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2021-08-04  0:30 UTC (permalink / raw
  To: gentoo-commits

commit:     4c7f4706fd69507963a706f5f15cf43d0f97e4de
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Wed Aug  4 00:28:59 2021 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Wed Aug  4 00:28:59 2021 +0000
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 <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 9a6f4bd8f..8d51a6449 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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<void>' /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


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2021-08-04  0:36 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2021-08-04  0:36 UTC (permalink / raw
  To: gentoo-commits

commit:     374d955d635128d4c29fd6b9cd3c58457d5483a5
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Wed Aug  4 00:35:44 2021 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Wed Aug  4 00:35:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=374d955d

games-emulation/yuzu: update metadata

Signed-off-by: Samuel Bauer <samuel.bauer <AT> 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 @@
 	<flag name="cubeb">Enables the cubeb audio backend</flag>
 	<flag name="compatibility-list">Downloads the latest compatibility list</flag>
 	<flag name="discord">Enables Discord Rich Presence</flag>
+	<flag name="system-vulkan">Use system dev-util/vulkan-headers</flag>
 	<flag name="webengine">Use QtWebEngine for web applet implementation</flag>
 	<flag name="webservice">Enable web services (telemetry, etc.)</flag>
 </use>


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2021-08-20 22:21 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2021-08-20 22:21 UTC (permalink / raw
  To: gentoo-commits

commit:     7c654ca35959bc3ed0661c0a383162c899a1d171
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Fri Aug 20 22:20:44 2021 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Fri Aug 20 22:20:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7c654ca3

games-emulation/yuzu: update sdl requirement

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 8d51a6449..f01ff4a76 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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)/" \


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2021-10-06  8:14 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2021-10-06  8:14 UTC (permalink / raw
  To: gentoo-commits

commit:     275dd67cdd8b6b99ea8077cb067de9ce9e49a1f6
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Wed Oct  6 08:12:26 2021 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Wed Oct  6 08:12:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=275dd67c

games-emulation/yuzu: temporary disabling boxcat

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index f01ff4a76..6d0bd661d 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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)
 	)


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2021-11-07 13:56 Anna Vyalkova
  0 siblings, 0 replies; 57+ messages in thread
From: Anna Vyalkova @ 2021-11-07 13:56 UTC (permalink / raw
  To: gentoo-commits

commit:     4cb2722b22da8e81c5603c91cfaff36b7a616578
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Sun Nov  7 06:22:16 2021 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Sun Nov  7 13:56:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4cb2722b

games-emulation/yuzu: correct deps

* remove 'filter-flags'

* add dev-util/glslang dep

* move some deps to BDEPEND

* remove libzip

* opus is unbundled upstream

* add licenses

* EAPI 7 -> 8

Closes: https://bugs.gentoo.org/807953
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 games-emulation/yuzu/yuzu-9999.ebuild | 59 +++++++++++++++++------------------
 1 file changed, 28 insertions(+), 31 deletions(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 6d0bd661d..7bb3ff721 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.ebuild
@@ -1,57 +1,65 @@
 # Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake git-r3 flag-o-matic toolchain-funcs xdg
+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"
-EGIT_SUBMODULES=( '*' '-ffmpeg' '-inih' '-libressl' '-libusb' '-libzip' '-opus' '-SDL' )
+EGIT_SUBMODULES=( '*' '-ffmpeg' '-inih' '-libressl' '-libusb' '-opus' '-SDL' )
+# TODO '-libzip' when boxcat feature is reintroduced
 # 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
 
-LICENSE="GPL-3"
+LICENSE="|| ( Apache-2.0 GPL-2+ ) 0BSD BSD GPL-2+ ISC MIT
+	!system-vulkan? ( Apache-2.0 )"
 SLOT="0"
 KEYWORDS=""
 IUSE="+boxcat +compatibility-list +cubeb discord +qt5 sdl system-vulkan webengine +webservice"
 
-DEPEND="
-	discord? ( >=dev-libs/rapidjson-1.1.0 )
+RDEPEND="
+	>=app-arch/lz4-1.8:=
+	>=app-arch/zstd-1.5
+	>=dev-libs/boost-1.73:=[context]
+	>=dev-libs/libfmt-8:=
+	>=dev-libs/openssl-1.1:=
+	>=media-libs/opus-1.3
+	media-video/ffmpeg:=
+	>=sys-libs/zlib-1.2
+	virtual/libusb:1
 	qt5? (
-		>=dev-qt/qtgui-5.15
-		>=dev-qt/qtwidgets-5.15
+		>=dev-qt/qtcore-5.15:5
+		>=dev-qt/qtgui-5.15:5
+		>=dev-qt/qtwidgets-5.15:5
 	)
 	sdl? (
 		>=media-libs/libsdl2-2.0.16
 		>=dev-libs/inih-52
 	)
+"
+DEPEND="${RDEPEND}
 	system-vulkan? (
 		>=dev-util/vulkan-headers-1.2.180
 	)
-	>=app-arch/lz4-1.8
-	>=app-arch/zstd-1.5
+"
+BDEPEND="
 	>=dev-cpp/catch-2.13:0
 	>=dev-cpp/nlohmann_json-3.8.0
-	>=dev-libs/boost-1.73:=[context]
-	>=dev-libs/libfmt-8
-	>=dev-libs/libzip-1.5
-	>=media-libs/opus-1.3.1
-	>=sys-libs/zlib-1.2
-	virtual/libusb:1
+	dev-util/glslang
+	discord? ( >=dev-libs/rapidjson-1.1.0 )
 "
-RDEPEND="${DEPEND}"
 REQUIRED_USE="boxcat? ( webservice ) || ( qt5 sdl )"
 
 PATCHES=( "${FILESDIR}"/${P}-assert.patch )
 
 pkg_setup() {
-	if [ tc-is-gcc ]; then
-		[ "$(gcc-major-version)" -lt 11 ] && \
+	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<void>' /usr/include/qt5/QtConcurrent/qtconcurrentthreadengine.h \
@@ -70,22 +78,11 @@ src_unpack() {
 }
 
 src_prepare() {
-	# Set yuzu dev flags
-	filter-flags '-*'
-	append-cflags '-O3 -DNDEBUG'
-	append-cxxflags '-O3 -DNDEBUG'
-
 	# headers is not a valid boost component
 	sed -i -e '/find_package(Boost/{s/headers //;s/CONFIG //}' CMakeLists.txt || die
 
 	# Allow skip submodule downloading
-	rm .gitmodules
-
-	# unbundle opus (thx to https://github.com/Alex-Aralis/yuzu-overlay/blob/master/games-emulation/yuzu/files/unbundle-opus.patch)
-	sed -i -e "s!add_subdirectory(opus)!add_library(opus INTERFACE)\ntarget_include_directories(opus SYSTEM INTERFACE /usr/include/opus)\ntarget_link_libraries(opus INTERFACE /usr/$(get_libdir)/libopus.so)!" externals/CMakeLists.txt || die
-
-	# Fix libzip detection
-	sed -i -e '/Libzip/s:.*:include(find-modules/FindLibzip.cmake)\n&:' externals/CMakeLists.txt || die
+	rm .gitmodules || die
 
 	# Unbundle inih
 	sed -i -e '/inih/d' externals/CMakeLists.txt || die


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2022-01-08  0:25 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2022-01-08  0:25 UTC (permalink / raw
  To: gentoo-commits

commit:     3d8166448caf3547ad17e7892cb158d0f28962d1
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Sat Jan  8 00:25:15 2022 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Sat Jan  8 00:25:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3d816644

games-emulation/yuzu: fixup for last commit

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 48a21e0e1..76869251c 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.ebuild
@@ -58,8 +58,8 @@ BDEPEND="
 REQUIRED_USE="|| ( qt5 sdl )"
 
 pkg_setup() {
-	if [ tc-is-gcc ]; then
-		[ "$(gcc-major-version)" -lt 11 ] && \
+	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<void>' /usr/include/qt5/QtConcurrent/qtconcurrentthreadengine.h \


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2022-01-16  4:03 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2022-01-16  4:03 UTC (permalink / raw
  To: gentoo-commits

commit:     b00e62a18c6be01c5693346c8f448bffbf768828
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Sun Jan 16 04:02:27 2022 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Sun Jan 16 04:02:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b00e62a1

games-emulation/yuzu: unbundle cubeb, rework submodules

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 76869251c..c194b8c19 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.ebuild
@@ -8,11 +8,10 @@ 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=( '*' '-ffmpeg' '-inih' '-libressl' '-libusb' '-opus' '-SDL'
-	'-externals/sirit/externals/SPIRV-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, ...
+EGIT_SUBMODULES=( '-*' 'dynarmic' 'soundtouch' 'sirit' 'mbedtls' 'xbyak' 'externals/cpp-httplib' )
+# Soundtouch cannot be unbundled -> custom version
+# Dynarmic is heavily tweaked to emulate switch cpu non sense to unbundle
+# TODO wait 'xbyak' for bump in tree, require 5.96
 # 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
 
@@ -32,6 +31,7 @@ RDEPEND="
 	>=media-video/ffmpeg-4.3:=
 	>=sys-libs/zlib-1.2
 	virtual/libusb:1
+	cubeb? ( media-libs/cubeb )
 	qt5? (
 		>=dev-qt/qtcore-5.15:5
 		>=dev-qt/qtgui-5.15:5
@@ -67,12 +67,12 @@ pkg_setup() {
 }
 
 src_unpack() {
-	if ! use discord; then
-		EGIT_SUBMODULES+=('-discord-rpc')
+	if use discord; then
+		EGIT_SUBMODULES+=('discord-rpc')
 	fi
 
-	if use system-vulkan; then
-		EGIT_SUBMODULES+=('-Vulkan-Headers')
+	if !use system-vulkan; then
+		EGIT_SUBMODULES+=('Vulkan-Headers')
 	fi
 
 	git-r3_src_unpack
@@ -121,6 +121,10 @@ src_prepare() {
 			externals/discord-rpc/CMakeLists.txt || die
 	fi
 
+	# Unbundle cubeb
+	use cubeb && sed -i '$afind_package(Threads REQUIRED)' CMakeLists.txt || die
+	sed -i '/cubeb/d' externals/CMakeLists.txt || die
+
 	cmake_src_prepare
 }
 


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2022-01-21  3:31 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2022-01-21  3:31 UTC (permalink / raw
  To: gentoo-commits

commit:     7a70fb27ee6b5aca3099bd810b96178cbfb064b2
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Fri Jan 21 03:30:20 2022 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Fri Jan 21 03:30:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7a70fb27

games-emulation/yuzu: unbundle mbedtls, update SDL2, skip qtconcurrent fix, review comments

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index c194b8c19..e4a73c5ad 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.ebuild
@@ -8,12 +8,10 @@ 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' 'soundtouch' 'sirit' 'mbedtls' 'xbyak' 'externals/cpp-httplib' )
+EGIT_SUBMODULES=( '-*' 'dynarmic' 'soundtouch' 'sirit' 'xbyak' 'externals/cpp-httplib' )
 # Soundtouch cannot be unbundled -> custom version
-# Dynarmic is heavily tweaked to emulate switch cpu non sense to unbundle
+# Dynarmic is intended to be tailored on purpose, not to be generic
 # TODO wait 'xbyak' for bump in tree, require 5.96
-# 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
 
 LICENSE="|| ( Apache-2.0 GPL-2+ ) 0BSD BSD GPL-2+ ISC MIT
 	!system-vulkan? ( Apache-2.0 )"
@@ -30,6 +28,7 @@ RDEPEND="
 	>=media-libs/opus-1.3.1
 	>=media-video/ffmpeg-4.3:=
 	>=sys-libs/zlib-1.2
+	net-libs/mbedtls[cmac]
 	virtual/libusb:1
 	cubeb? ( media-libs/cubeb )
 	qt5? (
@@ -38,7 +37,7 @@ RDEPEND="
 		>=dev-qt/qtwidgets-5.15:5
 	)
 	sdl? (
-		>=media-libs/libsdl2-2.0.16
+		>=media-libs/libsdl2-2.0.18
 		>=dev-libs/inih-52
 	)
 "
@@ -62,8 +61,6 @@ pkg_setup() {
 		[[ "$(gcc-major-version)" -lt 11 ]] && \
 			die "You need gcc version 11 or clang to compile this package"
 	fi
-	grep -q 'ThreadEngineStarter<void>' /usr/include/qt5/QtConcurrent/qtconcurrentthreadengine.h \
-		|| die "add user patch for dev-qt/qtconcurrent: https://github.com/qt/qtbase/commit/659f7a06e91c04b239e3f4c0bcfccbe3581af1c3.diff"
 }
 
 src_unpack() {
@@ -101,15 +98,21 @@ src_prepare() {
 		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
 
+	# Unbundle mbedtls: undefined reference to `mbedtls_cipher_cmac'
+	sed -i -e '/mbedtls/d' externals/CMakeLists.txt || die
+	sed -i -e 's/mbedtls/& mbedcrypto mbedx509/' \
+		-e '1ifind_path(MBEDTLS_INCLUDE_DIR NAMES mbedtls/ssl.h)' \
+		-e '1ifind_library(MBEDTLS_LIB NAMES mbedtls)' \
+		-e '1ifind_library(MBEDX509_LIB NAMES mbedx509)' \
+		-e '1ifind_library(MBEDCRYPTO_LIB NAMES mbedcrypto)' \
+		src/core/CMakeLists.txt
+
 	# 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
 
-	# Lower sdl requirement
-	sed -i -e '/SDL2/s/18/16/' CMakeLists.txt || die
-
 	# Use system SPIRV headers
 	sed -i -e '/SPIRV/d' externals/sirit/CMakeLists.txt || die
 
@@ -130,6 +133,7 @@ src_prepare() {
 
 src_configure() {
 	local -a mycmakeargs=(
+		# Libraries are private and rely on circular dependency resolution.
 		-DBUILD_SHARED_LIBS=OFF
 		-DDYNARMIC_NO_BUNDLED_ROBIN_MAP=ON
 		-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=$(usex compatibility-list)
@@ -139,6 +143,7 @@ src_configure() {
 		-DENABLE_SDL2=$(usex sdl)
 		-DENABLE_WEB_SERVICE=$(usex webservice)
 		-DUSE_DISCORD_PRESENCE=$(usex discord)
+		-DYUZU_USE_BUNDLED_OPUS=OFF
 		-DYUZU_USE_EXTERNAL_SDL2=OFF
 		-DYUZU_USE_QT_WEB_ENGINE=$(usex webengine)
 	)


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2022-06-07 13:09 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2022-06-07 13:09 UTC (permalink / raw
  To: gentoo-commits

commit:     2e9401b34dced04f1c864ca57842a02d8db80778
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Tue Jun  7 12:57:56 2022 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Tue Jun  7 13:08:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2e9401b3

games-emulation/yuzu: support gentoo vulkan

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index e4a73c5ad..a4857f0c9 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.ebuild
@@ -20,15 +20,15 @@ KEYWORDS=""
 IUSE="+compatibility-list +cubeb discord +qt5 sdl system-vulkan webengine +webservice"
 
 RDEPEND="
-	>=app-arch/lz4-1.8:=
 	>=app-arch/zstd-1.5
-	>=dev-libs/boost-1.73:=[context]
 	>=dev-libs/libfmt-8:=
 	>=dev-libs/openssl-1.1:=
-	>=media-libs/opus-1.3.1
 	>=media-video/ffmpeg-4.3:=
-	>=sys-libs/zlib-1.2
+	app-arch/lz4:=
+	dev-libs/boost:=[context]
+	media-libs/opus
 	net-libs/mbedtls[cmac]
+	sys-libs/zlib
 	virtual/libusb:1
 	cubeb? ( media-libs/cubeb )
 	qt5? (
@@ -43,9 +43,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-util/spirv-headers
-	system-vulkan? (
-		>=dev-util/vulkan-headers-1.2.198
-	)
+	system-vulkan? ( dev-util/vulkan-headers )
 "
 BDEPEND="
 	>=dev-cpp/catch-2.13:0
@@ -68,12 +66,11 @@ src_unpack() {
 		EGIT_SUBMODULES+=('discord-rpc')
 	fi
 
-	if !use system-vulkan; then
+	if use !system-vulkan; then
 		EGIT_SUBMODULES+=('Vulkan-Headers')
 	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
 }
@@ -96,6 +93,8 @@ 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
+		# available only in >=vulkan-headers-1.3.213
+		sed -i -e '/VK_ERROR_COMPRESSION_EXHAUSTED_EXT/d' src/video_core/vulkan_common/vulkan_wrapper.cpp || die
 	fi
 
 	# Unbundle mbedtls: undefined reference to `mbedtls_cipher_cmac'
@@ -113,9 +112,6 @@ src_prepare() {
 		-e "s/@GIT_DESC@/$(git describe --always --long)/" \
 		src/common/scm_rev.cpp.in || die
 
-	# Use system SPIRV headers
-	sed -i -e '/SPIRV/d' externals/sirit/CMakeLists.txt || die
-
 	if ! use discord; then
 		sed -i -e '/discord-rpc/d' externals/CMakeLists.txt || die
 	else
@@ -142,6 +138,7 @@ src_configure() {
 		-DENABLE_QT_TRANSLATION=$(usex qt5)
 		-DENABLE_SDL2=$(usex sdl)
 		-DENABLE_WEB_SERVICE=$(usex webservice)
+		-DSIRIT_USE_SYSTEM_SPIRV_HEADERS=ON # Use system SPIRV headers
 		-DUSE_DISCORD_PRESENCE=$(usex discord)
 		-DYUZU_USE_BUNDLED_OPUS=OFF
 		-DYUZU_USE_EXTERNAL_SDL2=OFF


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2022-07-24 23:12 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2022-07-24 23:12 UTC (permalink / raw
  To: gentoo-commits

commit:     cb65ef27f449ae62df7db7680952f2bfbbbaa7c3
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Sun Jul 24 23:09:37 2022 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Sun Jul 24 23:09:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cb65ef27

games-emulation/yuzu: tweaks

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index a4857f0c9..fcab95295 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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' 'soundtouch' 'sirit' 'xbyak' 'externals/cpp-httplib' )
+EGIT_SUBMODULES=( '-*' 'cpp-httplib' 'dynarmic' 'soundtouch' 'sirit' 'xbyak' )
 # Soundtouch cannot be unbundled -> custom version
 # Dynarmic is intended to be tailored on purpose, not to be generic
 # TODO wait 'xbyak' for bump in tree, require 5.96
@@ -43,7 +43,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-util/spirv-headers
-	system-vulkan? ( dev-util/vulkan-headers )
+	system-vulkan? ( >=dev-util/vulkan-headers-1.3.216 )
 "
 BDEPEND="
 	>=dev-cpp/catch-2.13:0
@@ -76,6 +76,9 @@ src_unpack() {
 }
 
 src_prepare() {
+	# unused-result maybe temporary fix
+	sed -i -e '/Werror=unused-result/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
 
@@ -89,12 +92,10 @@ src_prepare() {
 	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 '/target_include_directories(xbyak/s:./xbyak/xbyak:/usr/include/xbyak/:' externals/CMakeLists.txt
+	# 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
-		# available only in >=vulkan-headers-1.3.213
-		sed -i -e '/VK_ERROR_COMPRESSION_EXHAUSTED_EXT/d' src/video_core/vulkan_common/vulkan_wrapper.cpp || die
 	fi
 
 	# Unbundle mbedtls: undefined reference to `mbedtls_cipher_cmac'


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2022-07-26  2:20 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2022-07-26  2:20 UTC (permalink / raw
  To: gentoo-commits

commit:     13d0c8a4d073dc627af6daa8a3159c67cddac797
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Tue Jul 26 02:06:43 2022 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Tue Jul 26 02:20:16 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=13d0c8a4

games-emulation/yuzu: unbundle sirit cpp-httplib

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index fcab95295..55be65914 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.ebuild
@@ -8,10 +8,9 @@ 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=( '-*' 'cpp-httplib' 'dynarmic' 'soundtouch' 'sirit' 'xbyak' )
-# Soundtouch cannot be unbundled -> custom version
-# Dynarmic is intended to be tailored on purpose, not to be generic
-# TODO wait 'xbyak' for bump in tree, require 5.96
+EGIT_SUBMODULES=( '-*' 'dynarmic' 'xbyak' )
+# Dynarmic is not intended to be generic, it is tweaked to fit emulated processor
+# TODO wait 'xbyak' waiting version bump. see #860816
 
 LICENSE="|| ( Apache-2.0 GPL-2+ ) 0BSD BSD GPL-2+ ISC MIT
 	!system-vulkan? ( Apache-2.0 )"
@@ -20,14 +19,15 @@ KEYWORDS=""
 IUSE="+compatibility-list +cubeb discord +qt5 sdl system-vulkan webengine +webservice"
 
 RDEPEND="
+	<net-libs/mbedtls-3.1[cmac]
 	>=app-arch/zstd-1.5
 	>=dev-libs/libfmt-8:=
 	>=dev-libs/openssl-1.1:=
 	>=media-video/ffmpeg-4.3:=
 	app-arch/lz4:=
 	dev-libs/boost:=[context]
+	dev-libs/sirit
 	media-libs/opus
-	net-libs/mbedtls[cmac]
 	sys-libs/zlib
 	virtual/libusb:1
 	cubeb? ( media-libs/cubeb )
@@ -42,7 +42,7 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	dev-util/spirv-headers
+	dev-libs/cpp-httplib
 	system-vulkan? ( >=dev-util/vulkan-headers-1.3.216 )
 "
 BDEPEND="
@@ -125,13 +125,19 @@ src_prepare() {
 	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
+
+	# Unbundle cpp-httplib
+	sed -i -e '/^	# cpp-httplib/,/^	endif()/d' externals/CMakeLists.txt || die
+
 	cmake_src_prepare
 }
 
 src_configure() {
 	local -a mycmakeargs=(
 		# Libraries are private and rely on circular dependency resolution.
-		-DBUILD_SHARED_LIBS=OFF
+		-DBUILD_SHARED_LIBS=OFF # dynarmic
 		-DDYNARMIC_NO_BUNDLED_ROBIN_MAP=ON
 		-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=$(usex compatibility-list)
 		-DENABLE_CUBEB=$(usex cubeb)
@@ -139,7 +145,6 @@ src_configure() {
 		-DENABLE_QT_TRANSLATION=$(usex qt5)
 		-DENABLE_SDL2=$(usex sdl)
 		-DENABLE_WEB_SERVICE=$(usex webservice)
-		-DSIRIT_USE_SYSTEM_SPIRV_HEADERS=ON # Use system SPIRV headers
 		-DUSE_DISCORD_PRESENCE=$(usex discord)
 		-DYUZU_USE_BUNDLED_OPUS=OFF
 		-DYUZU_USE_EXTERNAL_SDL2=OFF


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2022-07-26 22:26 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2022-07-26 22:26 UTC (permalink / raw
  To: gentoo-commits

commit:     2b32f6ee02143e963c602fdc9e2b2460ffa460b9
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Tue Jul 26 22:22:16 2022 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Tue Jul 26 22:23:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2b32f6ee

games-emulation/yuzu: uploaded compatibility list to gist.github.com

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-0_p20220725.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/yuzu/yuzu-0_p20220725.ebuild b/games-emulation/yuzu/yuzu-0_p20220725.ebuild
index 14d30fe5a..63d0c162a 100644
--- a/games-emulation/yuzu/yuzu-0_p20220725.ebuild
+++ b/games-emulation/yuzu/yuzu-0_p20220725.ebuild
@@ -10,7 +10,7 @@ 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? ( yuzu-0_p20220725-compatibility_list.json )
+	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


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2022-08-04 10:05 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2022-08-04 10:05 UTC (permalink / raw
  To: gentoo-commits

commit:     ed2626d52f3bc7cb417b446b420d2130e7df2bf3
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Thu Aug  4 10:04:03 2022 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Thu Aug  4 10:04:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ed2626d5

games-emulation/yuzu: new flag for test, disable test in snapshot

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-0_p20220725.ebuild | 2 +-
 games-emulation/yuzu/yuzu-9999.ebuild        | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/games-emulation/yuzu/yuzu-0_p20220725.ebuild b/games-emulation/yuzu/yuzu-0_p20220725.ebuild
index 5e5df4fd6..8bc53d5fc 100644
--- a/games-emulation/yuzu/yuzu-0_p20220725.ebuild
+++ b/games-emulation/yuzu/yuzu-0_p20220725.ebuild
@@ -50,7 +50,6 @@ DEPEND="${RDEPEND}
 	>=dev-util/vulkan-headers-1.3.216
 "
 BDEPEND="
-	>=dev-cpp/catch-2.13:0
 	>=dev-cpp/nlohmann_json-3.8.0
 	dev-cpp/robin-map
 	dev-util/glslang
@@ -104,6 +103,7 @@ src_configure() {
 		-DENABLE_SDL2=$(usex sdl)
 		-DENABLE_WEB_SERVICE=$(usex webservice)
 		-DUSE_DISCORD_PRESENCE=$(usex discord)
+		-DYUZU_TESTS=OFF
 		-DYUZU_USE_BUNDLED_OPUS=OFF
 		-DYUZU_USE_EXTERNAL_SDL2=OFF
 		-DYUZU_USE_QT_WEB_ENGINE=$(usex webengine)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 5ec1e0537..953cae7e0 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.ebuild
@@ -16,7 +16,7 @@ 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 webengine +webservice"
+IUSE="+compatibility-list +cubeb discord +qt5 sdl +system-vulkan test webengine +webservice"
 
 RDEPEND="
 	<net-libs/mbedtls-3.1[cmac]
@@ -48,13 +48,14 @@ DEPEND="${RDEPEND}
 	system-vulkan? ( >=dev-util/vulkan-headers-1.3.216 )
 "
 BDEPEND="
-	>=dev-cpp/catch-2.13:0
+	test? ( <dev-cpp/catch-3:0 )
 	>=dev-cpp/nlohmann_json-3.8.0
 	dev-cpp/robin-map
 	dev-util/glslang
 	discord? ( >=dev-libs/rapidjson-1.1.0 )
 "
 REQUIRED_USE="|| ( qt5 sdl )"
+RESTRICT="!test? ( test )"
 
 pkg_setup() {
 	if tc-is-gcc; then
@@ -131,7 +132,7 @@ src_prepare() {
 	sed -i '/sirit/d' externals/CMakeLists.txt || die
 
 	# Unbundle cpp-httplib
-	sed -i -e '/^	# cpp-httplib/,/^	endif()/d' externals/CMakeLists.txt || die
+	sed -i -e '/^	# httplib/,/^	endif()/d' externals/CMakeLists.txt || die
 
 	# Unbundle enet
 	sed -i -e '/enet/d' externals/CMakeLists.txt || die
@@ -152,6 +153,7 @@ src_configure() {
 		-DENABLE_SDL2=$(usex sdl)
 		-DENABLE_WEB_SERVICE=$(usex webservice)
 		-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)


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2022-08-04 10:05 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2022-08-04 10:05 UTC (permalink / raw
  To: gentoo-commits

commit:     cbac8be99e282c6dec40d9d0c7ac76a4b253868a
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Wed Jul 27 00:34:14 2022 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Thu Aug  4 10:02:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cbac8be9

games-emulation/yuzu: add depend dev-cpp/cpp-jwt, unbundle enet

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 523fda49a..5ec1e0537 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
 	>=dev-libs/libfmt-8:=
 	>=dev-libs/openssl-1.1:=
 	>=media-video/ffmpeg-4.3:=
+	>=net-libs/enet-1.3
 	app-arch/lz4:=
 	dev-libs/boost:=[context]
 	dev-libs/sirit
@@ -43,6 +44,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-cpp/cpp-httplib
+	dev-cpp/cpp-jwt
 	system-vulkan? ( >=dev-util/vulkan-headers-1.3.216 )
 "
 BDEPEND="
@@ -131,6 +133,10 @@ src_prepare() {
 	# Unbundle cpp-httplib
 	sed -i -e '/^	# cpp-httplib/,/^	endif()/d' externals/CMakeLists.txt || die
 
+	# Unbundle enet
+	sed -i -e '/enet/d' externals/CMakeLists.txt || die
+	sed -i -e '/enet\/enet\.h/{s/"/</;s/"/>/}' src/network/network.cpp || die
+
 	cmake_src_prepare
 }
 


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2022-08-08 11:04 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2022-08-08 11:04 UTC (permalink / raw
  To: gentoo-commits

commit:     8d8a045581d950439a9ef6e4d30d4e8136c11b4e
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Mon Aug  8 11:03:46 2022 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Mon Aug  8 11:03:46 2022 +0000
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 <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-0_p20220725.ebuild | 1 +
 games-emulation/yuzu/yuzu-9999.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-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 953cae7e0..0860eda94 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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? (


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2022-09-08 10:24 Andrew Ammerlaan
  0 siblings, 0 replies; 57+ messages in thread
From: Andrew Ammerlaan @ 2022-09-08 10:24 UTC (permalink / raw
  To: gentoo-commits

commit:     7073ef94dda7aa9f35922b54ba3e6f0a9f5739de
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  8 10:13:37 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Sep  8 10:13:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7073ef94

games-emulation/yuzu: quote S/FILESDIR variables

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> 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
 }
 


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2022-09-09 13:49 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2022-09-09 13:49 UTC (permalink / raw
  To: gentoo-commits

commit:     c927e2cc777459cc6295372c8b7b0ff9001ecd5c
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Fri Sep  9 13:43:17 2022 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Fri Sep  9 13:49:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c927e2cc

games-emulation/yuzu: update live ebuild

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 0860eda94..7fdca80d6 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.ebuild
@@ -49,7 +49,6 @@ DEPEND="${RDEPEND}
 	system-vulkan? ( >=dev-util/vulkan-headers-1.3.216 )
 "
 BDEPEND="
-	test? ( <dev-cpp/catch-3:0 )
 	>=dev-cpp/nlohmann_json-3.8.0
 	dev-cpp/robin-map
 	dev-util/glslang
@@ -74,6 +73,10 @@ src_unpack() {
 		EGIT_SUBMODULES+=('Vulkan-Headers')
 	fi
 
+	if use test; then
+		EGIT_SUBMODULES+=('Catch2')
+	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
@@ -104,12 +107,10 @@ 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/' \
-		-e '1ifind_path(MBEDTLS_INCLUDE_DIR NAMES mbedtls/ssl.h)' \
-		-e '1ifind_library(MBEDTLS_LIB NAMES mbedtls)' \
-		-e '1ifind_library(MBEDX509_LIB NAMES mbedx509)' \
-		-e '1ifind_library(MBEDCRYPTO_LIB NAMES mbedcrypto)' \
-		src/core/CMakeLists.txt
+		src/dedicated_room/CMakeLists.txt \
+		src/core/CMakeLists.txt || die
 
 	# Workaround: GenerateSCMRev fails
 	sed -i -e "s/@GIT_BRANCH@/${EGIT_BRANCH:-master}/" \


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2022-10-12 12:03 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2022-10-12 12:03 UTC (permalink / raw
  To: gentoo-commits

commit:     da38365112232f79c1a79aa00c6bef9fb5936549
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Wed Oct 12 12:02:35 2022 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Wed Oct 12 12:02:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=da383651

games-emulation/yuzu-9999: app-arch/lz4 detection

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 7fdca80d6..330329b0d 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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/"/</;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
 }
 


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2022-11-13  1:06 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2022-11-13  1:06 UTC (permalink / raw
  To: gentoo-commits

commit:     87ef810d8b7b72b13004a291fb016fbfd701210a
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Sun Nov 13 01:05:13 2022 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Sun Nov 13 01:05:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=87ef810d

games-emulation/yuzu-9999: suppress all Werror from extra project flags

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 330329b0d..05423ff8b 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2022-12-19 22:42 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2022-12-19 22:42 UTC (permalink / raw
  To: gentoo-commits

commit:     c5fdfc1295e1db5b4957286a18fe9022c770d83e
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Mon Dec 19 22:38:10 2022 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Mon Dec 19 22:38:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c5fdfc12

games-emulation/yuzu-9999: rework unbundlings, re-bundle fmt and sirit

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 05423ff8b..051b2b822 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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/"/</;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)
 	)


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2022-12-21  4:23 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2022-12-21  4:23 UTC (permalink / raw
  To: gentoo-commits

commit:     908e23bb9c4dc80bf712b5be0afb02e53a5a3178
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Wed Dec 21 04:21:54 2022 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Wed Dec 21 04:21:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=908e23bb

games-emulation/yuzu-9999: unbundle vulkan: lower required version

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 051b2b822..56bd65947 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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 \


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2022-12-21 10:03 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2022-12-21 10:03 UTC (permalink / raw
  To: gentoo-commits

commit:     ea42498ad5ddce06f61369e8fe443dd21a930a79
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Wed Dec 21 09:58:06 2022 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Wed Dec 21 10:02:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ea42498a

games-emulation/yuzu-9999: revert last commit

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 56bd65947..6ab525990 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2022-12-21 10:03 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2022-12-21 10:03 UTC (permalink / raw
  To: gentoo-commits

commit:     6f036bf614113cef53b0eef4a97a65258e4c6591
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Wed Dec 21 09:59:59 2022 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Wed Dec 21 10:02:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6f036bf6

games-emulation/yuzu-9999: system-vulkan: required vulkan-headers not yet available

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 6ab525990..3e128ae0b 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2023-02-02 15:14 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2023-02-02 15:14 UTC (permalink / raw
  To: gentoo-commits

commit:     d029a76c4c1534e19b7f4b6ceb4d55823328a61b
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Thu Feb  2 15:13:45 2023 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Thu Feb  2 15:13:45 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d029a76c

games-emulation/yuzu-9999: allow to use current system vulkan headers

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 3e128ae0b..4d7d1e510 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.ebuild
@@ -21,7 +21,7 @@ IUSE="+compatibility-list +cubeb discord +qt5 sdl +system-vulkan test webengine
 RDEPEND="
 	<net-libs/mbedtls-3.1[cmac]
 	>=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? ( <dev-cpp/catch-3:0 )
 "
 BDEPEND="
 	>=dev-cpp/nlohmann_json-3.8.0
@@ -85,9 +86,6 @@ src_prepare() {
 	# 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
-
 	# Allow skip submodule downloading
 	rm .gitmodules || die
 
@@ -96,9 +94,6 @@ src_prepare() {
 	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
-		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
 
 	# Unbundle mbedtls
 	sed -i -e '/mbedtls/d' externals/CMakeLists.txt || die
@@ -134,8 +129,15 @@ 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
 
-	# 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)
 	)


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2023-02-02 20:02 Artemis Everfree
  0 siblings, 0 replies; 57+ messages in thread
From: Artemis Everfree @ 2023-02-02 20:02 UTC (permalink / raw
  To: gentoo-commits

commit:     87e7d48f842396dc937216b39ebf81ee852aec5a
Author:     Artemis Everfree <artemis <AT> artemis <DOT> sh>
AuthorDate: Thu Feb  2 20:01:36 2023 +0000
Commit:     Artemis Everfree <artemis <AT> artemis <DOT> sh>
CommitDate: Thu Feb  2 20:01:36 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=87e7d48f

games-emulation/yuzu: update Manifest

Signed-off-by: Artemis Everfree <artemis <AT> 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 6f3809999cc5736c7cf3001b4485095dd00d2ad8d5d3459dea0aed006c3361731823a181adf94edd612ffdc8a6fb0c697f7f70cfb1402953c95a9fdd0faaae42
+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


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2023-02-05 18:15 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2023-02-05 18:15 UTC (permalink / raw
  To: gentoo-commits

commit:     7629b52ff7c4fe7a58baedbcf64326cae9904ffb
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Sun Feb  5 18:14:57 2023 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Sun Feb  5 18:14:57 2023 +0000
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 <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-0_p20230202.ebuild | 2 +-
 games-emulation/yuzu/yuzu-9999.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="
 	<net-libs/mbedtls-3.1[cmac]
 	>=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-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 4d7d1e510..324a241e9 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.ebuild
@@ -21,6 +21,7 @@ IUSE="+compatibility-list +cubeb discord +qt5 sdl +system-vulkan test webengine
 RDEPEND="
 	<net-libs/mbedtls-3.1[cmac]
 	>=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}


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2023-02-05 18:26 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2023-02-05 18:26 UTC (permalink / raw
  To: gentoo-commits

commit:     79c0ac32ebb72516c8a7ecc484fc4d2eed287c77
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Sun Feb  5 18:26:19 2023 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Sun Feb  5 18:26:19 2023 +0000
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 <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-0_p20230202.ebuild | 1 +
 games-emulation/yuzu/yuzu-9999.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-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 324a241e9..b44eff45d 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2023-02-13  0:10 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2023-02-13  0:10 UTC (permalink / raw
  To: gentoo-commits

commit:     60c62f5f89fb61a850f62734a233746b77c613dc
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Mon Feb 13 00:09:27 2023 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Mon Feb 13 00:09:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=60c62f5f

games-emulation/yuzu: pkgcheck, >=dev-cpp/httplib-0.12

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-0_p20220725.ebuild | 118 ---------------------------
 games-emulation/yuzu/yuzu-0_p20230202.ebuild |  21 +++--
 games-emulation/yuzu/yuzu-9999.ebuild        |  12 +--
 3 files changed, 22 insertions(+), 129 deletions(-)

diff --git a/games-emulation/yuzu/yuzu-0_p20220725.ebuild b/games-emulation/yuzu/yuzu-0_p20220725.ebuild
deleted file mode 100644
index c1d3fd0d9..000000000
--- a/games-emulation/yuzu/yuzu-0_p20220725.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake toolchain-funcs xdg
-
-DESCRIPTION="An emulator for Nintendo Switch"
-HOMEPAGE="https://yuzu-emu.org"
-SRC_URI="https://github.com/yuzu-emu/yuzu-mainline/archive/dfaab8f6571856ec3c75cfad303a50503d213665.tar.gz -> ${P}.tar.gz
-	https://github.com/merryhime/dynarmic/archive/91d1f944e3870e0f3c505b48f5ec00ca9a82b95d.tar.gz -> ${PN}-dynarmic-${PV}.tar.gz
-	https://github.com/herumi/xbyak/archive/c306b8e5786eeeb87b8925a8af5c3bf057ff5a90.tar.gz -> ${PN}-xbyak-${PV}.tar.gz
-	compatibility-list? ( https://gist.githubusercontent.com/mazes-80/db6fc80114f67dde9d680de6c4d60428/raw/59274e6e641027cb6bf5e2077a899edabaf88904/yuzu-0_p20220725-compatibility_list.json )
-	discord? ( https://github.com/discord/discord-rpc/archive/963aa9f3e5ce81a4682c6ca3d136cddda614db33.tar.gz -> ${PN}-discord-${PV}.tar.gz )"
-# Dynarmic is not intended to be generic, it is tweaked to fit emulated processor
-# xbyak >= 5.96 still not in portage. sent version bump on gentoo BT, can't be in guru as package already exists
-# discord-rpc: help appreciated to make ebuild, as I never use it I surely will stick to snapshot download
-# TODO host compatibility_list.json
-
-LICENSE="|| ( Apache-2.0 GPL-2+ ) 0BSD BSD GPL-2+ ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+compatibility-list +cubeb discord +qt5 sdl webengine +webservice"
-
-RDEPEND="
-	<net-libs/mbedtls-3.1[cmac]
-	>=app-arch/zstd-1.5
-	>=dev-libs/libfmt-8:=
-	>=dev-libs/openssl-1.1:=
-	>=media-video/ffmpeg-4.3:=
-	app-arch/lz4:=
-	dev-libs/boost:=[context]
-	dev-libs/sirit
-	media-libs/opus
-	sys-libs/zlib
-	virtual/libusb:1
-	cubeb? ( media-libs/cubeb )
-	qt5? (
-		>=dev-qt/qtcore-5.15:5
-		>=dev-qt/qtgui-5.15:5
-		>=dev-qt/qtmultimedia-5.15:5
-		>=dev-qt/qtwidgets-5.15:5
-	)
-	sdl? (
-		>=media-libs/libsdl2-2.0.18
-		>=dev-libs/inih-52
-	)
-"
-DEPEND="${RDEPEND}
-	dev-cpp/cpp-httplib
-	>=dev-util/vulkan-headers-1.3.216
-"
-BDEPEND="
-	>=dev-cpp/nlohmann_json-3.8.0
-	dev-cpp/robin-map
-	dev-util/glslang
-	discord? ( >=dev-libs/rapidjson-1.1.0 )
-"
-S="${WORKDIR}"/yuzu-mainline-dfaab8f6571856ec3c75cfad303a50503d213665
-PATCHES=( "${FILESDIR}/${P}.patch" )
-
-REQUIRED_USE="|| ( qt5 sdl )"
-
-pkg_setup() {
-	if tc-is-gcc; then
-		[[ "$(gcc-major-version)" -lt 11 ]] && \
-			die "You need gcc version 11 or clang to compile this package"
-	fi
-}
-
-src_unpack() {
-	default
-	mv "${WORKDIR}"/xbyak* "${S}/externals/xbyak/xbyak" || die
-	mv "${WORKDIR}"/dynarmic*/* "${S}/externals/dynarmic" || die
-	if use discord; then
-		mv "${WORKDIR}"/discord*/* "${S}/externals/discord-rpc" || die
-	fi
-}
-
-src_prepare() {
-	# Allow skip submodule downloading
-	rm .gitmodules || die
-
-	if ! use discord; then
-		sed -i -e '/discord-rpc/d' externals/CMakeLists.txt || die
-	else
-		# Unbundle discord rapidjson
-		sed -i '/NOT RAPIDJSONTEST/,/endif(NOT RAPIDJSONTEST)/d;/find_file(RAPIDJSON/d;s:\${RAPIDJSON}:"/usr/include/rapidjson":' \
-			externals/discord-rpc/CMakeLists.txt || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local -a mycmakeargs=(
-		# Libraries are private and rely on circular dependency resolution.
-		-DBUILD_SHARED_LIBS=OFF # dynarmic
-		-DDYNARMIC_NO_BUNDLED_ROBIN_MAP=ON
-		-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=$(usex compatibility-list)
-		-DENABLE_CUBEB=$(usex cubeb)
-		-DENABLE_QT=$(usex qt5)
-		-DENABLE_QT_TRANSLATION=$(usex qt5)
-		-DENABLE_SDL2=$(usex sdl)
-		-DENABLE_WEB_SERVICE=$(usex webservice)
-		-DUSE_DISCORD_PRESENCE=$(usex discord)
-		-DYUZU_TESTS=OFF
-		-DYUZU_USE_BUNDLED_OPUS=OFF
-		-DYUZU_USE_EXTERNAL_SDL2=OFF
-		-DYUZU_USE_QT_WEB_ENGINE=$(usex webengine)
-	)
-
-	cmake_src_configure
-
-	if use compatibility-list; then
-		cp "${DISTDIR}"/${P}-compatibility_list.json "${BUILD_DIR}"/dist/compatibility_list/ || die
-	fi
-}

diff --git a/games-emulation/yuzu/yuzu-0_p20230202.ebuild b/games-emulation/yuzu/yuzu-0_p20230202.ebuild
index ef683cc24..0a33404db 100644
--- a/games-emulation/yuzu/yuzu-0_p20230202.ebuild
+++ b/games-emulation/yuzu/yuzu-0_p20230202.ebuild
@@ -7,12 +7,20 @@ inherit cmake toolchain-funcs xdg
 
 DESCRIPTION="An emulator for Nintendo Switch"
 HOMEPAGE="https://yuzu-emu.org"
-SRC_URI="https://github.com/yuzu-emu/yuzu-mainline/archive/d5f6201521cdfd0be09a187d62f95d3a38f18c3e.tar.gz -> ${P}.tar.gz
-	https://github.com/merryhime/dynarmic/archive/befe547d5631024a70d81d2ccee808bbfcb3854e.tar.gz -> ${PN}-dynarmic-${PV}.tar.gz
-	https://github.com/herumi/xbyak/archive/a1ac3750f9a639b5a6c6d6c7da4259b8d6790989.tar.gz -> ${PN}-xbyak-${PV}.tar.gz
+SRC_URI="https://github.com/yuzu-emu/yuzu-mainline/archive/d5f6201521cdfd0be09a187d62f95d3a38f18c3e.tar.gz
+		-> ${P}.tar.gz
+	https://github.com/merryhime/dynarmic/archive/befe547d5631024a70d81d2ccee808bbfcb3854e.tar.gz
+		-> ${PN}-dynarmic-${PV}.tar.gz
+	https://github.com/herumi/xbyak/archive/a1ac3750f9a639b5a6c6d6c7da4259b8d6790989.tar.gz
+		-> ${PN}-xbyak-${PV}.tar.gz
 	https://github.com/yuzu-emu/sirit/archive/ab75463999f4f3291976b079d42d52ee91eebf3f.tar.gz -> ${PN}-sirit-${PV}.tar.gz
-	compatibility-list? ( https://gist.githubusercontent.com/mazes-80/e3f1518e67c3292656a9055ba338994f/raw/b975f96366294d9cf65f844ed8df9189a488463d/yuzu-0_p20230202-compatibility_list.json )
-	discord? ( https://github.com/yuzu-emu/discord-rpc/archive/20cc99aeffa08a4834f156b6ab49ed68618cf94a.tar.gz -> ${PN}-discord-${PV}.tar.gz )"
+	compatibility-list? (
+		https://gist.githubusercontent.com/mazes-80/e3f1518e67c3292656a9055ba338994f/raw/b975f96366294d9cf65f844ed8df9189a488463d/${P}-compatibility_list.json
+	)
+	discord? (
+		https://github.com/yuzu-emu/discord-rpc/archive/20cc99aeffa08a4834f156b6ab49ed68618cf94a.tar.gz
+		-> ${PN}-discord-${PV}.tar.gz
+	)"
 # Dynarmic is not intended to be generic, it is tweaked to fit emulated processor
 # TODO wait 'xbyak' waiting version bump. see #860816
 
@@ -91,7 +99,8 @@ src_prepare() {
 		sed -i -e '/^if.*discord-rpc/,/^endif()/d' externals/CMakeLists.txt || die
 	else
 		# Unbundle discord rapidjson
-		sed -i '/NOT RAPIDJSONTEST/,/endif(NOT RAPIDJSONTEST)/d;/find_file(RAPIDJSON/d;s:\${RAPIDJSON}:"/usr/include/rapidjson":' \
+		sed -i -e '/NOT RAPIDJSONTEST/,/endif(NOT RAPIDJSONTEST)/d' \
+			-e '/find_file(RAPIDJSON/d' -e 's:\${RAPIDJSON}:"/usr/include/rapidjson":' \
 			externals/discord-rpc/CMakeLists.txt || die
 	fi
 

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index b44eff45d..6bc23133b 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.ebuild
@@ -28,8 +28,8 @@ RDEPEND="
 	>=net-libs/enet-1.3
 	app-arch/lz4:=
 	dev-libs/boost:=[context]
-	media-libs/vulkan-loader
 	media-libs/opus
+	media-libs/vulkan-loader
 	sys-libs/zlib
 	virtual/libusb:1
 	cubeb? ( media-libs/cubeb )
@@ -92,10 +92,10 @@ src_prepare() {
 
 	# Unbundle inih
 	sed -i -e '/^if.*inih/,/^endif()/d' externals/CMakeLists.txt || die
-	sed -i -e '1afind_package(PkgConfig REQUIRED)\npkg_check_modules(INIH REQUIRED INIReader)' src/yuzu_cmd/CMakeLists.txt || die
+	sed -i -e '1afind_package(PkgConfig REQUIRED)\npkg_check_modules(INIH REQUIRED INIReader)' \
+		src/yuzu_cmd/CMakeLists.txt || die
 	sed -i -e 's:inih/cpp/::' src/yuzu_cmd/config.cpp || die
 
-
 	# Unbundle mbedtls
 	sed -i -e '/mbedtls/d' externals/CMakeLists.txt || die
 	sed -i -e 's/mbedtls/& mbedcrypto mbedx509/' \
@@ -112,7 +112,8 @@ src_prepare() {
 		sed -i -e '/^if.*discord-rpc/,/^endif()/d' externals/CMakeLists.txt || die
 	else
 		# Unbundle discord rapidjson
-		sed -i '/NOT RAPIDJSONTEST/,/endif(NOT RAPIDJSONTEST)/d;/find_file(RAPIDJSON/d;s:\${RAPIDJSON}:"/usr/include/rapidjson":' \
+		sed -i -e '/NOT RAPIDJSONTEST/,/endif(NOT RAPIDJSONTEST)/d' \
+		-e '/find_file(RAPIDJSON/d' -e 's:\${RAPIDJSON}:"/usr/include/rapidjson":' \
 			externals/discord-rpc/CMakeLists.txt || die
 	fi
 
@@ -121,7 +122,8 @@ src_prepare() {
 	sed -i '/^if.*cubeb/,/^endif()/d' externals/CMakeLists.txt || die
 
 	# Unbundle cpp-httplib
-	sed -i -e '/^	# httplib/,/^	endif()/d' externals/CMakeLists.txt || die
+	sed -i -e '/httplib/s/ 0.11//' CMakeLists.txt || die
+	sed -i -e '/^# httplib/,/^endif()/d' externals/CMakeLists.txt || die
 
 	# Unbundle enet
 	sed -i -e '/^if.*enet/,/^endif()/d' externals/CMakeLists.txt || die


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
  2023-02-13 11:28 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
@ 2023-02-13 11:19 ` Andrew Ammerlaan
  0 siblings, 0 replies; 57+ messages in thread
From: Andrew Ammerlaan @ 2023-02-13 11:19 UTC (permalink / raw
  To: gentoo-commits

commit:     a6665eb35415e5930fe579a6ee0735312c7f920a
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 13 11:19:17 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Feb 13 11:19:17 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a6665eb3

games-emulation/yuzu: update Manifest

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> 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 6f3809999cc5736c7cf3001b4485095dd00d2ad8d5d3459dea0aed006c3361731823a181adf94edd612ffdc8a6fb0c697f7f70cfb1402953c95a9fdd0faaae42
 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


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2023-02-14 11:11 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2023-02-14 11:11 UTC (permalink / raw
  To: gentoo-commits

commit:     c7f8ceb9ce51dd6b26182ec1c01f93e269fc3762
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Tue Feb 14 11:10:56 2023 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Tue Feb 14 11:10:56 2023 +0000
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 <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/metadata.xml     | 27 +++++++++++++++------------
 games-emulation/yuzu/yuzu-9999.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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<name>Samuel Bauer</name>
-	<email>samuel.bauer@yahoo.fr</email>
-</maintainer>
-<use>
-	<flag name="cubeb">Enables the cubeb audio backend</flag>
-	<flag name="compatibility-list">Downloads the latest compatibility list</flag>
-	<flag name="discord">Enables Discord Rich Presence</flag>
-	<flag name="system-vulkan">Use system dev-util/vulkan-headers</flag>
-	<flag name="webengine">Use QtWebEngine for web applet implementation</flag>
-	<flag name="webservice">Enable web services (telemetry, etc.)</flag>
-</use>
+	<maintainer type="person">
+		<name>Samuel Bauer</name>
+		<email>samuel.bauer@yahoo.fr</email>
+	</maintainer>
+	<use>
+		<flag name="cubeb">Enables the cubeb audio backend</flag>
+		<flag name="compatibility-list">Downloads the latest compatibility list</flag>
+		<flag name="discord">Enables Discord Rich Presence</flag>
+		<flag name="system-vulkan">Use system dev-util/vulkan-headers</flag>
+		<flag name="webengine">Use QtWebEngine for web applet implementation</flag>
+		<flag name="webservice">Enable web services (telemetry, etc.)</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">herumi/xbyak</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 6bc23133b..424b891a1 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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' \


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2023-02-14 11:32 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2023-02-14 11:32 UTC (permalink / raw
  To: gentoo-commits

commit:     20d7e9d674763c44e2dd3eeced64a0fa39229221
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Tue Feb 14 11:31:05 2023 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Tue Feb 14 11:31:05 2023 +0000
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 <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 424b891a1..77ba325b2 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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 '<dev-util/glslang-1.3.238'; then
+		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
+	fi
 
 	cmake_src_prepare
 }


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2023-06-15 13:03 YiFei Zhu
  0 siblings, 0 replies; 57+ messages in thread
From: YiFei Zhu @ 2023-06-15 13:03 UTC (permalink / raw
  To: gentoo-commits

commit:     9443686b4a91ed06071e272c0a46043daa28e3c5
Author:     YiFei Zhu <zhuyifei1999 <AT> gmail <DOT> com>
AuthorDate: Thu Jun 15 13:02:02 2023 +0000
Commit:     YiFei Zhu <zhuyifei1999 <AT> gmail <DOT> com>
CommitDate: Thu Jun 15 13:03:14 2023 +0000
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 <zhuyifei1999 <AT> gmail.com>

 games-emulation/yuzu/yuzu-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 77ba325b2..328d46033 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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? ( <dev-cpp/catch-3:0 )
 "
 BDEPEND="


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2023-06-26 19:13 Henri Gasc
  0 siblings, 0 replies; 57+ messages in thread
From: Henri Gasc @ 2023-06-26 19:13 UTC (permalink / raw
  To: gentoo-commits

commit:     1dee546738af6aec870f785c1447ce98863bb2a7
Author:     Henri Gasc <gasc <AT> eurecom <DOT> fr>
AuthorDate: Mon Jun 26 18:43:35 2023 +0000
Commit:     Henri Gasc <gasc <AT> eurecom <DOT> fr>
CommitDate: Mon Jun 26 19:13:41 2023 +0000
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 <gasc <AT> eurecom.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 328d46033..71ccdae2e 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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 )
+	test? ( >dev-cpp/catch-3:0 )
 "
 BDEPEND="
 	>=dev-cpp/nlohmann_json-3.8.0


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2023-07-03 15:53 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2023-07-03 15:53 UTC (permalink / raw
  To: gentoo-commits

commit:     1a6b571d506d5f7aee259a49a42370e3d82e8be3
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Mon Jul  3 15:52:52 2023 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Mon Jul  3 15:52:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1a6b571d

games-emulation/yuzu-9999: update submodules

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 71ccdae2e..6b5af1f7c 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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="
 	<net-libs/mbedtls-3.1[cmac]
 	>=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 '<dev-util/glslang-1.3.238'; then
-		sed -i -e '/Vulkan/s/238/236/' CMakeLists.txt || die
+	if use system-vulkan -a has_version '<dev-util/glslang-1.3.246'; then
+		sed -i -e '/Vulkan/s/246/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' \
@@ -160,11 +161,12 @@ src_configure() {
 		-DENABLE_QT_TRANSLATION=$(usex qt5)
 		-DENABLE_SDL2=$(usex sdl)
 		-DENABLE_WEB_SERVICE=$(usex webservice)
-		-DSIRIT_USE_SYSTEM_SPIRV_HEADERS=yes
+		-DSIRIT_USE_SYSTEM_SPIRV_HEADERS=$([ use system-vulkan ] && echo OFF || echo ON)
 		-DUSE_DISCORD_PRESENCE=$(usex discord)
 		-DYUZU_TESTS=$(usex test)
-		-DYUZU_USE_EXTERNAL_VULKAN_HEADERS=$(use system-vulkan no yes)
+		-DYUZU_USE_EXTERNAL_VULKAN_HEADERS=$([ use system-vulkan ] && echo ON || echo OFF)
 		-DYUZU_USE_EXTERNAL_SDL2=OFF
+		-DYUZU_CHECK_SUBMODULES=false
 		-DYUZU_USE_QT_WEB_ENGINE=$(usex webengine)
 	)
 


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2023-07-03 16:19 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2023-07-03 16:19 UTC (permalink / raw
  To: gentoo-commits

commit:     0617347f3761dbce5228a738e05f1ee14e1dda87
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Mon Jul  3 16:18:19 2023 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Mon Jul  3 16:18:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0617347f

games-emulation/yuzu-9999: update metadata.xml

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 6b5af1f7c..3c766c21b 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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 )
 "


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2023-07-04 20:36 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2023-07-04 20:36 UTC (permalink / raw
  To: gentoo-commits

commit:     15e61867c9f8b5b3f0b1203dc2b255f03f020f45
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Tue Jul  4 20:35:16 2023 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Tue Jul  4 20:35:16 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=15e61867

games-emulation/yuzu-9999: forgot xbyak

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/metadata.xml     | 5 +++--
 games-emulation/yuzu/yuzu-9999.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 @@
 		<email>samuel.bauer@yahoo.fr</email>
 	</maintainer>
 	<use>
-		<flag name="cubeb">Enables the cubeb audio backend</flag>
 		<flag name="compatibility-list">Downloads the latest compatibility list</flag>
+		<flag name="cubeb">Enables the cubeb audio backend</flag>
 		<flag name="discord">Enables Discord Rich Presence</flag>
+		<flag name="system-libfmt">Use system dev-libs/libfmt</flag>
 		<flag name="system-vulkan">Use system dev-util/vulkan-headers</flag>
 		<flag name="webengine">Use QtWebEngine for web applet implementation</flag>
 		<flag name="webservice">Enable web services (telemetry, etc.)</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">herumi/xbyak</remote-id>
+		<remote-id type="github">yuzu-emu/yuzu-mainline</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 3c766c21b..3b74ec067 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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
 


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2023-07-13  6:46 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2023-07-13  6:46 UTC (permalink / raw
  To: gentoo-commits

commit:     cbebdcd20f8c55d1eaf0390088dec68c98b0325c
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Thu Jul 13 06:36:13 2023 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Thu Jul 13 06:36:13 2023 +0000
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 <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 3b74ec067..7116a20e0 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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 '<dev-util/glslang-1.3.246'; then
-		sed -i -e '/Vulkan/s/246/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
+	if use system-vulkan -a has_version '<dev-util/glslang-1.3.256'; then
+		sed -i '/Vulkan/s/256/250/' CMakeLists.txt
 	fi
 
 	cmake_src_prepare


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2023-09-01 19:13 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2023-09-01 19:13 UTC (permalink / raw
  To: gentoo-commits

commit:     76ea7f2f64417304149b26e88a7a20598856de71
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Fri Sep  1 19:12:42 2023 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Fri Sep  1 19:12:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=76ea7f2f

games-emulation/yuzu: update to build system

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 7116a20e08..643b5c664b 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2023-09-28  6:16 Samuel Bauer
  0 siblings, 0 replies; 57+ messages in thread
From: Samuel Bauer @ 2023-09-28  6:16 UTC (permalink / raw
  To: gentoo-commits

commit:     84ad412348ec16c19667fdca83936ae80785fba3
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Thu Sep 28 06:14:42 2023 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Thu Sep 28 06:14:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=84ad4123

games-emulation/yuzu: update live ebuild

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 643b5c664b..56db5e9755 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2024-01-03 19:55 Moritz Brunner
  0 siblings, 0 replies; 57+ messages in thread
From: Moritz Brunner @ 2024-01-03 19:55 UTC (permalink / raw
  To: gentoo-commits

commit:     14c6088d3f5b399441f27905cbe231b3cc619cb3
Author:     Moritz Brunner <moritz.brunner+gentoo <AT> posteo <DOT> de>
AuthorDate: Wed Jan  3 19:49:54 2024 +0000
Commit:     Moritz Brunner <moritz.brunner+gentoo <AT> posteo <DOT> de>
CommitDate: Wed Jan  3 19:54:28 2024 +0000
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 <moritz.brunner+gentoo <AT> posteo.de>

 games-emulation/yuzu/yuzu-9999.ebuild | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 56db5e9755..8e4293715c 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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/' \


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2024-01-03 19:55 Moritz Brunner
  0 siblings, 0 replies; 57+ messages in thread
From: Moritz Brunner @ 2024-01-03 19:55 UTC (permalink / raw
  To: gentoo-commits

commit:     360ea775e40cc4110d30b62db6bec7e0a7d6b997
Author:     Moritz Brunner <moritz.brunner+gentoo <AT> posteo <DOT> de>
AuthorDate: Wed Jan  3 19:51:08 2024 +0000
Commit:     Moritz Brunner <moritz.brunner+gentoo <AT> posteo <DOT> de>
CommitDate: Wed Jan  3 19:54:49 2024 +0000
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 -9999 is required.

Also include libX11 in dependencies, since the headers are
required by Vulkan.

Signed-off-by: Moritz Brunner <moritz.brunner+gentoo <AT> posteo.de>

 games-emulation/yuzu/yuzu-9999.ebuild | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 8e4293715c..b562223aa9 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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="


^ permalink raw reply related	[flat|nested] 57+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
@ 2024-01-08  6:05 Takuya Wakazono
  0 siblings, 0 replies; 57+ messages in thread
From: Takuya Wakazono @ 2024-01-08  6:05 UTC (permalink / raw
  To: gentoo-commits

commit:     2c36fd3324a5c88d1cc6db39d09e1a5d4118deaf
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Mon Jan  8 06:03:40 2024 +0000
Commit:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Mon Jan  8 06:03:40 2024 +0000
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 <pastalian46 <AT> gmail.com>

 games-emulation/yuzu/yuzu-0_p20230202.ebuild | 5 +----
 games-emulation/yuzu/yuzu-9999.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-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index b562223aa9..e6f42589a9 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.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


^ permalink raw reply related	[flat|nested] 57+ messages in thread

end of thread, other threads:[~2024-01-08  6:05 UTC | newest]

Thread overview: 57+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-07 13:56 [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/ Anna Vyalkova
  -- strict thread matches above, loose matches on Subject: below --
2024-01-08  6:05 Takuya Wakazono
2024-01-03 19:55 Moritz Brunner
2024-01-03 19:55 Moritz Brunner
2023-09-28  6:16 Samuel Bauer
2023-09-01 19:13 Samuel Bauer
2023-07-13  6:46 Samuel Bauer
2023-07-04 20:36 Samuel Bauer
2023-07-03 16:19 Samuel Bauer
2023-07-03 15:53 Samuel Bauer
2023-06-26 19:13 Henri Gasc
2023-06-15 13:03 YiFei Zhu
2023-02-14 11:32 Samuel Bauer
2023-02-14 11:11 Samuel Bauer
2023-02-13 11:28 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2023-02-13 11:19 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2023-02-13  0:10 Samuel Bauer
2023-02-05 18:26 Samuel Bauer
2023-02-05 18:15 Samuel Bauer
2023-02-02 20:02 Artemis Everfree
2023-02-02 15:14 Samuel Bauer
2022-12-21 10:03 Samuel Bauer
2022-12-21 10:03 Samuel Bauer
2022-12-21  4:23 Samuel Bauer
2022-12-19 22:42 Samuel Bauer
2022-11-13  1:06 Samuel Bauer
2022-10-12 12:03 Samuel Bauer
2022-09-09 13:49 Samuel Bauer
2022-09-08 10:24 Andrew Ammerlaan
2022-08-08 11:04 Samuel Bauer
2022-08-04 10:05 Samuel Bauer
2022-08-04 10:05 Samuel Bauer
2022-07-26 22:26 Samuel Bauer
2022-07-26  2:20 Samuel Bauer
2022-07-24 23:12 Samuel Bauer
2022-06-07 13:09 Samuel Bauer
2022-01-21  3:31 Samuel Bauer
2022-01-16  4:03 Samuel Bauer
2022-01-08  0:25 Samuel Bauer
2021-10-06  8:14 Samuel Bauer
2021-08-20 22:21 Samuel Bauer
2021-08-04  0:36 Samuel Bauer
2021-08-04  0:30 Samuel Bauer
2021-07-13  1:52 Samuel Bauer
2021-06-26  1:16 Samuel Bauer
2021-06-05  0:57 Samuel Bauer
2021-05-30 19:21 Samuel Bauer
2021-05-30 19:06 Samuel Bauer
2021-05-30 18:55 Samuel Bauer
2021-05-25 18:24 Samuel Bauer
2021-05-16 13:50 Samuel Bauer
2021-05-03 16:41 Samuel Bauer
2021-04-30  1:10 Samuel Bauer
2021-04-29 14:19 Samuel Bauer
2021-04-29 12:53 Samuel Bauer
2021-04-28 23:34 Samuel Bauer
2021-04-28 23:11 Samuel Bauer
2021-04-28 20:09 Andrew Ammerlaan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox