Skip to content

Commit

Permalink
user/pcsx2: update to 1.7.5809
Browse files Browse the repository at this point in the history
  • Loading branch information
nekopsykose committed May 14, 2024
1 parent dea1652 commit ec79be2
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 4 deletions.
64 changes: 64 additions & 0 deletions user/pcsx2/patches/lzma-sdk-23.01.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
matches the changes in contrib/7zip
--
--- a/3rdparty/lzma/include/Threads.h
+++ b/3rdparty/lzma/include/Threads.h
@@ -20,6 +20,7 @@
#endif

#include <pthread.h>
+#include <sched.h>

#endif

--- a/3rdparty/lzma/CMakeLists.txt
+++ b/3rdparty/lzma/CMakeLists.txt
@@ -87,9 +87,9 @@
src/XzIn.c
)

-target_compile_definitions(pcsx2-lzma PRIVATE _7ZIP_ST)
+target_compile_definitions(pcsx2-lzma PRIVATE _7ZIP_ST -D_GNU_SOURCE)

target_include_directories(pcsx2-lzma PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include")
target_include_directories(pcsx2-lzma INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include")

-add_library(LZMA::LZMA ALIAS pcsx2-lzma)
\ No newline at end of file
+add_library(LZMA::LZMA ALIAS pcsx2-lzma)
--- a/3rdparty/lzma/src/CpuArch.c
+++ b/3rdparty/lzma/src/CpuArch.c
@@ -421,8 +421,6 @@

#ifdef USE_HWCAP

-#include <asm/hwcap.h>
-
#define MY_HWCAP_CHECK_FUNC_2(name1, name2) \
BoolInt CPU_IsSupported_ ## name1() { return (getauxval(AT_HWCAP) & (HWCAP_ ## name2)) ? 1 : 0; }

--- a/3rdparty/lzma/src/Threads.c
+++ b/3rdparty/lzma/src/Threads.c
@@ -257,7 +257,7 @@
*/

// ret2 =
- pthread_attr_setaffinity_np(&attr, sizeof(*cpuSet), cpuSet);
+ //pthread_attr_setaffinity_np(&attr, sizeof(*cpuSet), cpuSet);
// if (ret2) ret = ret2;
#endif
}
@@ -267,14 +267,12 @@
if (!ret)
{
p->_created = 1;
- /*
if (cpuSet)
{
// ret2 =
pthread_setaffinity_np(p->_tid, sizeof(*cpuSet), cpuSet);
// if (ret2) ret = ret2;
}
- */
}
}
// ret2 =
8 changes: 4 additions & 4 deletions user/pcsx2/template.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pkgname = "pcsx2"
pkgver = "1.7.5794"
pkgver = "1.7.5809"
pkgrel = 0
# pcsx2 doesn't support anything else
archs = ["x86_64"]
Expand Down Expand Up @@ -54,7 +54,7 @@
maintainer = "psykose <alice@ayaya.dev>"
license = "GPL-3.0-or-later AND LGPL-3.0-or-later"
url = "https://pcsx2.net"
_patches = "b3a788e16ea12efac006cbbe1ece45b6b9b34326"
_patches = "0535f2234debd0cb56f3328e9fba0e3102886299"
_gtest = "v1.14.0"
_fastfloat = "v6.1.1"
source = [
Expand All @@ -70,8 +70,8 @@
"3rdparty/fast_float",
]
sha256 = [
"ee20814e72555e118395b6d03ea5d9d371a6642a564f656d56de6378bec0678e",
"a531b037e1d58c01ee18ea81c0466995e4321cdff7291a1484d1882293ffbce3",
"b2c0f08885f569d54a4f0a908819ee742a9becb795c57d26a715a56683775e3c",
"b63a5981714353a0615cc887cf420a6990ac5dc84ec69c6d250b2bc348064724",
"8ad598c73ad796e0d8280b082cebd82a630d73e73cd3c70057938a6501bba5d7",
"10159a4a58ba95fe9389c3c97fe7de9a543622aa0dcc12dd9356d755e9a94cb4",
]
Expand Down

0 comments on commit ec79be2

Please sign in to comment.