shadps4: 0.3.0-unstable-2024-10-14 -> 0.4.0

This commit is contained in:
Ryan Omasta 2024-10-31 21:00:20 -06:00
parent 5d0c0de5de
commit 67ba2ae745
No known key found for this signature in database
2 changed files with 37 additions and 5 deletions

View File

@ -0,0 +1,28 @@
diff --git a/src/core/libraries/videodec/videodec2_impl.cpp b/src/core/libraries/videodec/videodec2_impl.cpp
index 021965e..31eb537 100644
--- a/src/core/libraries/videodec/videodec2_impl.cpp
+++ b/src/core/libraries/videodec/videodec2_impl.cpp
@@ -8,6 +8,16 @@
#include "common/logging/log.h"
#include "core/libraries/error_codes.h"
+#ifdef av_err2str
+#undef av_err2str
+#include <string>
+av_always_inline std::string av_err2string(int errnum) {
+ char errbuf[AV_ERROR_MAX_STRING_SIZE];
+ return av_make_error_string(errbuf, AV_ERROR_MAX_STRING_SIZE, errnum);
+}
+#define av_err2str(err) av_err2string(err).c_str()
+#endif // av_err2str
+
namespace Libraries::Vdec2 {
std::vector<OrbisVideodec2AvcPictureInfo> gPictureInfos;
@@ -225,4 +235,4 @@ AVFrame* VdecDecoder::ConvertNV12Frame(AVFrame& frame) {
return nv12_frame;
}
-} // namespace Libraries::Vdec2
\ No newline at end of file
+} // namespace Libraries::Vdec2

View File

@ -33,15 +33,15 @@
unstableGitUpdater,
}:
stdenv.mkDerivation {
stdenv.mkDerivation (finalAttrs: {
pname = "shadps4";
version = "0.3.0-unstable-2024-10-14";
version = "0.4.0";
src = fetchFromGitHub {
owner = "shadps4-emu";
repo = "shadPS4";
rev = "09725bd921088b73746605e672abf6ff40171880";
hash = "sha256-NtIiqmiZ1iCciMjT1cL7ONWxNHRO/0bci/thLrcORjo=";
rev = "refs/tags/v.${finalAttrs.version}";
hash = "sha256-dAhm9XMFnpNmbgi/TGktNHMdFDYPOWj31pZkBoUfQhA=";
fetchSubmodules = true;
};
@ -55,6 +55,9 @@ stdenv.mkDerivation {
# downloading an AppImage and trying to run it just won't work.
# https://github.com/shadps4-emu/shadPS4/issues/1368
./0001-Disable-update-checking.patch
# https://github.com/shadps4-emu/shadPS4/issues/1457
./av_err2str_macro.patch
];
buildInputs = [
@ -132,9 +135,10 @@ stdenv.mkDerivation {
meta = {
description = "Early in development PS4 emulator";
homepage = "https://github.com/shadps4-emu/shadPS4";
changelog = "https://github.com/shadps4-emu/shadPS4/releases/tag/v.${finalAttrs.version}";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ ryand56 ];
mainProgram = "shadps4";
platforms = lib.intersectLists lib.platforms.linux lib.platforms.x86_64;
};
}
})