diff --git a/testing/pcsx2/APKBUILD b/testing/pcsx2/APKBUILD index c9c54d78944..566ed4200e7 100644 --- a/testing/pcsx2/APKBUILD +++ b/testing/pcsx2/APKBUILD @@ -1,13 +1,13 @@ # Contributor: psykose # Maintainer: psykose pkgname=pcsx2 -pkgver=1.7.4462 +pkgver=1.7.4477 pkgrel=0 -_fastfloat=fbd5bd712e44b57b6b98d3117482909839f9320f -_glslang=5755de46b07e4374c05fb1081f65f7ae1f8cca81 -_gtest=58d77fa8070e8cec2dc1ed015d66b454c8d78850 -_libchdr=fec8ab94212cc65d9d9a62cb3da924f5830c04b0 -_rcheevos=cdbc1781f68d24d3e88ea7850fb683fc97d1e395 +_fastfloat=v4.0.0 +_glslang=11.12.0 +_gtest=v1.13.0 +_libchdr=3c6e0e47a06ed42b2c04dbd82bc9c8d253c7d1ee +_rcheevos=v10.7.0 pkgdesc="Playstation 2 emulator" url="https://github.com/PCSX2/pcsx2" arch="x86_64" # only x86_64 supported for now @@ -29,6 +29,7 @@ makedepends=" eudev-dev ffmpeg-dev fmt-dev + glslang-dev libaio-dev libpcap-dev libpng-dev @@ -43,6 +44,7 @@ makedepends=" sdl2-dev soundtouch-dev vulkan-headers + vulkan-loader-dev wayland-dev zstd-dev " @@ -72,16 +74,16 @@ prepare() { rm -r 3rdparty/ffmpeg - ln -sfv "$srcdir"/glslang-$_glslang \ + ln -sfv "$srcdir"/glslang-${_glslang/v/} \ "$builddir"/3rdparty/glslang/glslang - ln -sfv "$srcdir"/googletest-$_gtest \ + ln -sfv "$srcdir"/googletest-${_gtest/v/} \ "$builddir"/3rdparty/gtest ln -sfv "$srcdir"/libchdr-$_libchdr \ "$builddir"/3rdparty/libchdr/libchdr - ln -sfv "$srcdir"/rcheevos-$_rcheevos \ + ln -sfv "$srcdir"/rcheevos-${_rcheevos/v/} \ "$builddir"/3rdparty/rcheevos/rcheevos - ln -sfv "$srcdir"/fast_float-$_fastfloat \ + ln -sfv "$srcdir"/fast_float-${_fastfloat/v/} \ "$builddir"/3rdparty/fast_float sed -i \ @@ -138,15 +140,15 @@ package() { } sha512sums=" -3d42aff462de4150622707b556f5e72885a36af08a5e6ade674d1a73329fcd266dbe63fcd396a00b2b127dfab0d79f67a1828dc3c28bdc67637ffc094b995f18 pcsx2-v1.7.4462.tar.gz -ba3109acd731dd50770406528633f74af17a8a667b617449bc537617d81112f32aec20f5811ad49dcfc4214da6a5e7ce57dfa1421445c477e39749ff45f1219b fastfloat-fbd5bd712e44b57b6b98d3117482909839f9320f.tar.gz -f307ec5990f2e501b39c43fb805e595fc8ce3ec7a6fff57ae51130dbc29101125b3b9d6b1de169f6710ada17f9a5301e8c524ca2c5a4ab9a45529733f048ab68 glslang-5755de46b07e4374c05fb1081f65f7ae1f8cca81.tar.gz -d8153c426e4f9c89a74721cc4a24dfcaf319810f4f10aa25fc972f99da2d96d66bc840cf2f51b756fef6b1ca47e8d2c8633f5862cc24e34d57309ad48802124a gtest-58d77fa8070e8cec2dc1ed015d66b454c8d78850.tar.gz -c25084b2257083c4bddd84d13e3dc0d30fea548a4e50a6beefd5282383480eaaa293c044647e2aff339d087dae87c3ef871137a43db766e08a1dffd8801c3367 libchdr-fec8ab94212cc65d9d9a62cb3da924f5830c04b0.tar.gz -8db7ae83190ce88cc4d4ba5ace63ca23ea590dfd4c6338a227da9ef2d0b90643bc3e103cd332244e71e23441dda4196862de9dbfab904da7885afe9cebb82ea6 rcheevos-cdbc1781f68d24d3e88ea7850fb683fc97d1e395.tar.gz +108032779d3d84a90e81bb1bc4a939684edc7c2837ee8fc48da097343104429efe7cd61d5a9848bfa67228f2123a5c7db3bc525367f0b7ee95b517dc0ef131c1 pcsx2-v1.7.4477.tar.gz +e3a1941364413f008d4bff190df45f95d7100263e57e714a907dba85b705fd19dcd34ac6db3fc332e5232fd4b67442542f2344a81d296ef04282e3d615dfe0fb fastfloat-v4.0.0.tar.gz +fd955f9912551668056dfe52835eef11e5dc0bf0d25b2d961a31f684adbd63bc6380759944c1921cfd63d359a58c7cc3a4a4d5eea69fa1b050f58960e5101271 glslang-11.12.0.tar.gz +70c0cfb1b4147bdecb467ecb22ae5b5529eec0abc085763213a796b7cdbd81d1761d12b342060539b936fa54f345d33f060601544874d6213fdde79111fa813e gtest-v1.13.0.tar.gz +48f6c4a53ea610857af49d89513e92f0858fe1c4867a9772470062ddb6369f4c55ecb6d29151249ab5e165948b84a9d66a5cefc9792c049ba1d482736df64e83 libchdr-3c6e0e47a06ed42b2c04dbd82bc9c8d253c7d1ee.tar.gz +b4947e6f3fe4d74b7bc91637b6b02ed8a69791e4d1d9fcd84fa96da1cee6c61888a96940965f252331a1dda7da93c13e27d7a60b92b837e5cff68b4668ab9ee4 rcheevos-v10.7.0.tar.gz 20624d3e46b956a5f0339b569891824b7a9321f4395c572393d42f7520d93b30b6e6bb8af90b5d6c52cbcaf2d82eb386bec3943532c5f1d8303c8b50938cd89b fast-float.patch e6e7964e36274372c3b9c67acd66a29b8ae7f4be1503959deb8284d427cddb5ea5bb534aad35f53073e8983bcb319d90b1127fe5dd6b8bd6bb1f3f8f306fcf0c fix-lfs64.patch -94f8c4958da356e9f37465d75667f83ae1d2f7bace4a6f0c87a7ee177aa2c361ea06785369655d460182863ca7e08a3af7720415eaf041ae7fe250274a84ffb6 unbundle-vulkan.patch +461f184cc3b5c76539247db66fb0a364edbddc3d434869ff1641e723c6d962115cfa190be5e95205f31108ed47be0db6abf54c92d9875589ac978e73a29a379c unbundle-vulkan.patch 113f0e80c7975985d65c90acd2b4c9a4487d0c9f240178500feac512808b836d6ae36343895a4ef4f16d91364eeee4f0a3aa4ecc17708facdaf0cb430b5e9a71 version.patch 6e2b383c9e4dddb253258229c4afb5740970244fb2eaeaabe27508f8a76ffbcece02858d67f52aee695b1a9507cd3415c53096060678783e138f4d4d52ccbcc4 zstd.patch bdc23c2773e1b963b06c0a51e3685b0a86db7dfe5cb2dd3e0cad4dd6f72aab2abef7eb421c8fb0f5303fae5c7ffb265eaa3a6e470998943aed54527bbb4d676c PCSX2.desktop diff --git a/testing/pcsx2/unbundle-vulkan.patch b/testing/pcsx2/unbundle-vulkan.patch index e3f6ef33788..46b800b9274 100644 --- a/testing/pcsx2/unbundle-vulkan.patch +++ b/testing/pcsx2/unbundle-vulkan.patch @@ -1,8 +1,8 @@ diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake -index ea84fd6..3d5c32b 100644 +index 5c81d98..746ed49 100644 --- a/cmake/SearchForStuff.cmake +++ b/cmake/SearchForStuff.cmake -@@ -191,7 +191,6 @@ endif() +@@ -187,7 +187,6 @@ endif() if(USE_VULKAN) add_subdirectory(3rdparty/glslang EXCLUDE_FROM_ALL) @@ -10,16 +10,16 @@ index ea84fd6..3d5c32b 100644 endif() if(CUBEB_API) -diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt -index 2c3c9a8..cc215c4 100644 ---- a/common/CMakeLists.txt -+++ b/common/CMakeLists.txt -@@ -146,7 +146,7 @@ endif() - - if(USE_VULKAN) - target_link_libraries(common PUBLIC -- Vulkan-Headers glslang -+ glslang +diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt +index 2fe9606..9b9fc3f 100644 +--- a/pcsx2/CMakeLists.txt ++++ b/pcsx2/CMakeLists.txt +@@ -664,7 +664,7 @@ if(USE_VULKAN) + GS/Renderers/Vulkan/VKTexture.h + GS/Renderers/Vulkan/VKUtil.h ) - target_sources(common PRIVATE - Vulkan/ShaderCache.cpp +- target_link_libraries(PCSX2_FLAGS INTERFACE Vulkan-Headers glslang) ++ target_link_libraries(PCSX2_FLAGS INTERFACE glslang) + endif() + + set(pcsx2GSMetalShaders