public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/rpcs3/
@ 2022-01-23  9:27 Samuel Bauer
  0 siblings, 0 replies; 10+ messages in thread
From: Samuel Bauer @ 2022-01-23  9:27 UTC (permalink / raw
  To: gentoo-commits

commit:     68ed3810865c04a44a869d5daca151b394f6fb39
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Sun Jan 23 09:26:50 2022 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Sun Jan 23 09:26:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=68ed3810

games-emulation/rpcs3: new ebuild

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

 games-emulation/rpcs3/metadata.xml      |  14 +++++
 games-emulation/rpcs3/rpcs3-9999.ebuild | 104 ++++++++++++++++++++++++++++++++
 2 files changed, 118 insertions(+)

diff --git a/games-emulation/rpcs3/metadata.xml b/games-emulation/rpcs3/metadata.xml
new file mode 100644
index 000000000..dbfd1804e
--- /dev/null
+++ b/games-emulation/rpcs3/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-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>
+</maintainer>
+<use>
+	<flag name="discord">Enables Discord Rich Presence</flag>
+	<flag name="faudio">Add faudio sound backend support</flag>
+	<flag name="llvm">Use llvm idk what for</flag>
+	<flag name="vulkan">Build vulkan renderer</flag>
+</use>
+</pkgmetadata>

diff --git a/games-emulation/rpcs3/rpcs3-9999.ebuild b/games-emulation/rpcs3/rpcs3-9999.ebuild
new file mode 100644
index 000000000..9e9a829bd
--- /dev/null
+++ b/games-emulation/rpcs3/rpcs3-9999.ebuild
@@ -0,0 +1,104 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic git-r3 xdg
+
+DESCRIPTION="PS3 emulator/debugger"
+HOMEPAGE="https://rpcs3.net/"
+EGIT_REPO_URI="https://github.com/RPCS3/rpcs3"
+EGIT_SUBMODULES=( '-*' 'asmjit' 'llvm' '3rdparty/flatbuffers' '3rdparty/wolfssl' )
+# Delete sources when ensuring yaml-cpp compiled with fexceptions
+EGIT_SUBMODULES+=( '3rdparty/yaml-cpp' )
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+
+DEPEND="alsa? ( media-libs/alsa-lib )
+	faudio? ( app-emulation/faudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	app-arch/p7zip
+	dev-libs/libevdev
+	dev-libs/pugixml
+	media-libs/cubeb
+	media-libs/libpng
+	media-libs/openal
+	sys-libs/zlib"
+#	dev-cpp/yaml-cpp
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+IUSE="alsa discord faudio +llvm pulseaudio vulkan wayland"
+
+src_unpack() {
+	git clone https://github.com/intel/ittapi "${WORKDIR}"/ittapi
+	git-r3_src_unpack
+}
+
+src_prepare() {
+	append-cflags -DNDEBUG -Wno-error=stringop-truncation
+	append-cppflags -DNDEBUG -Wno-error=stringop-truncation
+
+	# Disable cache
+	sed -i -e '/find_program(CCACHE_FOUND/d' -e '/_FLAGS/d' \
+		CMakeLists.txt || die
+
+	# Unbundle hidapi
+	sed -i -e '/hidapi\.h/{s:":<hidapi/:;s/"/>/}' rpcs3/Input/hid_pad_handler.h || die
+	sed -i -e '/hidapi/d' 3rdparty/CMakeLists.txt
+	sed -i -e '1afind_package(PkgConfig REQUIRED)\npkg_check_modules(hidapi-hidraw REQUIRED hidapi-hidraw)' rpcs3/CMakeLists.txt
+	sed -i -e 's/3rdparty::hidapi/hidapi-hidraw/' rpcs3/CMakeLists.txt rpcs3/rpcs3qt/CMakeLists.txt || die
+	sed -i -e 's/hid_write_control/hid_write/' rpcs3/Input/dualsense_pad_handler.cpp rpcs3/Input/ds4_pad_handler.cpp || die
+
+	# Move ittapi to the right place via cmake
+	local regex='/GIT_EXECUTABLE} clone/s!(.*!(COMMAND mv '
+	regex+="${WORKDIR}"
+	regex+='/ittapi \${ITTAPI_SOURCE_DIR}!'
+	sed -i -e "${regex}" \
+		llvm/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt || die ${regex}
+
+	# Unbundle cubeb
+	sed -i -e '/cubeb/d' 3rdparty/CMakeLists.txt || die
+	sed -i -e '$afind_package(cubeb)\n' CMakeLists.txt || die
+	sed -i -e 's/3rdparty::cubeb/cubeb/' rpcs3/Emu/CMakeLists.txt || die
+
+	# Unbundle yaml-cpp: system yaml-cpp should be compiled with -fexceptions
+	# sed -i -e '/yaml-cpp/d' 3rdparty/CMakeLists.txt || die
+	# sed -i -e '$afind_package(yaml-cpp)\n' CMakeLists.txt || die
+	# sed -i -e 's/3rdparty::yaml-cpp/yaml-cpp/' rpcs3/Emu/CMakeLists.txt \
+	#	rpcs3/rpcs3qt/CMakeLists.txt || die
+
+	# Unbundle glslang SPIRV
+	sed -i -e '/add_subdirectory(glslang/d' \
+		-e '/add_subdirectory(SPIRV/d' \
+		-e '/if(VULKAN_FOUND)/afind_library(SPIRV libSPIRV.so)\nfind_library(SPIRV-Tools-opt libSPIRV-Tools-opt.so)\n' \
+		-e '/target_link_libraries.*SPIRV/{s/SPIRV-Tools-opt/${&}/;s/SPIRV /${SPIRV} /}' \
+		3rdparty/CMakeLists.txt || die
+	sed -i -e '/#include "SPIRV/{s:":<glslang/:;s/"/>/}' rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LLVM_SUBMODULE=ON # ennoying really
+		-DBUILD_SHARED_LIBS=OFF # to remove after unbundling
+		-DUSE_DISCORD_RPC=$(usex discord)
+		-DUSE_FAUDIO=$(usex faudio)
+		-DUSE_PRECOMPILED_HEADERS=ON
+		-DUSE_SYSTEM_CURL=ON
+		-DUSE_SYSTEM_LIBPNG=ON
+		-DUSE_SYSTEM_LIBUSB=ON
+		-DUSE_SYSTEM_PUGIXML=ON
+		-DUSE_SYSTEM_XXHASH=ON
+		-DUSE_SYSTEM_ZLIB=ON
+		-DUSE_VULKAN=$(usex vulkan)
+		-DWITH_LLVM=$(usex llvm)
+	)
+	use faudio && mycmakeargs+=( -DUSE_SYSTEM_FAUDIO=$(usex faudio) )
+	CMAKE_BUILD_TYPE=RELEASE cmake_src_configure
+	sed -i -e 's/FFMPEG_LIB_AVFORMAT-NOTFOUND/avformat/' -e 's/FFMPEG_LIB_AVCODEC-NOTFOUND/avcodec/' \
+		-e 's/FFMPEG_LIB_AVUTIL-NOTFOUND/avutil/' -e 's/FFMPEG_LIB_SWSCALE-NOTFOUND/swscale/' "${BUILD_DIR}"/build.ninja || die
+}


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

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

commit:     73627f6d8729986ac58c69667e20904aca25cddb
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Fri Feb 18 10:13:36 2022 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Fri Feb 18 10:13:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=73627f6d

games-emulation/rpcs: include soundtouch

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

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

diff --git a/games-emulation/rpcs3/rpcs3-9999.ebuild b/games-emulation/rpcs3/rpcs3-9999.ebuild
index 9e9a829bd..d9f599d7a 100644
--- a/games-emulation/rpcs3/rpcs3-9999.ebuild
+++ b/games-emulation/rpcs3/rpcs3-9999.ebuild
@@ -8,7 +8,8 @@ inherit cmake flag-o-matic git-r3 xdg
 DESCRIPTION="PS3 emulator/debugger"
 HOMEPAGE="https://rpcs3.net/"
 EGIT_REPO_URI="https://github.com/RPCS3/rpcs3"
-EGIT_SUBMODULES=( '-*' 'asmjit' 'llvm' '3rdparty/flatbuffers' '3rdparty/wolfssl' )
+EGIT_SUBMODULES=( 'asmjit' 'llvm' '3rdparty/flatbuffers' '3rdparty/wolfssl'
+	'3rdparty/SoundTouch/soundtouch' )
 # Delete sources when ensuring yaml-cpp compiled with fexceptions
 EGIT_SUBMODULES+=( '3rdparty/yaml-cpp' )
 


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

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

commit:     e337953cb279a235cfe601c735eab9f5f5cee217
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Tue Jun  7 13:04:02 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=e337953c

games-emulation/rpcs3: fixes: filter compile flags, support for ffmpeg

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

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

diff --git a/games-emulation/rpcs3/rpcs3-9999.ebuild b/games-emulation/rpcs3/rpcs3-9999.ebuild
index d9f599d7a..9d98a7d11 100644
--- a/games-emulation/rpcs3/rpcs3-9999.ebuild
+++ b/games-emulation/rpcs3/rpcs3-9999.ebuild
@@ -43,7 +43,7 @@ src_prepare() {
 	append-cppflags -DNDEBUG -Wno-error=stringop-truncation
 
 	# Disable cache
-	sed -i -e '/find_program(CCACHE_FOUND/d' -e '/_FLAGS/d' \
+	sed -i -e '/find_program(CCACHE_FOUND/d' -e '/set(.*_FLAGS/d' \
 		CMakeLists.txt || die
 
 	# Unbundle hidapi
@@ -101,5 +101,6 @@ src_configure() {
 	use faudio && mycmakeargs+=( -DUSE_SYSTEM_FAUDIO=$(usex faudio) )
 	CMAKE_BUILD_TYPE=RELEASE cmake_src_configure
 	sed -i -e 's/FFMPEG_LIB_AVFORMAT-NOTFOUND/avformat/' -e 's/FFMPEG_LIB_AVCODEC-NOTFOUND/avcodec/' \
-		-e 's/FFMPEG_LIB_AVUTIL-NOTFOUND/avutil/' -e 's/FFMPEG_LIB_SWSCALE-NOTFOUND/swscale/' "${BUILD_DIR}"/build.ninja || die
+		-e 's/FFMPEG_LIB_AVUTIL-NOTFOUND/avutil/' -e 's/FFMPEG_LIB_SWSCALE-NOTFOUND/swscale/' \
+		-e 's/FFMPEG_LIB_SWRESAMPLE-NOTFOUND/swresample/' "${BUILD_DIR}"/build.ninja || die
 }


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

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/rpcs3/
@ 2022-10-28 16:39 Gregory Williams
  0 siblings, 0 replies; 10+ messages in thread
From: Gregory Williams @ 2022-10-28 16:39 UTC (permalink / raw
  To: gentoo-commits

commit:     2916f3c39c3cdeaf04dcb988b9e7b4d9c282f568
Author:     Gregory Williams <gregwills85 <AT> gmail <DOT> com>
AuthorDate: Fri Oct 28 16:36:48 2022 +0000
Commit:     Gregory Williams <gregwills85 <AT> gmail <DOT> com>
CommitDate: Fri Oct 28 16:36:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2916f3c3

games-emulation/rpcs3: Add missing dependencies

Signed-off-by: Gregory Williams <gregwills85 <AT> gmail.com>

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

diff --git a/games-emulation/rpcs3/rpcs3-9999.ebuild b/games-emulation/rpcs3/rpcs3-9999.ebuild
index 9d98a7d11..79dbf9f98 100644
--- a/games-emulation/rpcs3/rpcs3-9999.ebuild
+++ b/games-emulation/rpcs3/rpcs3-9999.ebuild
@@ -21,9 +21,12 @@ DEPEND="alsa? ( media-libs/alsa-lib )
 	faudio? ( app-emulation/faudio )
 	pulseaudio? ( media-sound/pulseaudio )
 	app-arch/p7zip
+	dev-libs/hidapi
 	dev-libs/libevdev
 	dev-libs/pugixml
+	dev-libs/xxhash
 	media-libs/cubeb
+	media-libs/glew
 	media-libs/libpng
 	media-libs/openal
 	sys-libs/zlib"


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

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/rpcs3/
@ 2024-01-11  9:34 Takuya Wakazono
  0 siblings, 0 replies; 10+ messages in thread
From: Takuya Wakazono @ 2024-01-11  9:34 UTC (permalink / raw
  To: gentoo-commits

commit:     2ac8755a01f7ee322fecfe9870f5934c54c9902e
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Thu Jan 11 09:23:09 2024 +0000
Commit:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Thu Jan 11 09:33:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2ac8755a

games-emulation/rpcs3: update live

Closes: https://bugs.gentoo.org/893430
Closes: https://bugs.gentoo.org/897760
Closes: https://bugs.gentoo.org/912983
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>

 games-emulation/rpcs3/rpcs3-9999.ebuild | 74 +++++++++++++++++----------------
 1 file changed, 38 insertions(+), 36 deletions(-)

diff --git a/games-emulation/rpcs3/rpcs3-9999.ebuild b/games-emulation/rpcs3/rpcs3-9999.ebuild
index 79dbf9f98b..e25d866035 100644
--- a/games-emulation/rpcs3/rpcs3-9999.ebuild
+++ b/games-emulation/rpcs3/rpcs3-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,60 +8,58 @@ inherit cmake flag-o-matic git-r3 xdg
 DESCRIPTION="PS3 emulator/debugger"
 HOMEPAGE="https://rpcs3.net/"
 EGIT_REPO_URI="https://github.com/RPCS3/rpcs3"
-EGIT_SUBMODULES=( 'asmjit' 'llvm' '3rdparty/flatbuffers' '3rdparty/wolfssl'
+EGIT_SUBMODULES=( 'asmjit' '3rdparty/miniupnp/miniupnp' '3rdparty/rtmidi/rtmidi' '3rdparty/wolfssl'
 	'3rdparty/SoundTouch/soundtouch' )
 # Delete sources when ensuring yaml-cpp compiled with fexceptions
 EGIT_SUBMODULES+=( '3rdparty/yaml-cpp' )
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+IUSE="alsa discord faudio +llvm pulseaudio vulkan wayland"
 
-DEPEND="alsa? ( media-libs/alsa-lib )
-	faudio? ( app-emulation/faudio )
-	pulseaudio? ( media-sound/pulseaudio )
+DEPEND="
 	app-arch/p7zip
+	dev-libs/flatbuffers
 	dev-libs/hidapi
 	dev-libs/libevdev
 	dev-libs/pugixml
 	dev-libs/xxhash
+	dev-qt/qtbase:6[concurrent,dbus,gui,widgets]
+	dev-qt/qtmultimedia:6
+	dev-qt/qtsvg:6
 	media-libs/cubeb
 	media-libs/glew
-	media-libs/libpng
+	media-libs/libglvnd
+	media-libs/libpng:=
 	media-libs/openal
-	sys-libs/zlib"
-#	dev-cpp/yaml-cpp
+	media-video/ffmpeg:=
+	net-misc/curl
+	sys-devel/llvm:=
+	sys-libs/zlib
+	virtual/libusb:1
+	alsa? ( media-libs/alsa-lib )
+	faudio? ( app-emulation/faudio )
+	pulseaudio? ( media-libs/libpulse )
+	vulkan? ( media-libs/vulkan-loader )
+	wayland? ( dev-libs/wayland )
+"
 RDEPEND="${DEPEND}"
-BDEPEND=""
 
-IUSE="alsa discord faudio +llvm pulseaudio vulkan wayland"
-
-src_unpack() {
-	git clone https://github.com/intel/ittapi "${WORKDIR}"/ittapi
-	git-r3_src_unpack
-}
+QA_PREBUILT="usr/share/rpcs3/test/.*"
+QA_WX_LOAD="usr/share/rpcs3/test/*"
 
 src_prepare() {
-	append-cflags -DNDEBUG -Wno-error=stringop-truncation
-	append-cppflags -DNDEBUG -Wno-error=stringop-truncation
-
-	# Disable cache
-	sed -i -e '/find_program(CCACHE_FOUND/d' -e '/set(.*_FLAGS/d' \
-		CMakeLists.txt || die
+	# Disable automagic ccache
+	sed -i -e '/find_program(CCACHE_FOUND ccache)/d' CMakeLists.txt || die
 
 	# Unbundle hidapi
 	sed -i -e '/hidapi\.h/{s:":<hidapi/:;s/"/>/}' rpcs3/Input/hid_pad_handler.h || die
-	sed -i -e '/hidapi/d' 3rdparty/CMakeLists.txt
-	sed -i -e '1afind_package(PkgConfig REQUIRED)\npkg_check_modules(hidapi-hidraw REQUIRED hidapi-hidraw)' rpcs3/CMakeLists.txt
+	sed -i -e '/hidapi/d' 3rdparty/CMakeLists.txt || die
+	sed -i -e '1afind_package(PkgConfig REQUIRED)\npkg_check_modules(hidapi-hidraw REQUIRED hidapi-hidraw)' \
+		rpcs3/CMakeLists.txt || die
 	sed -i -e 's/3rdparty::hidapi/hidapi-hidraw/' rpcs3/CMakeLists.txt rpcs3/rpcs3qt/CMakeLists.txt || die
-	sed -i -e 's/hid_write_control/hid_write/' rpcs3/Input/dualsense_pad_handler.cpp rpcs3/Input/ds4_pad_handler.cpp || die
-
-	# Move ittapi to the right place via cmake
-	local regex='/GIT_EXECUTABLE} clone/s!(.*!(COMMAND mv '
-	regex+="${WORKDIR}"
-	regex+='/ittapi \${ITTAPI_SOURCE_DIR}!'
-	sed -i -e "${regex}" \
-		llvm/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt || die ${regex}
+	sed -i -e 's/hid_write_control/hid_write/' \
+		rpcs3/Input/dualsense_pad_handler.cpp rpcs3/Input/ds4_pad_handler.cpp || die
 
 	# Unbundle cubeb
 	sed -i -e '/cubeb/d' 3rdparty/CMakeLists.txt || die
@@ -86,23 +84,27 @@ src_prepare() {
 }
 
 src_configure() {
+	filter-lto
+
 	local mycmakeargs=(
-		-DBUILD_LLVM_SUBMODULE=ON # ennoying really
 		-DBUILD_SHARED_LIBS=OFF # to remove after unbundling
-		-DUSE_DISCORD_RPC=$(usex discord)
-		-DUSE_FAUDIO=$(usex faudio)
 		-DUSE_PRECOMPILED_HEADERS=ON
 		-DUSE_SYSTEM_CURL=ON
+		-DUSE_SYSTEM_FFMPEG=ON
+		-DUSE_SYSTEM_FLATBUFFERS=ON
 		-DUSE_SYSTEM_LIBPNG=ON
 		-DUSE_SYSTEM_LIBUSB=ON
 		-DUSE_SYSTEM_PUGIXML=ON
 		-DUSE_SYSTEM_XXHASH=ON
 		-DUSE_SYSTEM_ZLIB=ON
+		-DUSE_DISCORD_RPC=$(usex discord)
+		-DUSE_FAUDIO=$(usex faudio)
 		-DUSE_VULKAN=$(usex vulkan)
 		-DWITH_LLVM=$(usex llvm)
 	)
 	use faudio && mycmakeargs+=( -DUSE_SYSTEM_FAUDIO=$(usex faudio) )
-	CMAKE_BUILD_TYPE=RELEASE cmake_src_configure
+	cmake_src_configure
+
 	sed -i -e 's/FFMPEG_LIB_AVFORMAT-NOTFOUND/avformat/' -e 's/FFMPEG_LIB_AVCODEC-NOTFOUND/avcodec/' \
 		-e 's/FFMPEG_LIB_AVUTIL-NOTFOUND/avutil/' -e 's/FFMPEG_LIB_SWSCALE-NOTFOUND/swscale/' \
 		-e 's/FFMPEG_LIB_SWRESAMPLE-NOTFOUND/swresample/' "${BUILD_DIR}"/build.ninja || die


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

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/rpcs3/
@ 2024-01-20  3:53 Takuya Wakazono
  0 siblings, 0 replies; 10+ messages in thread
From: Takuya Wakazono @ 2024-01-20  3:53 UTC (permalink / raw
  To: gentoo-commits

commit:     42f3c0c3837e731da27884887591c9d5de03c7c6
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Sat Jan 20 03:43:24 2024 +0000
Commit:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Sat Jan 20 03:43:24 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=42f3c0c3

games-emulation/rpcs3: lock vulkan SDKs version

Upstream only supports 1.3.268 for now.

Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>

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

diff --git a/games-emulation/rpcs3/rpcs3-9999.ebuild b/games-emulation/rpcs3/rpcs3-9999.ebuild
index e25d866035..9d29476c8c 100644
--- a/games-emulation/rpcs3/rpcs3-9999.ebuild
+++ b/games-emulation/rpcs3/rpcs3-9999.ebuild
@@ -40,7 +40,10 @@ DEPEND="
 	alsa? ( media-libs/alsa-lib )
 	faudio? ( app-emulation/faudio )
 	pulseaudio? ( media-libs/libpulse )
-	vulkan? ( media-libs/vulkan-loader )
+	vulkan? (
+		~dev-util/glslang-1.3.268
+		~media-libs/vulkan-loader-1.3.268
+	)
 	wayland? ( dev-libs/wayland )
 "
 RDEPEND="${DEPEND}"


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

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/rpcs3/
@ 2024-03-09  6:04 Takuya Wakazono
  0 siblings, 0 replies; 10+ messages in thread
From: Takuya Wakazono @ 2024-03-09  6:04 UTC (permalink / raw
  To: gentoo-commits

commit:     3eac696ec8007e6ee3d30a53349f898c069e2cf3
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Sat Mar  9 05:18:42 2024 +0000
Commit:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Sat Mar  9 06:02:08 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3eac696e

games-emulation/rpcs3: unbundle glslang

It needs a specific version of vulkan sdks.

Bug: https://bugs.gentoo.org/926213
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>

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

diff --git a/games-emulation/rpcs3/rpcs3-9999.ebuild b/games-emulation/rpcs3/rpcs3-9999.ebuild
index 9d29476c8c..d2202eaaf4 100644
--- a/games-emulation/rpcs3/rpcs3-9999.ebuild
+++ b/games-emulation/rpcs3/rpcs3-9999.ebuild
@@ -8,7 +8,7 @@ inherit cmake flag-o-matic git-r3 xdg
 DESCRIPTION="PS3 emulator/debugger"
 HOMEPAGE="https://rpcs3.net/"
 EGIT_REPO_URI="https://github.com/RPCS3/rpcs3"
-EGIT_SUBMODULES=( 'asmjit' '3rdparty/miniupnp/miniupnp' '3rdparty/rtmidi/rtmidi' '3rdparty/wolfssl'
+EGIT_SUBMODULES=( 'asmjit' '3rdparty/glslang' '3rdparty/miniupnp/miniupnp' '3rdparty/rtmidi/rtmidi' '3rdparty/wolfssl'
 	'3rdparty/SoundTouch/soundtouch' )
 # Delete sources when ensuring yaml-cpp compiled with fexceptions
 EGIT_SUBMODULES+=( '3rdparty/yaml-cpp' )
@@ -40,10 +40,7 @@ DEPEND="
 	alsa? ( media-libs/alsa-lib )
 	faudio? ( app-emulation/faudio )
 	pulseaudio? ( media-libs/libpulse )
-	vulkan? (
-		~dev-util/glslang-1.3.268
-		~media-libs/vulkan-loader-1.3.268
-	)
+	vulkan? ( media-libs/vulkan-loader[wayland?] )
 	wayland? ( dev-libs/wayland )
 "
 RDEPEND="${DEPEND}"
@@ -75,14 +72,6 @@ src_prepare() {
 	# sed -i -e 's/3rdparty::yaml-cpp/yaml-cpp/' rpcs3/Emu/CMakeLists.txt \
 	#	rpcs3/rpcs3qt/CMakeLists.txt || die
 
-	# Unbundle glslang SPIRV
-	sed -i -e '/add_subdirectory(glslang/d' \
-		-e '/add_subdirectory(SPIRV/d' \
-		-e '/if(VULKAN_FOUND)/afind_library(SPIRV libSPIRV.so)\nfind_library(SPIRV-Tools-opt libSPIRV-Tools-opt.so)\n' \
-		-e '/target_link_libraries.*SPIRV/{s/SPIRV-Tools-opt/${&}/;s/SPIRV /${SPIRV} /}' \
-		3rdparty/CMakeLists.txt || die
-	sed -i -e '/#include "SPIRV/{s:":<glslang/:;s/"/>/}' rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp || die
-
 	cmake_src_prepare
 }
 
@@ -105,7 +94,10 @@ src_configure() {
 		-DUSE_VULKAN=$(usex vulkan)
 		-DWITH_LLVM=$(usex llvm)
 	)
+	# These options are defined conditionally to suppress QA notice
 	use faudio && mycmakeargs+=( -DUSE_SYSTEM_FAUDIO=$(usex faudio) )
+	use vulkan && mycmakeargs+=( $(cmake_use_find_package wayland Wayland) )
+
 	cmake_src_configure
 
 	sed -i -e 's/FFMPEG_LIB_AVFORMAT-NOTFOUND/avformat/' -e 's/FFMPEG_LIB_AVCODEC-NOTFOUND/avcodec/' \


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

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/rpcs3/
@ 2024-03-09  6:19 Takuya Wakazono
  0 siblings, 0 replies; 10+ messages in thread
From: Takuya Wakazono @ 2024-03-09  6:19 UTC (permalink / raw
  To: gentoo-commits

commit:     05ef3818352045903afbb5aea95bcd2cca58434e
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Sat Mar  9 06:15:49 2024 +0000
Commit:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Sat Mar  9 06:15:49 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=05ef3818

games-emulation/rpcs3: remove useless USE flags

Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>

 games-emulation/rpcs3/rpcs3-9999.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/games-emulation/rpcs3/rpcs3-9999.ebuild b/games-emulation/rpcs3/rpcs3-9999.ebuild
index d2202eaaf4..7162b888ce 100644
--- a/games-emulation/rpcs3/rpcs3-9999.ebuild
+++ b/games-emulation/rpcs3/rpcs3-9999.ebuild
@@ -15,7 +15,7 @@ EGIT_SUBMODULES+=( '3rdparty/yaml-cpp' )
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa discord faudio +llvm pulseaudio vulkan wayland"
+IUSE="discord faudio +llvm vulkan wayland"
 
 DEPEND="
 	app-arch/p7zip
@@ -37,9 +37,7 @@ DEPEND="
 	sys-devel/llvm:=
 	sys-libs/zlib
 	virtual/libusb:1
-	alsa? ( media-libs/alsa-lib )
 	faudio? ( app-emulation/faudio )
-	pulseaudio? ( media-libs/libpulse )
 	vulkan? ( media-libs/vulkan-loader[wayland?] )
 	wayland? ( dev-libs/wayland )
 "


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

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/rpcs3/
@ 2024-06-13 12:12 Kostadin Shishmanov
  0 siblings, 0 replies; 10+ messages in thread
From: Kostadin Shishmanov @ 2024-06-13 12:12 UTC (permalink / raw
  To: gentoo-commits

commit:     3891a6901aeedf84830e0c1d4363933a56fd8e33
Author:     Kostadin Shishmanov <kocelfc <AT> tutanota <DOT> com>
AuthorDate: Thu Jun 13 11:55:40 2024 +0000
Commit:     Kostadin Shishmanov <kocelfc <AT> tutanota <DOT> com>
CommitDate: Thu Jun 13 12:12:34 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3891a690

games-emulation/rpcs3: fix build, remove some files

Add new git submodules that are needed:
(zstd, stblib and openal-soft)

Remove some files that shouldn't be needed:
(/usr/share/rpcs3/{git,test})

Closes: https://bugs.gentoo.org/934194
Signed-off-by: Kostadin Shishmanov <kocelfc <AT> tutanota.com>

 games-emulation/rpcs3/rpcs3-9999.ebuild | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/games-emulation/rpcs3/rpcs3-9999.ebuild b/games-emulation/rpcs3/rpcs3-9999.ebuild
index 27d67610b..8e9ac66c7 100644
--- a/games-emulation/rpcs3/rpcs3-9999.ebuild
+++ b/games-emulation/rpcs3/rpcs3-9999.ebuild
@@ -17,7 +17,10 @@ DESCRIPTION="PS3 emulator/debugger"
 HOMEPAGE="https://rpcs3.net/"
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/RPCS3/rpcs3"
-	EGIT_SUBMODULES=( 'asmjit' '3rdparty/glslang' '3rdparty/miniupnp/miniupnp' '3rdparty/rtmidi/rtmidi' '3rdparty/wolfssl' '3rdparty/SoundTouch/soundtouch' )
+	EGIT_SUBMODULES=(
+	'asmjit' '3rdparty/glslang' '3rdparty/miniupnp/miniupnp' '3rdparty/rtmidi/rtmidi' '3rdparty/wolfssl'
+	'3rdparty/SoundTouch/soundtouch' '3rdparty/zstd/zstd' '3rdparty/stblib/stb' '3rdparty/OpenAL/openal-soft'
+	)
 	# Delete sources when ensuring yaml-cpp compiled with fexceptions
 	EGIT_SUBMODULES+=( '3rdparty/yaml-cpp' )
 	inherit git-r3
@@ -153,3 +156,10 @@ src_configure() {
 		-e 's/FFMPEG_LIB_AVUTIL-NOTFOUND/avutil/' -e 's/FFMPEG_LIB_SWSCALE-NOTFOUND/swscale/' \
 		-e 's/FFMPEG_LIB_SWRESAMPLE-NOTFOUND/swresample/' "${BUILD_DIR}"/build.ninja || die
 }
+
+src_install() {
+	cmake_src_install
+
+	# remove unneccessary files to save some space
+	rm -rf "${ED}/usr/share/rpcs3/"{git,test} || die
+}


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

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/rpcs3/
@ 2024-06-25 21:10 Aiden Wingard
  0 siblings, 0 replies; 10+ messages in thread
From: Aiden Wingard @ 2024-06-25 21:10 UTC (permalink / raw
  To: gentoo-commits

commit:     867bc32066b3f7c6ebe684f11bf89a31958c210d
Author:     kernaltrap8 <kernaltrap <AT> gmail <DOT> com>
AuthorDate: Tue Jun 25 21:09:59 2024 +0000
Commit:     Aiden Wingard <kernaltrap <AT> gmail <DOT> com>
CommitDate: Tue Jun 25 21:09:59 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=867bc320

games-emulation/rpcs3: fix llvm USE description in metadata.xml

Signed-off-by: kernaltrap8 <kernaltrap <AT> gmail.com>

 games-emulation/rpcs3/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/rpcs3/metadata.xml b/games-emulation/rpcs3/metadata.xml
index 95c264d48..64cbd48f9 100644
--- a/games-emulation/rpcs3/metadata.xml
+++ b/games-emulation/rpcs3/metadata.xml
@@ -8,7 +8,7 @@
 <use>
 	<flag name="discord">Enables Discord Rich Presence</flag>
 	<flag name="faudio">Add faudio sound backend support</flag>
-	<flag name="llvm">Use llvm idk what for</flag>
+	<flag name="llvm">Use llvm backend for PPU cache generation</flag>
 	<flag name="vulkan">Build vulkan renderer</flag>
 </use>
 </pkgmetadata>


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

end of thread, other threads:[~2024-06-25 21:10 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-28 16:39 [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/rpcs3/ Gregory Williams
  -- strict thread matches above, loose matches on Subject: below --
2024-06-25 21:10 Aiden Wingard
2024-06-13 12:12 Kostadin Shishmanov
2024-03-09  6:19 Takuya Wakazono
2024-03-09  6:04 Takuya Wakazono
2024-01-20  3:53 Takuya Wakazono
2024-01-11  9:34 Takuya Wakazono
2022-06-07 13:09 Samuel Bauer
2022-02-18 10:14 Samuel Bauer
2022-01-23  9:27 Samuel Bauer

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