summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSanpi2020-01-01 12:11:59 +0100
committerSanpi2020-01-01 12:11:59 +0100
commit147b7dfb29725d3f3ab2d1c5014b11090b0d11ef (patch)
tree12d55fa76d21bfb2db517857b449fab07b6c22a7
parent713e84aa59bd639e80ff907fa649691e5140d4df (diff)
downloadaur-147b7dfb29725d3f3ab2d1c5014b11090b0d11ef.tar.gz
v0.0.8
-rw-r--r--PKGBUILD48
-rw-r--r--git-version.h2
-rw-r--r--rpcs3.patch27
3 files changed, 27 insertions, 50 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 670174da0e17..3412cc145a96 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Sanpi <sanpi+aur@homecomputing.fr>
pkgname=rpcs3
-pkgver=0.0.7
+pkgver=0.0.8
pkgrel=1
pkgdesc='Open-source Sony PlayStation 3 Emulator'
arch=('x86_64')
@@ -10,45 +10,47 @@ depends=('ffmpeg' 'glew' 'openal' 'qt5-base' 'vulkan-icd-loader')
makedepends=('cmake' 'boost')
options=('!strip')
source=("https://github.com/RPCS3/$pkgname/archive/v$pkgver.tar.gz"
- 'GSL.tar.gz::https://github.com/Microsoft/GSL/archive/1995e86d1ad70519465374fb4876c6ef7c9f8c61.tar.gz'
- 'cereal.tar.gz::https://github.com/USCiLab/cereal/archive/42a45b6e15fcbd1a3d65b033f5d4d0b2ef6c023d.tar.gz'
+ 'FAudio.tar.gz::https://github.com/FNA-XNA/FAudio/archive/19.10.tar.gz'
+ 'cereal.tar.gz::https://github.com/USCiLab/cereal/archive/v1.2.0.tar.gz'
'ffmpeg.tar.gz::https://github.com/hrydgard/ppsspp-ffmpeg/archive/7b7ae7b06705bf5539b222e77c779d4b649b53ef.tar.gz'
'hidapi.tar.gz::https://github.com/RPCS3/hidapi/archive/9220f5e77c27b8b3717b277ec8d3121deeb50242.tar.gz'
'libpng.tar.gz::https://github.com/RPCS3/libpng/archive/eddf9023206dc40974c26f589ee2ad63a4227a1e.tar.gz'
'libusb.tar.gz::https://github.com/RPCS3/libusb/archive/7cfa00e9d723f10167b4d71bceebf2b4b2cbd70e.tar.gz'
'pugixml.tar.gz::https://github.com/RPCS3/pugixml/archive/8bf806c035373bd0723a85c0820cfd5c804bf6cd.tar.gz'
- 'xxhash.tar.gz::https://github.com/Cyan4973/xxHash/archive/7cc9639699f64b750c0b82333dced9ea77e8436e.tar.gz'
+ 'span.tar.gz::https://github.com/tcbrindle/span/archive/9d7559aabdebf569cab3480a7ea2a87948c0ae47.tar.gz'
+ 'xxhash.tar.gz::https://github.com/Cyan4973/xxHash/archive/v0.6.5.tar.gz'
'yaml-cpp.tar.gz::https://github.com/jbeder/yaml-cpp/archive/eca9cfd64899525d0a61abb0553849676a0fe511.tar.gz'
- 'zlib.tar.gz::https://github.com/madler/zlib/archive/cacf7f1d4e3d44d871b605da3b647f07d718623f.tar.gz'
- 'glslang.tar.gz::https://github.com/KhronosGroup/glslang/archive/c11e3156af2297f89a23c8db3f5e2323733ee556.tar.gz'
+ 'zlib.tar.gz::https://github.com/madler/zlib/archive/v1.2.11.tar.gz'
+ 'glslang.tar.gz::https://github.com/KhronosGroup/glslang/archive/7.13.3496.tar.gz'
'asmjit.tar.gz::https://github.com/kobalicek/asmjit/archive/fc251c914e77cd079e58982cdab00a47539d7fc5.tar.gz'
- 'llvm.tar.gz::https://github.com/llvm-mirror/llvm/archive/b860b5e8f4ee90d6eb567d83ce8ed1a3e71e496f.tar.gz'
+ 'llvm.tar.gz::https://github.com/llvm-mirror/llvm/archive/2e038bff1082175b510a2e8336edf897af9b87a3.tar.gz'
'git-version.h')
-sha256sums=('11a57be2d4b732bcb7bd5bd315aca0591a84f63cd25f59256e4b6dc7dae58c87'
- '0c4cc26e7198bdc2aaac290c113d55dcd0018e2c8f4f0eec8ec986b4680fa14a'
- '217b49cf4a00308b0344cddaa4dc3f8404343e3b05b93f99e33c92369764bcac'
+sha256sums=('19287a3d6914063042b3ab9e81b7d2985a4c68c86b903921f47a25a63a329863'
+ '98bc55b494ac5249a4eed13b77394fa30bd9dac0931d4364616d2e501d987457'
+ '1ccf3ed205a7a2f0d6a060415b123f1ae0d984cd4435db01af8de11a2eda49c1'
'1596acf40444d17e17ef574b9ad8c7f2de9cbc429273da0b90883bffdb493071'
'fffe45442204328bb496cf746be8586b1ac120d3f4e18531b2af04df99b603a0'
'b1484ff1ae3711084b6dd8a880d0e560fa1c5f6d1c5a87a04a207c4bc3d315af'
'6fb6de602be1ca9e15be826378c326dcc219b91ce8f41f522f70b86021bff62b'
'c2a717088b6377fff8c28b31f25fdf30dee78ea4b5c5261c884416fac63536b9'
- '0d1e2b4ae15f98acc49084e23ba94853dba2b0f654865ecedb1072b3959421bf'
+ '86abe8635bdf555b948d318544b0595ef0c2e710e85f885b581f3ae08fb7e38c'
+ '19030315f4fc1b4b2cdb9d7a317069a109f90e39d1fe4c9159b7aaa39030eb95'
'e1f0a2a525cff2f82d256b967d22b9a6ce81056f6d42ae7216311d7707ea11d5'
- '6d4d6640ca3121620995ee255945161821218752b551a1a180f4215f7d124d45'
- '60ee8f0301eef76cfa913da718e31e3650a903e8ea88852ef88189eff0427a6b'
+ '629380c90a77b964d896ed37163f5c3a34f6e6d897311f1df2a7016355c45eff'
+ '170d1538a670af4cae300e875d7cda9744b1acee1ab7252ecf7c4004186bb922'
'fc804065cedaa0c6432df62c6effbf1c387907faf089e82794dd6d5429d6c51f'
- 'cbfc66ff2850afcc72e232446c73ebd781a32d5bced4b9aecc5b52453bb5543a'
- 'd58267c0c78f89db3c1fedcd30d4d5447d70bba4a6b9e067e25bc75ac030a96b')
+ '58f9824c5cd1edc769ec01f68097a86ec6a202de68635ac3ecd4f9ccb8a4fa4b'
+ 'aeef36748af56073bb4e1d419df4a5bd87954c21027426d295411d60c8ba0678')
prepare()
{
cd "$pkgname-$pkgver"
- rmdir 3rdparty/GSL
- ln --symbolic --force ../../GSL-1995e86d1ad70519465374fb4876c6ef7c9f8c61/ 3rdparty/GSL
+ rmdir 3rdparty/FAudio
+ ln --symbolic --force ../../FAudio-19.10 3rdparty/FAudio
rmdir 3rdparty/cereal
- ln --symbolic --force ../../cereal-42a45b6e15fcbd1a3d65b033f5d4d0b2ef6c023d 3rdparty/cereal
+ ln --symbolic --force ../../cereal-1.2.0 3rdparty/cereal
rmdir 3rdparty/ffmpeg
ln --symbolic --force ../../ppsspp-ffmpeg-7b7ae7b06705bf5539b222e77c779d4b649b53ef 3rdparty/ffmpeg
rmdir 3rdparty/hidapi
@@ -59,18 +61,20 @@ prepare()
ln --symbolic --force ../../libusb-7cfa00e9d723f10167b4d71bceebf2b4b2cbd70e 3rdparty/libusb
rmdir 3rdparty/pugixml
ln --symbolic --force ../../pugixml-8bf806c035373bd0723a85c0820cfd5c804bf6cd 3rdparty/pugixml
+ rmdir 3rdparty/span
+ ln --symbolic --force ../../span-9d7559aabdebf569cab3480a7ea2a87948c0ae47 3rdparty/span
rmdir 3rdparty/xxHash
- ln --symbolic --force ../../xxHash-7cc9639699f64b750c0b82333dced9ea77e8436e 3rdparty/xxHash
+ ln --symbolic --force ../../xxHash-0.6.5 3rdparty/xxHash
rmdir 3rdparty/yaml-cpp
ln --symbolic --force ../../yaml-cpp-eca9cfd64899525d0a61abb0553849676a0fe511 3rdparty/yaml-cpp
rmdir 3rdparty/zlib
- ln --symbolic --force ../../zlib-cacf7f1d4e3d44d871b605da3b647f07d718623f 3rdparty/zlib
+ ln --symbolic --force ../../zlib-1.2.11 3rdparty/zlib
rmdir Vulkan/glslang
- ln --symbolic --force ../../glslang-c11e3156af2297f89a23c8db3f5e2323733ee556 Vulkan/glslang
+ ln --symbolic --force ../../glslang-7.13.3496 Vulkan/glslang
rmdir asmjit
ln --symbolic --force ../asmjit-fc251c914e77cd079e58982cdab00a47539d7fc5 asmjit
rmdir llvm
- ln --symbolic --force ../llvm-b860b5e8f4ee90d6eb567d83ce8ed1a3e71e496f llvm
+ ln --symbolic --force ../llvm-2e038bff1082175b510a2e8336edf897af9b87a3 llvm
cmake . \
-DCMAKE_BUILD_TYPE='Release' \
diff --git a/git-version.h b/git-version.h
index 34a222cb7214..fbb2155df5b5 100644
--- a/git-version.h
+++ b/git-version.h
@@ -1,4 +1,4 @@
-#define RPCS3_GIT_VERSION "8615-c4d99f93"
+#define RPCS3_GIT_VERSION "9300-341fdf7e"
#define RPCS3_GIT_BRANCH "HEAD"
#define RPCS3_GIT_VERSION_NO_UPDATE 1
diff --git a/rpcs3.patch b/rpcs3.patch
deleted file mode 100644
index 75059712975e..000000000000
--- a/rpcs3.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git i/rpcs3/Emu/Cell/Modules/cellAdec.cpp w/rpcs3/Emu/Cell/Modules/cellAdec.cpp
-index 8c6ea9054..a8b956b8e 100644
---- i/rpcs3/Emu/Cell/Modules/cellAdec.cpp
-+++ w/rpcs3/Emu/Cell/Modules/cellAdec.cpp
-@@ -229,8 +229,8 @@ public:
-
- if (size)
- {
-+ data = (u8*)av_calloc(1, size + AV_INPUT_BUFFER_PADDING_SIZE);
-+ this->size = size + AV_INPUT_BUFFER_PADDING_SIZE;
-- data = (u8*)av_calloc(1, size + FF_INPUT_BUFFER_PADDING_SIZE);
-- this->size = size + FF_INPUT_BUFFER_PADDING_SIZE;
- }
- else
- {
-diff --git i/rpcs3/rpcs3qt/settings_dialog.cpp w/rpcs3/rpcs3qt/settings_dialog.cpp
-index a4d9a7fe1..6448025db 100644
---- i/rpcs3/rpcs3qt/settings_dialog.cpp
-+++ w/rpcs3/rpcs3qt/settings_dialog.cpp
-@@ -12,6 +12,7 @@
- #include <QApplication>
- #include <QDesktopWidget>
- #include <QTimer>
-+#include <QButtonGroup>
-
- #include "qt_utils.h"
- #include "settings_dialog.h"