diff --git a/_service b/_service index 14e9df3..ee6f155 100644 --- a/_service +++ b/_service @@ -6,9 +6,14 @@ @PARENT_TAG@~git%cd v(.*) enable + 3rdparty/curl/curl 3rdparty/ffmpeg + 3rdparty/libpng/libpng + 3rdparty/libsdl-org + 3rdparty/libusb 3rdparty/llvm 3rdparty/XAudio2Redist + 3rdparty/zlib/zlib *.bat *.cmd *.dll @@ -35,4 +40,3 @@ - diff --git a/_servicedata b/_servicedata index d173516..1707709 100644 --- a/_servicedata +++ b/_servicedata @@ -5,4 +5,4 @@ https://github.com/RPCS3/rpcs3.git - 06b0e35fb9ec0a98e37432614b5b74538ea8b400 \ No newline at end of file + 711afeb6882c052e27cd77cf054614a414dac2dc \ No newline at end of file diff --git a/fix-toolbar-color.patch b/fix-toolbar-color.patch new file mode 100644 index 0000000..73ef03d --- /dev/null +++ b/fix-toolbar-color.patch @@ -0,0 +1,86 @@ +From 40133bb5a3a4240b9ea6f617fdf353e4f4507ffb Mon Sep 17 00:00:00 2001 +From: Guo Yunhe +Date: Tue, 11 Apr 2023 23:00:47 +0800 +Subject: [PATCH 1/3] fix toolbar text color in dark theme + +--- + rpcs3/rpcs3qt/stylesheets.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/rpcs3/rpcs3qt/stylesheets.h b/rpcs3/rpcs3qt/stylesheets.h +index 9121d03609c..89488a36e99 100644 +--- a/rpcs3/rpcs3qt/stylesheets.h ++++ b/rpcs3/rpcs3qt/stylesheets.h +@@ -17,7 +17,7 @@ namespace gui + "QSlider#sizeSlider::groove:horizontal { border-radius: .15em; background: #5b5b5b; height: .3em; }" + + // main window toolbar +- "QToolBar#mw_toolbar { background-color: #F0F0F0; border: none; }" ++ "QToolBar#mw_toolbar { color: #505050; background-color: #F0F0F0; border: none; }" + "QToolBar#mw_toolbar::separator { background-color: rgba(207, 207, 207, 235); width: 0.125em; margin-top: 0.250em; margin-bottom: 0.250em; }" + + // main window toolbar icon color + +From 564e4cfce0b32effcf104c07a243a6ef68177631 Mon Sep 17 00:00:00 2001 +From: Guo Yunhe +Date: Tue, 11 Apr 2023 23:34:15 +0800 +Subject: [PATCH 2/3] Update stylesheets.h + +--- + rpcs3/rpcs3qt/stylesheets.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/rpcs3/rpcs3qt/stylesheets.h b/rpcs3/rpcs3qt/stylesheets.h +index 89488a36e99..17a686acefa 100644 +--- a/rpcs3/rpcs3qt/stylesheets.h ++++ b/rpcs3/rpcs3qt/stylesheets.h +@@ -17,11 +17,11 @@ namespace gui + "QSlider#sizeSlider::groove:horizontal { border-radius: .15em; background: #5b5b5b; height: .3em; }" + + // main window toolbar +- "QToolBar#mw_toolbar { color: #505050; background-color: #F0F0F0; border: none; }" +- "QToolBar#mw_toolbar::separator { background-color: rgba(207, 207, 207, 235); width: 0.125em; margin-top: 0.250em; margin-bottom: 0.250em; }" ++ //"QToolBar#mw_toolbar { color: #505050; background-color: #F0F0F0; border: none; }" ++ //"QToolBar#mw_toolbar::separator { background-color: rgba(207, 207, 207, 235); width: 0.125em; margin-top: 0.250em; margin-bottom: 0.250em; }" + + // main window toolbar icon color +- "QLabel#toolbar_icon_color { color: #5b5b5b; }" ++ //"QLabel#toolbar_icon_color { color: #5b5b5b; }" + + // thumbnail icon color + "QLabel#thumbnail_icon_color { color: rgba(0, 100, 231, 255); }" + +From 5db33b57999d935b6d7d1ebd428237e89dfe12cb Mon Sep 17 00:00:00 2001 +From: Guo Yunhe +Date: Tue, 11 Apr 2023 23:43:03 +0800 +Subject: [PATCH 3/3] Update stylesheets.h + +--- + rpcs3/rpcs3qt/stylesheets.h | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/rpcs3/rpcs3qt/stylesheets.h b/rpcs3/rpcs3qt/stylesheets.h +index 17a686acefa..787981920e4 100644 +--- a/rpcs3/rpcs3qt/stylesheets.h ++++ b/rpcs3/rpcs3qt/stylesheets.h +@@ -9,15 +9,15 @@ namespace gui + const QString default_style_sheet + ( + // main window toolbar search +- "QLineEdit#mw_searchbar { padding: 0 1em; background: #fdfdfd; selection-background-color: #148aff; margin: .8em; color:#000000; }" ++ //"QLineEdit#mw_searchbar { padding: 0 1em; background: #fdfdfd; selection-background-color: #148aff; margin: .8em; color:#000000; }" + + // main window toolbar slider +- "QSlider#sizeSlider { color: #505050; background: #F0F0F0; }" +- "QSlider#sizeSlider::handle:horizontal { border: 0em smooth rgba(227, 227, 227, 255); border-radius: .58em; background: #404040; width: 1.2em; margin: -.5em 0; }" +- "QSlider#sizeSlider::groove:horizontal { border-radius: .15em; background: #5b5b5b; height: .3em; }" ++ //"QSlider#sizeSlider { color: #505050; background: #F0F0F0; }" ++ //"QSlider#sizeSlider::handle:horizontal { border: 0em smooth rgba(227, 227, 227, 255); border-radius: .58em; background: #404040; width: 1.2em; margin: -.5em 0; }" ++ //"QSlider#sizeSlider::groove:horizontal { border-radius: .15em; background: #5b5b5b; height: .3em; }" + + // main window toolbar +- //"QToolBar#mw_toolbar { color: #505050; background-color: #F0F0F0; border: none; }" ++ //"QToolBar#mw_toolbar { background-color: #F0F0F0; border: none; }" + //"QToolBar#mw_toolbar::separator { background-color: rgba(207, 207, 207, 235); width: 0.125em; margin-top: 0.250em; margin-bottom: 0.250em; }" + + // main window toolbar icon color diff --git a/rpcs3-0.0.27~git20230411.tar.xz b/rpcs3-0.0.27~git20230411.tar.xz deleted file mode 100644 index 904c7ca..0000000 --- a/rpcs3-0.0.27~git20230411.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4ad592ad756b0dcc7e76499957c3df840583e64227c7e34cb7cb50cd0117d463 -size 62380192 diff --git a/rpcs3-0.0.27~git20230427.tar.xz b/rpcs3-0.0.27~git20230427.tar.xz new file mode 100644 index 0000000..922d397 --- /dev/null +++ b/rpcs3-0.0.27~git20230427.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:212682b81a452813ff655072e6fcb95ce1dc73360b626559ab48512be154d30a +size 52133372 diff --git a/rpcs3.changes b/rpcs3.changes index 644f535..c3d7edd 100644 --- a/rpcs3.changes +++ b/rpcs3.changes @@ -1,3 +1,128 @@ +------------------------------------------------------------------- +Fri Apr 28 12:08:36 UTC 2023 - i@guoyunhe.me + +- Update to version 0.0.27~git20230427: + * Qt: only do a hard refresh when new games may have been added + * Qt: keep game list data when toggling between list and grid layouts + * Qt: fix futurewatcher cancel + * Qt: Fix data race and undefined behaviour in games_config + * Decrease some include madness + * screenshot manager: use flow layout + * Qt: async game list parsing + * Qt: move experimental build warning to gui_application + * rsx: Fix up the framebuffer width if the pitch fits scissor but not the clip width + * Qt: fix adding vsh to gamelist + * Qt: lazy load save data icons + +------------------------------------------------------------------- +Mon Apr 24 12:08:06 UTC 2023 - i@guoyunhe.me + +- Update to version 0.0.27~git20230423: + * Qt: fix savedata dialog exception + * Qt: lazy load trophy icons + * SPU LLVM: disable AVX2 shift intrinsics + * Qt: fix table item delegate usage + * VS: fix filters + * Game List: Make Ctrl+f Focus On The Search Bar + * UI: Ignore trademark as a fallback when searching games + * UI: Focus to game searchbar on load + * Qt: Set icon size function properly + * Update FAudio to v 23.04 + * Update SDL to v 2.26.5 + * Update miniupnp to v 2.3.3 + * Qt: properly invalidate item pointer in grid mode + * Qt: Lazy load game grid icons and optimize paint method for invisible items + * Qt: Remove unused list layout handling of repaint watcher + * Qt: don't calculate sizes in grid mode + * Qt: lazy load game list icons and dir size + * Qt: multithreaded file testing during refresh + * Qt: Minor optimization during list refresh + * SPU LLVM: fixup custom LICM pass + * Emu: Cache games.yml and only save when necessary + * unself: rename SCEVersionInfo to version_header + * unself: rename SectionInfo to segment_ext_header + * unself: some more documentation + * unself: rename AppInfo to program_identification_header + * unself: rename SelfHeader to ext_hdr + * SPU LLVM: sink stores deeper in custom LICM pass + * fix warnings + * Remove add_only from main_window::Boot args + * Optimize AddGamesFromDir a bit + * Reduce IO With Game Library Loading + * Path to LLVM library fixed in Debug + * SPU LLVM: upgrade custom DSE pass + * formatting + * gl: Refactor attachment clear logic + * Keep preceding 0 in firmware strings + * Keep second 0 in firmware strings + * Qt: add option to reset time played + * Qt: add grid filters + * Qt: add checkbox to restart dialog + * BufferUtils: fix SSE2 path for byteswaps + * rsx: Add Ultra shader precision setting for costly accuracy settings + * vk: Promote barycentric interpolation to 64-bit + * SPU LLVM: make savestates unsavable inside the code + * SPU LLVM: optimize register stores + * Implement sceNpManagerGetCachedInfo + +------------------------------------------------------------------- +Mon Apr 17 14:19:08 UTC 2023 - Yunhe Guo + +- Use system SDL2 + +------------------------------------------------------------------- +Mon Apr 17 13:20:09 UTC 2023 - Yunhe Guo + +- Use system libusb + +------------------------------------------------------------------- +Mon Apr 17 13:07:12 UTC 2023 - i@guoyunhe.me + +- Update to version 0.0.27~git20230416: + * Invert the DJ Hero Turntable crossfader axis bind. On Xbox 360 turntables, Crossfade Left is Y Down, Crossfade Right is Y Up. Also simplify turntable/left stick input. + * Round squircled axis values to nearest whole number + +------------------------------------------------------------------- +Sat Apr 15 10:40:18 UTC 2023 - i@guoyunhe.me + +- Update to version 0.0.27~git20230415: + * SPU LLVM: use volatile stores for PC update + * jit: Fix vec_cmp_eq + +------------------------------------------------------------------- +Sat Apr 15 08:58:07 UTC 2023 - i@guoyunhe.me + +- Update to version 0.0.27~git20230414: + * Fix tmp path in updater + +------------------------------------------------------------------- +Fri Apr 14 16:21:29 UTC 2023 - i@guoyunhe.me + +- Update to version 0.0.27~git20230414: + * SPU LLVM: use atomic loads in read channel count + * SPU LLVM: fix savestate safety guards + * PPU LLVM: disable DSE pass and use volatile store/loads + * Add savestate buttons to home menu + * cellMic: fix mic type regression + * cellMic: fallback to proper sampling rate if necessary + * cellMic: change some log levels + * cellMic: fallback to 4,2,1 channels by default + * cellMic: add some error checks + * cellMic: minor format changes for readability + * Debugger: Fix step over (#13649) + * Try even lower + * vk: GTX970 workaround + * Forces deterministic FP operations when online + * Loader: Make executable analyzation not halt UI when launching games + * Fix deref in cellSaveData log + * Update build-mac.sh + * Skylander Portal: Trap Team Audio Transfers + +------------------------------------------------------------------- +Tue Apr 11 15:56:48 UTC 2023 - Yunhe Guo + +- Added fix-toolbar-color.patch + ------------------------------------------------------------------- Tue Apr 11 12:50:42 UTC 2023 - i@guoyunhe.me diff --git a/rpcs3.spec b/rpcs3.spec index 74102cd..5e91bba 100644 --- a/rpcs3.spec +++ b/rpcs3.spec @@ -17,7 +17,7 @@ Name: rpcs3 -Version: 0.0.27~git20230411 +Version: 0.0.27~git20230427 Release: 0 Summary: PS3 emulator/debugger License: GPL-2.0-only @@ -25,6 +25,7 @@ URL: https://rpcs3.net Source0: %{name}-%{version}.tar.xz Source1: intel-ittapi.tar.xz Patch1: fix-test-files.patch +Patch2: fix-toolbar-color.patch BuildRequires: gcc-c++ BuildRequires: llvm16-devel BuildRequires: cmake(x86-64) >= 3.14.1 @@ -33,6 +34,7 @@ BuildRequires: pkgconfig(libedit) BuildRequires: pkgconfig(libevdev) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libudev) +BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(yaml-cpp) BuildRequires: pkgconfig(zlib) @@ -42,6 +44,7 @@ BuildRequires: pkgconfig(zlib) ##opengl: BuildRequires: pkgconfig(glew) >= 1.13.0 BuildRequires: pkgconfig(glu) +BuildRequires: pkgconfig(sdl2) ##vulkan: BuildRequires: pkgconfig(vulkan) >= 1.1.126 @@ -94,6 +97,7 @@ An open-source PlayStation 3 emulator/debugger written in C++. %prep %setup -q -a 1 %patch1 -p 1 +%patch2 -p 1 #Generate Version Strings GIT_VERSION=$(echo %{version} | sed 's|.*git|git~|g') @@ -127,13 +131,15 @@ cd ../%{name}_build -DITTAPI_SOURCE_DIR="${ITTAPI_DIR}" \ -DUSE_PCH=OFF \ -DENABLE_PCH=OFF \ - -DSKIP_PRECOMPILE_HEADERS="ON" \ - -DUSE_PRECOMPILED_HEADERS="OFF" \ - -DUSE_SYSTEM_CURL="ON" \ - -DUSE_SYSTEM_FFMPEG="ON" \ - -DUSE_SYSTEM_LIBPNG="ON" \ - -DUSE_SYSTEM_ZLIB="ON" \ - -DUSE_NATIVE_INSTRUCTIONS="OFF" \ + -DSKIP_PRECOMPILE_HEADERS=ON \ + -DUSE_PRECOMPILED_HEADERS=OFF \ + -DUSE_SYSTEM_CURL=ON \ + -DUSE_SYSTEM_FFMPEG=ON \ + -DUSE_SYSTEM_LIBPNG=ON \ + -DUSE_SYSTEM_LIBUSB=ON \ + -DUSE_SYSTEM_SDL=ON \ + -DUSE_SYSTEM_ZLIB=ON \ + -DUSE_NATIVE_INSTRUCTIONS=OFF \ -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ -DCMAKE_INSTALL_LIBEXEC="%{_libexecdir}" \ -DCMAKE_BUILD_TYPE="Release" \