[gentoo-commits] repo/proj/guru:master commit in: games-emulation/rpcs3/, games-emulation/rpcs3/files/
commit: e94aae8fe0dc39882a76462cd83eae818673e887
Author: Gonçalo Negrier Duarte gmail com>
AuthorDate: Sun Apr 14 17:31:28 2024 +
Commit: Julien Roy jroy ca>
CommitDate: Sun Apr 14 21:07:14 2024 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e94aae8f
games-emulation/rpcs3: fix compile error on llvm-18
* https://github.com/RPCS3/rpcs3/issues/15448
* and releases logic to ebuild
* release 0.0.31 not added since it fails to compile on my system
Signed-off-by: Gonçalo Negrier Duarte gmail.com>
...-0001-gui_pad_thread-add-missing-unistd-h.patch | 29 +
games-emulation/rpcs3/rpcs3-.ebuild| 69 --
2 files changed, 92 insertions(+), 6 deletions(-)
diff --git
a/games-emulation/rpcs3/files/rpcs3-0001-gui_pad_thread-add-missing-unistd-h.patch
b/games-emulation/rpcs3/files/rpcs3-0001-gui_pad_thread-add-missing-unistd-h.patch
new file mode 100644
index 00..7bd67c06e3
--- /dev/null
+++
b/games-emulation/rpcs3/files/rpcs3-0001-gui_pad_thread-add-missing-unistd-h.patch
@@ -0,0 +1,29 @@
+From 5d3427acaad0084caee0051c846efe9a333e5428 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Gon=C3=A7alo=20Negrier=20Duarte?=
+
+Date: Sun, 14 Apr 2024 17:58:50 +0100
+Subject: [PATCH] rpcs3-gui_pad_thread-add-missing-unistd-h
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Gonçalo Negrier Duarte
+---
+ rpcs3/Input/gui_pad_thread.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/rpcs3/Input/gui_pad_thread.cpp b/rpcs3/Input/gui_pad_thread.cpp
+index 92fb23367..e3dbae518 100644
+--- a/rpcs3/Input/gui_pad_thread.cpp
b/rpcs3/Input/gui_pad_thread.cpp
+@@ -22,6 +22,7 @@
+ #ifdef __linux__
+ #include
+ #include
++#include
+ #define CHECK_IOCTRL_RET(res) if (res == -1) { gui_log.error("gui_pad_thread:
ioctl failed (errno=%d=%s)", res, strerror(errno)); }
+ #elif defined(__APPLE__)
+ #pragma GCC diagnostic push
+--
+2.44.0
+
diff --git a/games-emulation/rpcs3/rpcs3-.ebuild
b/games-emulation/rpcs3/rpcs3-.ebuild
index 7162b888ce..ec248dd211 100644
--- a/games-emulation/rpcs3/rpcs3-.ebuild
+++ b/games-emulation/rpcs3/rpcs3-.ebuild
@@ -3,15 +3,37 @@
EAPI=8
-inherit cmake flag-o-matic git-r3 xdg
+inherit cmake flag-o-matic xdg
+
+ASMJIT_COMMIT="416f7356967c1f66784dc1580fe157f9406d8bff"
+GLSLANG_COMMIT="36d08c0d940cf307a23928299ef52c7970d8cee6"
+MINIUPNP_COMMIT="f22a96b4697699d32fdc2d17c5d0ad7880a99c24"
+RTMIDI_COMMIT="1e5b49925aa60065db52de44c366d446a902547b"
+WOLFSSL_COMMIT="8970ff4c34034dbb3594943d11f8c9d4c5512bd5"
+SOUNDTOUCH_COMMIT="ced3ce8d5ecc5aef8a5156fea206a37b33774bf3"
+YAMLCPP_COMMIT="456c68f452da09d8ca84b375faa2b1397713eaba"
DESCRIPTION="PS3 emulator/debugger"
HOMEPAGE="https://rpcs3.net/;
-EGIT_REPO_URI="https://github.com/RPCS3/rpcs3;
-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' )
+if [[ ${PV} == "" ]]; 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' )
+ # Delete sources when ensuring yaml-cpp compiled with fexceptions
+ EGIT_SUBMODULES+=( '3rdparty/yaml-cpp' )
+ inherit git-r3
+else
+ SRC_URI="
+ https://github.com/RPCS3/rpcs3/archive/v${PV}.tar.gz ->
${P}.tar.gz
+
https://github.com/asmjit/asmjit/archive/${ASMJIT_COMMIT}.tar.gz ->
${PN}-asmjit-${ASMJIT_COMMIT}.tar.gz
+
https://github.com/KhronosGroup/glslang/archive/${GLSLANG_COMMIT}.tar.gz ->
${PN}-glslang-${GLSLANG_COMMIT}.tar.gz
+
https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_COMMIT}.tar.gz ->
${PN}-miniupnp-${MINIUPNP_COMMIT}.tar.gz
+
https://github.com/thestk/rtmidi/archive/${RTMIDI_COMMIT}.tar.gz ->
${PN}-rtmidi-${RTMIDI_COMMIT}.tar.gz
+
https://github.com/wolfSSL/wolfssl/archive/${WOLFSSL_COMMIT}.tar.gz ->
${PN}-wolfssl-${WOLFSSL_COMMIT}.tar.gz
+
https://github.com/RPCS3/soundtouch/archive/${SOUNDTOUCH_COMMIT}.tar.gz ->
${PN}-soundtouch-${SOUNDTOUCH_COMMIT}.tar.gz
+
https://github.com/RPCS3/yaml-cpp/archive/${YAMLCPP_COMMIT}.tar.gz ->
${PN}-yaml-cpp-${SOUNDTOUCH_COMMIT}-.tar.gz
+ "
+ KEYWORDS="~amd64"
+fi
LICENSE="GPL-2"
SLOT="0"
@@ -46,7 +68,42 @@ RDEPEND="${DEPEND}"
QA_PREBUILT="usr/share/rpcs3/test/.*"
QA_WX_LOAD="usr/share/rpcs3/test/*"
+PATCHES=(
+ "${FILESDIR}/${PN}-0001-gui_pad_thread-add-missing-unistd-h.patch"
+)
+
+
src_prepare() {
+ if [[ ${PV} != "" ]]; then
+ rmdir "${S}/3rdparty/asmjit/asmjit" || die
+ mv
[gentoo-commits] repo/proj/guru:master commit in: games-emulation/rpcs3/
commit: 42f3c0c3837e731da27884887591c9d5de03c7c6
Author: Takuya Wakazono gmail com>
AuthorDate: Sat Jan 20 03:43:24 2024 +
Commit: David Roman gmail com>
CommitDate: Sat Jan 20 03:43:24 2024 +
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 gmail.com>
games-emulation/rpcs3/rpcs3-.ebuild | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/games-emulation/rpcs3/rpcs3-.ebuild
b/games-emulation/rpcs3/rpcs3-.ebuild
index e25d866035..9d29476c8c 100644
--- a/games-emulation/rpcs3/rpcs3-.ebuild
+++ b/games-emulation/rpcs3/rpcs3-.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}"
[gentoo-commits] repo/proj/guru:master commit in: games-emulation/rpcs3/
commit: 2ac8755a01f7ee322fecfe9870f5934c54c9902e
Author: Takuya Wakazono gmail com>
AuthorDate: Thu Jan 11 09:23:09 2024 +
Commit: David Roman gmail com>
CommitDate: Thu Jan 11 09:33:11 2024 +
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 gmail.com>
games-emulation/rpcs3/rpcs3-.ebuild | 74 +
1 file changed, 38 insertions(+), 36 deletions(-)
diff --git a/games-emulation/rpcs3/rpcs3-.ebuild
b/games-emulation/rpcs3/rpcs3-.ebuild
index 79dbf9f98b..e25d866035 100644
--- a/games-emulation/rpcs3/rpcs3-.ebuild
+++ b/games-emulation/rpcs3/rpcs3-.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:":/}'
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
+
[gentoo-commits] repo/proj/guru:master commit in: games-emulation/rpcs3/
commit: 2916f3c39c3cdeaf04dcb988b9e7b4d9c282f568 Author: Gregory Williams gmail com> AuthorDate: Fri Oct 28 16:36:48 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Oct 28 16:36:48 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2916f3c3 games-emulation/rpcs3: Add missing dependencies Signed-off-by: Gregory Williams gmail.com> games-emulation/rpcs3/rpcs3-.ebuild | 3 +++ 1 file changed, 3 insertions(+) diff --git a/games-emulation/rpcs3/rpcs3-.ebuild b/games-emulation/rpcs3/rpcs3-.ebuild index 9d98a7d11..79dbf9f98 100644 --- a/games-emulation/rpcs3/rpcs3-.ebuild +++ b/games-emulation/rpcs3/rpcs3-.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"
[gentoo-commits] repo/proj/guru:master commit in: games-emulation/rpcs3/, games-emulation/flycast/, games-puzzle/atris/
commit: 13d0567091bb7cb0960cca7d52c46c7240c9ed57 Author: Samuel Bauer yahoo fr> AuthorDate: Sat Apr 9 00:56:20 2022 + Commit: Ronny Gutbrod tastytea de> CommitDate: Sat Apr 9 00:56:20 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=13d05670 Update erroneous mail adress Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/flycast/metadata.xml | 2 +- games-emulation/rpcs3/metadata.xml | 2 +- games-puzzle/atris/metadata.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/games-emulation/flycast/metadata.xml b/games-emulation/flycast/metadata.xml index 52ac37312..5ce3596eb 100644 --- a/games-emulation/flycast/metadata.xml +++ b/games-emulation/flycast/metadata.xml @@ -3,7 +3,7 @@ mazes-80 - mazes...@none.org + samuel.ba...@yahoo.fr Compile vulkan backend diff --git a/games-emulation/rpcs3/metadata.xml b/games-emulation/rpcs3/metadata.xml index dbfd1804e..d5a864189 100644 --- a/games-emulation/rpcs3/metadata.xml +++ b/games-emulation/rpcs3/metadata.xml @@ -3,7 +3,7 @@ mazes-80 - mazes...@github.com + samuel.ba...@yahoo.fr Enables Discord Rich Presence diff --git a/games-puzzle/atris/metadata.xml b/games-puzzle/atris/metadata.xml index 68c4ef50a..442cf22b1 100644 --- a/games-puzzle/atris/metadata.xml +++ b/games-puzzle/atris/metadata.xml @@ -3,7 +3,7 @@ mazes-80 - mazes...@none.org + samuel.ba...@yahoo.fr Enable atris sound pack
[gentoo-commits] repo/proj/guru:master commit in: games-emulation/rpcs3/
commit: 73627f6d8729986ac58c69667e20904aca25cddb Author: Samuel Bauer yahoo fr> AuthorDate: Fri Feb 18 10:13:36 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Fri Feb 18 10:13:36 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=73627f6d games-emulation/rpcs: include soundtouch Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/rpcs3/rpcs3-.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/games-emulation/rpcs3/rpcs3-.ebuild b/games-emulation/rpcs3/rpcs3-.ebuild index 9e9a829bd..d9f599d7a 100644 --- a/games-emulation/rpcs3/rpcs3-.ebuild +++ b/games-emulation/rpcs3/rpcs3-.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' )
