mirror of
https://git.eden-emu.dev/eden-emu/eden
synced 2026-06-28 11:55:22 +02:00
properly build with new openssl cpm mechanism
This commit is contained in:
parent
28d4edd0f9
commit
4a7da74b9d
9 changed files with 43 additions and 11 deletions
15
.patch/ffmpeg/0001-sysctl-openorbis.patch
Normal file
15
.patch/ffmpeg/0001-sysctl-openorbis.patch
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
diff --git a/libavutil/cpu.c b/libavutil/cpu.c
|
||||
index 03e2720..874258f 100644
|
||||
--- a/libavutil/cpu.c
|
||||
+++ b/libavutil/cpu.c
|
||||
@@ -43,8 +43,10 @@
|
||||
#include <sys/param.h>
|
||||
#endif
|
||||
#include <sys/types.h>
|
||||
+#ifndef __OPENORBIS__
|
||||
#include <sys/sysctl.h>
|
||||
#endif
|
||||
+#endif
|
||||
#if HAVE_UNISTD_H
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
13
.patch/openssl/0002-fix-gnu-openorbis.patch
Normal file
13
.patch/openssl/0002-fix-gnu-openorbis.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/crypto/o_str.c b/crypto/o_str.c
|
||||
index 8aadff5..ba427c9 100644
|
||||
--- a/crypto/o_str.c
|
||||
+++ b/crypto/o_str.c
|
||||
@@ -385,7 +385,7 @@ int openssl_strerror_r(int errnum, char *buf, size_t buflen)
|
||||
* It can return a pointer to some (immutable) static string in which case
|
||||
* buf is left unused.
|
||||
*/
|
||||
- err = strerror_r(errnum, buf, buflen);
|
||||
+ err = (char *)strerror_r(errnum, buf, buflen);
|
||||
if (err == NULL || buflen == 0)
|
||||
return 0;
|
||||
/*
|
||||
Loading…
Add table
Add a link
Reference in a new issue