Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 5338a4f
Author: Stenzek <[email protected]>
Date:   Sat Dec 2 14:24:15 2023 +1000

    GS/HW: Add 'Align To Native' HPO mode

commit e2dcabc
Author: Stenzek <[email protected]>
Date:   Mon Dec 4 22:34:48 2023 +1000

    Qt: Prompt user to enable HC mode on achievement login

commit 9719297
Author: Stenzek <[email protected]>
Date:   Mon Dec 4 22:30:39 2023 +1000

    Achievements: Handle dynamically-sized leaderboard trackers

commit 0f4a95e
Author: Dan McCarthy <[email protected]>
Date:   Fri Dec 8 16:46:41 2023 -0600

    Qt: (Debugger) Add ability to remove result from Memory Search results

    Adds the ability to remove individual search results from the Memory Search results list. Right clicking a result will give the "Remove Result" option in the context menu.

commit b453787
Author: Dan McCarthy <[email protected]>
Date:   Thu Dec 7 23:24:09 2023 -0600

    Qt: Adds right click Go To Disassembly menu option to Memory Search

    Allows user to right click a memory search result in order to go to that memory address location in the disassembly view. This saves several step and makes it easier to do.

    Also adds precedent for the memory search result context menu which will be used in future features.

commit c555dbc
Author: JordanTheToaster <[email protected]>
Date:   Wed Dec 6 10:48:57 2023 +0000

    3rdparty: Update VK memory allocator

    Updates VK memory allocator to latest master commit.

commit 1561e07
Author: JordanTheToaster <[email protected]>
Date:   Wed Dec 6 10:34:36 2023 +0000

    3rdparty: Update D3D12 memory allocator

    Updates D3D12 memory allocator to latest master commit.

commit ec9bc59
Author: JordanTheToaster <[email protected]>
Date:   Fri Dec 8 09:34:01 2023 +0000

    GameDB: PJ King Kong fixes

    Fixes for the hash cache being silly and spiking to stupid levels killing performance.

commit 7fd82ff
Author: JordanTheToaster <[email protected]>
Date:   Tue Dec 5 09:17:11 2023 +0000

    3rdparty: Update Vulkan Headers to v1.3.272

    Updates Vulkan Headers to v1.3.272.

commit 0652b21
Author: RedPanda4552 <[email protected]>
Date:   Tue Dec 5 14:26:44 2023 -0500

    Big Picture: Enforce immediate save for macro button selection and frequency

    Fixes settings not saving until emulator exit

commit 59217b9
Author: RedPanda4552 <[email protected]>
Date:   Tue Dec 5 14:25:23 2023 -0500

    Big Picture: Fix macro pressure/deadzone not having independent labels

    Fixes mangled pop-up, allows both to be set correctly/independently

commit 46c9bcb
Author: RedPanda4552 <[email protected]>
Date:   Tue Dec 5 14:24:00 2023 -0500

    Big Picture: Don't use macro frequency display label as config key

    Fixes Big Picture unable to set macro frequency

commit f615403
Author: JordanTheToaster <[email protected]>
Date:   Mon Dec 4 05:28:18 2023 +0000

    3rdparty: Use upstream XZ submodule

    For some reason we used a branch XZ from around 6 years ago? Honestly not sure why.

commit 6c2d2e8
Author: JordanTheToaster <[email protected]>
Date:   Mon Dec 4 16:00:54 2023 +0000

    GameDB: FIFA World Cup 2006 Fixes

    Fixes broken player textures.

commit 4d61f26
Author: JordanTheToaster <[email protected]>
Date:   Mon Dec 4 16:14:00 2023 +0000

    ci: Revert to labeler version 4.3.0

    Seems to cause the labeler to explode.

commit 86c42a0
Author: RedPanda4552 <[email protected]>
Date:   Thu Nov 23 23:15:38 2023 -0500

    Pad: Add controller ejection

commit 2443e06
Author: RedPanda4552 <[email protected]>
Date:   Mon Nov 6 00:17:29 2023 -0500

    [SAVEVERSION+] Multitap: Make multitaps manage their own states

commit eb1d93d
Author: RedPanda4552 <[email protected]>
Date:   Mon Nov 6 00:08:58 2023 -0500

    Pad/Multitap: Improve PS2-side ejection detection

commit f0bf525
Author: Dan McCarthy <[email protected]>
Date:   Tue Nov 28 16:17:37 2023 -0600

    Qt: Addresses typo in duplicate Patch console log warning

    Fixed unintentionally non-sensical wording in log warning to inform the user that a patch was skipped over since a patch with the same name had already been loaded.

commit 45758ad
Author: Dan McCarthy <[email protected]>
Date:   Tue Nov 28 16:17:08 2023 -0600

    Use consistent snake_case naming & don't pass string_view by ref

    Addresses feedback to use consistent naming conventions as most variables are using snake_case. Also no longer passes string_view by reference as per feedback.

commit 57465b2
Author: Dan McCarthy <[email protected]>
Date:   Mon Nov 27 17:16:20 2023 -0600

    Qt: Clarifies wording of Patch log for disabling duplicate patch

    Adds a better worded log statement for informing the user that a patch with a duplicate name was found and not loaded to avoid conflict.

    The common expected reason this can happen is a bundled patch having the same name as a /patches/ pnach patch having the same name. By default it will prioritize the folder patch over the bundled patch.

    Makes it more clear/less confusing in phrasing.

commit 8a95eec
Author: Dan McCarthy <[email protected]>
Date:   Sun Nov 26 11:04:49 2023 -0600

    Qt: Use const patch lists for  ContainsPatchName

commit 766b0ba
Author: Dan McCarthy <[email protected]>
Date:   Sun Nov 26 10:56:09 2023 -0600

    Qt: Update to use string_view references & const

    Co-authored-by: Silent <[email protected]>

commit a6796fe
Author: Dan McCarthy <[email protected]>
Date:   Sun Nov 26 09:29:24 2023 -0600

    Qt: Improves wording of patch skipping log

commit 5e45038
Author: Dan McCarthy <[email protected]>
Date:   Sun Nov 26 00:18:02 2023 -0600

    Qt: Fix final return condition for PatchStringHasUnlabelledPatch

commit cc62825
Author: Dan McCarthy <[email protected]>
Date:   Sat Nov 25 23:51:01 2023 -0600

    Qt: Fix console warning about hiding bundled patches

    Fixes syntax error with console write format to display warning when bundled patches are hidden due to unlabeled patches being loaded.

commit 7b5d640
Author: Dan McCarthy <[email protected]>
Date:   Sat Nov 25 23:17:41 2023 -0600

    Qt: Add warning that unlabeled patches cause bundled patches to hide

    Bundled patches don't display when unlabeled patches are loaded (since we can't guarantee they don't collide). This warns the user that bundled patches are hidden when unlabeled patches are loaded. (The warning hides when no unlabeled patches are loaded)

commit 96a9e8a
Author: Dan McCarthy <[email protected]>
Date:   Sat Nov 25 22:58:17 2023 -0600

    Qt: Display patch folder patches & .zip patches if no name collision

    Currently if one has patches from the patch folder, no bundled patches from the .zip file will be displayed.

    This changes it so that we can display both the folder patches AND the .zip bundled patches as long as their names don't collide. If there's a collision, the folder patch will override the bundled patch.

    Also, if an unlabeled patch is loaded from the folder then all bundled patches will be hidden (like they did prior) since we can't guarantee there's no collision.

commit d572765
Author: Stenzek <[email protected]>
Date:   Sun Dec 3 17:37:27 2023 +1000

    Qt: Allow language change without shutting down VM

commit ce539f3
Author: Mrlinkwii <[email protected]>
Date:   Sun Dec 3 13:55:53 2023 +0000

     Qt: Fix links in first page of Setup Wizard

    Co-Authored-By: Connor McLaughlin <[email protected]>

commit 103cf9c
Author: PCSX2 Bot <[email protected]>
Date:   Sun Dec 3 00:01:40 2023 +0000

    Qt: Update Base Translation

commit e9fca78
Author: Silent <[email protected]>
Date:   Fri Dec 1 18:14:06 2023 +0100

    FullscreenUI: Fixup mistakes missed in #10330

commit 19431ef
Author: refractionpcsx2 <[email protected]>
Date:   Wed Nov 29 00:41:04 2023 +0000

    GS: Fix bug in STQ rounding

commit 8d6c5ea
Author: refractionpcsx2 <[email protected]>
Date:   Tue Nov 28 12:25:36 2023 +0000

    GS/HW: Combine strips from same pixels, slight different sub pixel

commit 0dfc35e
Author: Stenzek <[email protected]>
Date:   Fri Dec 1 21:40:58 2023 +1000

    deps: Bump to Qt 6.6.1 and SDL2 2.28.5

commit b8a1d07
Author: JordanTheToaster <[email protected]>
Date:   Thu Nov 30 15:51:19 2023 +0000

    GameDB: Misc fixes

    Fixes for right edge artifacts in Katamari Damacy.

commit 574f95a
Author: JordanTheToaster <[email protected]>
Date:   Tue Nov 28 10:19:58 2023 +0000

    3rdparty: Update fmt to v10.1.1

    Updates fmt to v10.1.1.

commit cefcd84
Author: JordanTheToaster <[email protected]>
Date:   Tue Nov 28 10:19:22 2023 +0000

    Misc: Fix fmt errors

commit 279c84f
Author: Silent <[email protected]>
Date:   Mon Nov 27 16:46:38 2023 +0100

    Achievements: Fix the percentage counter when only unofficial achievements exist

    Now correctly shows "This game has no achievements" and no percentage bar,
    as per the RetroAchievements integration guide.

commit b69cfad
Author: Mrlinkwii <[email protected]>
Date:   Thu Nov 30 11:55:04 2023 +0000

    QT: add the ability to load .backup save states in UI

commit 0bdc439
Author: Stenzek <[email protected]>
Date:   Thu Nov 30 13:54:35 2023 +1000

    3rdparty/rcheevos: Bump to 8afec6c

commit 9e720d1
Author: Stenzek <[email protected]>
Date:   Thu Nov 30 13:52:48 2023 +1000

    Achievements: Fix multiple leaderboard trackers

commit 9a932e7
Author: Silent <[email protected]>
Date:   Mon Nov 27 23:30:28 2023 +0100

    FullscreenUI: Properly account for multiline Rich Presence in Title Info

commit 62c0148
Author: Radiata <[email protected]>
Date:   Wed Nov 29 20:02:18 2023 -0800

    GameDB: Radiata Stories

    Fixes random incorrect model position.

commit 97cedb3
Author: Stenzek <[email protected]>
Date:   Thu Nov 30 18:18:24 2023 +1000

    CDVD: Get rid of negative data offsets

    It doesn't make sense. Code was written in 2009 with no explaination.

commit 776cdd6
Author: Stenzek <[email protected]>
Date:   Thu Nov 30 18:13:54 2023 +1000

    GzippedFileReader: Prevent out-of-bounds reads

commit 234b3df
Author: lightningterror <[email protected]>
Date:   Tue Nov 28 16:56:49 2023 +0100

    GameDB: Various gshw fixes.

    Add full mipmap plus ps2 trilinear to Snoopy vs. The Red Baron.
    Improves ground textures to match sw renderer.

    Add full recommended blending level to Blokus Club with Bumpy Trot.
    Fixes water reflections.

    Add full mipmap plus ps2 trilinear and medium recommended blending level to Gallop Racer 2003: A New Breed.
    Blending improves lighting, maximum blending is needed for full accuracy.
    Mipmap + trilinear, improves ground textures to match sw renderer.

    Add full mipmap plus ps2 trilinear

commit fa0744f
Author: PCSX2 Bot <[email protected]>
Date:   Tue Nov 28 00:01:37 2023 +0000

    Qt: Update Base Translation

commit 376216a
Author: PCSX2 Bot <[email protected]>
Date:   Mon Nov 27 16:01:18 2023 +0000

    PAD: Update to latest controller database.

commit 88989bf
Author: Stenzek <[email protected]>
Date:   Mon Nov 27 01:25:13 2023 +1000

    Hotkeys: Throttle pause requests

commit acb4545
Author: Stenzek <[email protected]>
Date:   Mon Nov 27 01:23:02 2023 +1000

    Achievements: Use big picture to confirm HC mode disable

commit 8a93c56
Author: JordanTheToaster <[email protected]>
Date:   Sat Nov 25 01:28:23 2023 +0000

    Console: Update CPU detection

    Cuts out unnecessary info and uses CPUInfo to print processor name core count and thread count.

commit 33a6948
Author: JordanTheToaster <[email protected]>
Date:   Sun Nov 26 16:00:10 2023 +0000

    GameDB: Ace Combat 4 fixes

    Fixes large HC size causing high GS%.

commit cdd5bd5
Author: lightningterror <[email protected]>
Date:   Sun Nov 26 17:40:02 2023 +0100

    GameDB: Update Ar tonelico upscaling fixes.

    Round sprite from half to Full.
    Fixes textboxes and character portraits.

commit 15082d7
Author: JordanTheToaster <[email protected]>
Date:   Sat Nov 25 16:09:58 2023 +0000

    GameDB: NBA Live 05 and 09 fixes

    Fixes for sprite rendering and crowd rendering.

commit 5d2177d
Author: JordanTheToaster <[email protected]>
Date:   Sat Nov 25 16:03:20 2023 +0000

    GameDB: Purge HPO Normal from NFS U2

    Purges HPO Normal from Underground 2 as it causes screen shake even with the software FMV workaround in place.

commit 31642ce
Author: refractionpcsx2 <[email protected]>
Date:   Sat Nov 25 00:45:38 2023 +0000

    GS/HW: Partial revert earlier FMV fix

commit e843357
Author: refractionpcsx2 <[email protected]>
Date:   Sat Nov 25 00:00:27 2023 +0000

    GS/HW : Mirror half pixel offset when using FMV Blit override

commit 6d31ef8
Author: refractionpcsx2 <[email protected]>
Date:   Fri Nov 17 00:42:48 2023 +0000

    GameDB: Add Autoflush and HPO Normal to Manhunt

commit 2fd2427
Author: refractionpcsx2 <[email protected]>
Date:   Thu Nov 16 23:16:21 2023 +0000

    GS: Pre-round/truncate STQ values based on hardware tests

commit a60c301
Author: lightningterror <[email protected]>
Date:   Thu Nov 23 18:12:51 2023 +0100

    GS: Cleanup GSClut.

    Constants, switch cases.

commit 041d266
Author: Stenzek <[email protected]>
Date:   Fri Nov 24 22:21:44 2023 +1000

    3rdparty/cubeb: Minimize and update to 54217bc

commit 0891a27
Author: JordanTheToaster <[email protected]>
Date:   Fri Nov 24 17:13:32 2023 +0000

    3rdparty: Update CPUInfo to latest

    Updates CPUInfo to the latest version.

commit d25246a
Author: refractionpcsx2 <[email protected]>
Date:   Fri Nov 24 13:35:58 2023 +0000

    GS/HW: Allow more draws to remain if recent draws done near vsync

commit 7853843
Author: refractionpcsx2 <[email protected]>
Date:   Fri Nov 24 20:48:52 2023 +0000

    GameDB: Fix FMVs on Rule of Rose + PAL Region

commit 7cc6af8
Author: refractionpcsx2 <[email protected]>
Date:   Mon Nov 20 21:16:20 2023 +0000

    GS/HW: Restrict making new targets if no uploads

commit 7fcc47d
Author: refractionpcsx2 <[email protected]>
Date:   Mon Nov 20 19:11:59 2023 +0000

    GS/HW: In double half clears, take larger bitdepth

commit bca4f15
Author: JordanTheToaster <[email protected]>
Date:   Thu Nov 23 14:23:23 2023 +0000

    3rdparty: Update xbyak to 6.73

    Updates xbyak from 6.00 to 6.73.

commit b644957
Author: Connor McLaughlin <[email protected]>
Date:   Fri Nov 24 15:59:12 2023 +1000

    Achievements: Avoid string copy on server call

commit 2806b3a
Author: Mrlinkwii <[email protected]>
Date:   Thu Nov 23 14:16:49 2023 +0000

    GameDB : update Driving Emotion fixes

commit b166615
Author: PCSX2 Bot <[email protected]>
Date:   Wed Nov 22 00:02:00 2023 +0000

    Qt: Update Base Translation

commit ae2860d
Author: Dan McCarthy <[email protected]>
Date:   Mon Nov 20 22:29:01 2023 -0600

    Debugger: Allow copying function names

    Add the ability to copy a function name when you right click the first instruction of a function (the line where the function name displays).

    Instructions inside the function that are not the first instruction will not show the copy option, partly because it's less clear what will be copied but also to not needlessly overpopulate the context menu.

commit 21b3464
Author: Tyler Wilding <[email protected]>
Date:   Tue Nov 21 13:13:47 2023 -0500

    translations: Syncing Crowdin translations (#10301)

commit 5c1f280
Author: TellowKrinkle <[email protected]>
Date:   Mon Oct 30 23:08:02 2023 -0500

    Mac: Add microphone permissions string

    Allows us to ask permission to use the microphone

commit 7ec5769
Author: Stenzek <[email protected]>
Date:   Tue Nov 21 16:15:39 2023 +1000

    Qt: Remove QtNetwork dependency

commit d096fed
Author: Stenzek <[email protected]>
Date:   Tue Nov 21 16:13:59 2023 +1000

    Qt: Use HTTPDownloader instead of QtNetwork for updates

commit 15091ce
Author: Stenzek <[email protected]>
Date:   Tue Nov 21 16:13:14 2023 +1000

    Qt: Fix progress dialog cancelling

commit 7715d12
Author: Stenzek <[email protected]>
Date:   Tue Nov 21 16:12:58 2023 +1000

    HTTPDownloader: Add support for progress updates/cancelling

commit f18964a
Author: Stenzek <[email protected]>
Date:   Tue Nov 21 14:33:59 2023 +1000

    Qt: Use main window geometry for temporary window

    When displaying the confirm popup when fullscreen.

commit b79edf1
Author: Stenzek <[email protected]>
Date:   Tue Nov 21 12:53:24 2023 +1000

    MemoryCardFolder: Remove unused constant

commit 67c5509
Author: Stenzek <[email protected]>
Date:   Mon Nov 20 23:28:00 2023 +1000

    Qt: Fix confirm dialog parenting to wrong window

commit 0770249
Author: Stenzek <[email protected]>
Date:   Mon Nov 20 23:27:32 2023 +1000

    Qt: Make ALT+F4 while fullscreen exit PCSX2

commit 0ebc1ce
Author: dreamsyntax <[email protected]>
Date:   Sun Nov 19 18:18:02 2023 -0700

    Readme: Clarify latest build/contribution info; Adjust Technical Notes header type for consistency

commit 90e9b60
Author: Dan McCarthy <[email protected]>
Date:   Sun Nov 19 08:41:27 2023 -0600

    Debugger: Implement subsequent/next scan for Mem Search (#10260)

    Co-authored-by: Ty <[email protected]>

commit 9a6e545
Author: Ty Lamontagne <[email protected]>
Date:   Sat Nov 18 17:13:41 2023 -0500

    Debugger: Clear breakpoint skips when resetting

commit 3333553
Author: cyanea-bt <[email protected]>
Date:   Sun Nov 19 04:30:10 2023 +0100

    MemoryCardFolder: Fix incorrect save timestamps (#10287)

    * MemoryCardFolder: Fix incorrect save timestamps

    * MemoryCardFolder: move timegm macro to source file

    * MemoryCardFolder: remove timegm macro

commit 1565c59
Author: JordanTheToaster <[email protected]>
Date:   Sat Nov 18 01:37:55 2023 +0000

    GameDB: Sega Ages 2500 Fixes

    Fixes for excessive texture uploads and massive hash cache sizes.

commit 92a1eda
Author: Goatman13 <[email protected]>
Date:   Thu Nov 16 13:14:05 2023 +0100

    R3000: Fix COP0 Status value on reset

    Previously used value was wrong. BEV bit wasn't correct one, and CU0 and TS bits are not enabled by default.

commit 84e24a0
Author: Dan McCarthy <[email protected]>
Date:   Thu Nov 16 19:33:24 2023 -0600

    Fix Failing to reload cheats on button press

    The Cheats Settings menu was failing to reload cheats when pressing the button. This meant if you enabled a cheat, made changes, and clicked reload, there would be no updates in behavior.

    This was due to the reload button getting wired to the function that refreshes the list of cheats, rather than the function that refreshes the list AND reloads the actual enabled cheats.

    This now calls the right function and when reloading, any changes thart were saved to the cheat will now be present.

commit d235c2d
Author: PCSX2 Bot <[email protected]>
Date:   Fri Nov 17 00:01:44 2023 +0000

    Qt: Update Base Translation

commit a26d7f6
Author: refractionpcsx2 <[email protected]>
Date:   Fri Nov 10 21:05:38 2023 +0000

    CDVD: Tidy up some bits, abort read head on Abort/Break

commit 3411729
Author: refractionpcsx2 <[email protected]>
Date:   Fri Nov 10 09:33:54 2023 +0000

    CDVD: Don't include read times during seeks

commit 62c3575
Author: refractionpcsx2 <[email protected]>
Date:   Sun Nov 12 05:17:18 2023 +0000

    GS/TC: Readd horizontal offset if not processed during invalidation

commit 6967e66
Author: lightningterror <[email protected]>
Date:   Wed Nov 15 13:32:05 2023 +0100

    GameDB: Add Auto flush to MGS2 Substance.

    Fixes depth of field blur.

commit 9d96e23
Author: JordanTheToaster <[email protected]>
Date:   Wed Nov 15 13:00:39 2023 +0000

    GameDB: Ace combat fixes

    Fixes for terrain rendering in Ace Combat 4 and Zero.

commit 91fa842
Author: Mrlinkwii <[email protected]>
Date:   Tue Nov 14 14:36:04 2023 +0000

    GameDB: fixes for XS Junior League Soccer &  Guitar Hero - Van Halen

commit 4af8957
Author: Daniel Gerendasy <[email protected]>
Date:   Thu Nov 9 21:53:32 2023 -0800

    IOP HLE: Rename update host root functions

commit b5f8ef0
Author: Daniel Gerendasy <[email protected]>
Date:   Thu Nov 9 19:07:32 2023 -0800

    Added support for HostFs when booting an iso

commit 3ca7d2d
Author: Connor McLaughlin <[email protected]>
Date:   Tue Nov 14 12:38:48 2023 +1000

    CI/Flatpak: Disable build/repo linting

    We're currently failing validation with a `finish-args-unnecessary-xdg-config-access` error.

    This is **not** caused by anything we're doing, it's an issue with the upstream Qt SDK: https://invent.kde.org/packaging/flatpak-kde-runtime/-/blob/3bac997f76646f1abda38d376e217a5635167144/org.kde.Sdk.json.in#L84

    So, for now, just disable it. I don't have time at the moment to chase bugs upstream, if it's still broken next week, I'll do so then.

commit d37cd2e
Author: PCSX2 Bot <[email protected]>
Date:   Mon Nov 13 16:01:22 2023 +0000

    PAD: Update to latest controller database.

commit 46527ca
Author: JordanTheToaster <[email protected]>
Date:   Fri Nov 10 17:56:19 2023 +0000

    GameDB: PJ King Kong fixes

    Games still busted but it at least matches software in hardware now.
  • Loading branch information
kamfretoz committed Dec 10, 2023
1 parent 6b540ed commit cb0bc7e
Show file tree
Hide file tree
Showing 231 changed files with 161,406 additions and 135,160 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/linux_build_flatpak.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,13 @@ jobs:
run: |
ostree commit --repo=repo --canonical-permissions --branch=screenshots/x86_64 flatpak_app/screenshots
- name: Validate build directory
run: |
flatpak run --command=flatpak-builder-lint org.flatpak.Builder builddir flatpak_app
- name: Validate repo
run: |
flatpak run --command=flatpak-builder-lint org.flatpak.Builder repo repo
#- name: Validate build directory
# run: |
# flatpak run --command=flatpak-builder-lint org.flatpak.Builder builddir flatpak_app
#
#- name: Validate repo
# run: |
# flatpak run --command=flatpak-builder-lint org.flatpak.Builder repo repo

- name: Push to Flathub beta
if: inputs.publish == true && inputs.branch == 'beta'
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/scripts/linux/build-dependencies-qt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@ set -e

INSTALLDIR="$HOME/deps"
NPROCS="$(getconf _NPROCESSORS_ONLN)"
SDL=SDL2-2.28.4
QT=6.6.0
SDL=SDL2-2.28.5
QT=6.6.1
LIBBACKTRACE=ad106d5fdd5d960bd33fae1c48a351af567fd075

mkdir -p deps-build
cd deps-build

cat > SHASUMS <<EOF
888b8c39f36ae2035d023d1b14ab0191eb1d26403c3cf4d4d5ede30e66a4942c $SDL.tar.gz
332cb37d0be20cb9541739c61f79bae5a477427d79ae85e352089afdaf6666e4 $SDL.tar.gz
fd6f417fe9e3a071cf1424a5152d926a34c4a3c5070745470be6cf12a404ed79 $LIBBACKTRACE.zip
039d53312acb5897a9054bd38c9ccbdab72500b71fdccdb3f4f0844b0dd39e0e qtbase-everywhere-src-$QT.tar.xz
e1542cb50176e237809895c6549598c08587c63703d100be54ac2d806834e384 qtimageformats-everywhere-src-$QT.tar.xz
33da25fef51102f564624a7ea3e57cb4a0a31b7b44783d1af5749ac36d3c72de qtsvg-everywhere-src-$QT.tar.xz
4e9feebc142bbb6e453e1dc3277e09ec45c8ef081b5ee2a029e6684b5905ba99 qttools-everywhere-src-$QT.tar.xz
a0d89a236f64b810eb0fe4ae1e90db22b0e86263521b35f89e69f1392815078c qttranslations-everywhere-src-$QT.tar.xz
30c3d82d85d050c83370710a26d12c802199c51eba5c2726e9d6243edd03b7e8 qtwayland-everywhere-src-$QT.tar.xz
450c5b4677b2fe40ed07954d7f0f40690068e80a94c9df86c2c905ccd59d02f7 qtbase-everywhere-src-$QT.tar.xz
ac4ed08950072e375be662cfa64fdb447dd6e935cf29c56a4128d1500492188f qtimageformats-everywhere-src-$QT.tar.xz
248deb56d26a463cf3162f530358ccf90cfb654bbf518bb35ddf81b205e09228 qtsvg-everywhere-src-$QT.tar.xz
4939105a7345ab4e19e7caee8654a836e65bd41910359623e0f233f3aff0914a qttools-everywhere-src-$QT.tar.xz
668702e822ad7150b27e7caa2158595fd9b3b77ffbc8262e6509872a3920ee88 qttranslations-everywhere-src-$QT.tar.xz
66cc2d632dc07fc6cc4e35247f48b7c1753276ccbf86e86d7b24d799725568b1 qtwayland-everywhere-src-$QT.tar.xz
EOF

curl -L \
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/scripts/linux/flatpak/modules/20-sdl2.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"sources": [
{
"type": "archive",
"url": "https://libsdl.org/release/SDL2-2.28.4.tar.gz",
"sha256": "888b8c39f36ae2035d023d1b14ab0191eb1d26403c3cf4d4d5ede30e66a4942c"
"url": "https://libsdl.org/release/SDL2-2.28.5.tar.gz",
"sha256": "332cb37d0be20cb9541739c61f79bae5a477427d79ae85e352089afdaf6666e4"
}
],
"cleanup": [
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/scripts/macos/build-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export MACOSX_DEPLOYMENT_TARGET=11.0

INSTALLDIR="$HOME/deps"
NPROCS="$(getconf _NPROCESSORS_ONLN)"
SDL=SDL2-2.28.4
SDL=SDL2-2.28.5
PNG=1.6.37
JPG=9e
FFMPEG=6.0
Expand All @@ -21,7 +21,7 @@ export CFLAGS="-I$INSTALLDIR/include -Os $CFLAGS"
export CXXFLAGS="-I$INSTALLDIR/include -Os $CXXFLAGS"

cat > SHASUMS <<EOF
888b8c39f36ae2035d023d1b14ab0191eb1d26403c3cf4d4d5ede30e66a4942c $SDL.tar.gz
332cb37d0be20cb9541739c61f79bae5a477427d79ae85e352089afdaf6666e4 $SDL.tar.gz
505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca libpng-$PNG.tar.xz
57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082 ffmpeg-$FFMPEG.tar.xz
039d53312acb5897a9054bd38c9ccbdab72500b71fdccdb3f4f0844b0dd39e0e qtbase-everywhere-src-$QT.tar.xz
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/scripts/windows/build-dependencies.bat
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,16 @@ echo INSTALLDIR=%INSTALLDIR%

cd "%BUILDDIR%"

set QT=6.6.0
set QT=6.6.1
set QTMINOR=6.6
set SDL=SDL2-2.28.4

call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" b53b9b42e731a33552d0a533316a88009b423c16a8a3a418df9ffe498c37da3d || goto error
call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" 0b9dafd9a42deeb55fd4b74a6caaa6871a03d0051ddb54ea4ea448f28cb90ecc || goto error
call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" ae31eadd81da19e1bba0d72e16d29fdce0b98e991c4dcbf6351acf09967fd175 || goto error
call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" 88b4b1a8224465cb04feed2a37823e95e959164cf824e9969648335614a4c855 || goto error
call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" 051787f12e2457425f35f31e642163f0d481cdd687b4b164ca41ddb84d5ea3a6 || goto error
call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" 5d04b33336d3d49512eedfa85b378f0805dc4d8770365db318234b125deef9dc || goto error
set SDL=SDL2-2.28.5

call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" 97bd14ee0ec67494d2b93f1a4f7da2bf891103c57090d96fdcc2b019d885c76a || goto error
call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" 818f92518d1a89ee98ae818891a7d2f0e41aa45b933d55215da2df6d5459428e || goto error
call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" 03f01042f86b4dbf7329a179f20835817c660a183178c11570cc0535b3c3ba58 || goto error
call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" d44d5ead8d4682f54c91687b5e32f2735f086419e3889e05609feae1a7f02da9 || goto error
call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" a17eba4e1c00dbd62c13d708c2bc918c2954b2b25a94d3c05e891d62e8f187c8 || goto error
call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" e5ccf0eefd6b1ef9604fdf57f6d16ad8484d07fb141ca3a2d9c3f1771296ae25 || goto error

if %DEBUG%==1 (
echo Building debug and release libraries...
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/triage_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
if: github.repository == 'PCSX2/pcsx2'
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@main
- uses: actions/labeler@v4.3.0
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}

Expand Down
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "3rdparty/xz/xz"]
path = 3rdparty/xz/xz
url = https://github.com/PCSX2/xz.git
[submodule "3rdparty/gtest"]
path = 3rdparty/gtest
url = https://github.com/google/googletest.git
Expand Down Expand Up @@ -30,3 +27,6 @@
[submodule "3rdparty/libwebp/libwebp"]
path = 3rdparty/libwebp/libwebp
url = https://github.com/webmproject/libwebp
[submodule "3rdparty/xz/xz"]
path = 3rdparty/xz/xz
url = https://github.com/tukaani-project/xz.git
Loading

0 comments on commit cb0bc7e

Please sign in to comment.