jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-02 07:57:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/sdl2: fix build without threads

Browse Source 
- Drop first patch (not needed since bump to version 2.0.10 and
  2601ef1f2d)
- Add a new patch to fix an outstanding build failure

Fixes:
 - http://autobuild.buildroot.org/results/7f7712c5bd47de4a3fcec1e0d0526fd5a3ecd532

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine 2020-02-11 22:44:27 +01:00 committed by Peter Korsgaard
parent 1b81eb7d04
commit 38973acc70
2 changed files with 35 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
package/sdl2/0001-fix-build-with-disable-threads.patch
View File

@ -1,63 +0,0 @@
From 26646028f79d7f3d857df9b46cd6d0285796c699 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Wed, 21 Nov 2018 22:31:09 +0100
Subject: [PATCH] fix build with --disable-threads
SDL_LinuxSetThreadPriority() has been added since version 2.0.9 and
https://github.com/SDL-mirror/SDL/commit/f25a7fa870bdceb339e5105973f689606bcb9086
However, this function is used in src/dynapi/SDL_dynapi_procs.h even
when SDL_THREADS_DISABLED
However, when SDL_THREADS_DISABLED is set, SDL_LinuxSetThreadPriority is
not defined because thread/pthread/SDL_systhread.c is not built
So check SDL_THREADS_DISABLED in addition to __LINUX__
Fixes:
- http://autobuild.buildroot.org/results/539cb9ab6c605dc6be73ebe90debab1a998f2451
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
include/SDL_system.h | 4 ++--
src/dynapi/SDL_dynapi_procs.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/SDL_system.h b/include/SDL_system.h
index 4dc372d6b..0513d7fa5 100644
--- a/include/SDL_system.h
+++ b/include/SDL_system.h
@@ -77,7 +77,7 @@ extern DECLSPEC SDL_bool SDLCALL SDL_DXGIGetOutputInfo( int displayIndex, int *a
/* Platform specific functions for Linux */
-#ifdef __LINUX__
+#if defined(__LINUX__) && !defined(SDL_THREADS_DISABLED)
/**
\brief Sets the UNIX nice value for a thread, using setpriority() if possible, and RealtimeKit if available.
@@ -86,7 +86,7 @@ extern DECLSPEC SDL_bool SDLCALL SDL_DXGIGetOutputInfo( int displayIndex, int *a
*/
extern DECLSPEC int SDLCALL SDL_LinuxSetThreadPriority(Sint64 threadID, int priority);
-#endif /* __LINUX__ */
+#endif /* defined(__LINUX__) && !defined(SDL_THREADS_DISABLED) */
/* Platform specific functions for iOS */
#if defined(__IPHONEOS__) && __IPHONEOS__
diff --git a/src/dynapi/SDL_dynapi_procs.h b/src/dynapi/SDL_dynapi_procs.h
index c95cf708b..ee9bf60a6 100644
--- a/src/dynapi/SDL_dynapi_procs.h
+++ b/src/dynapi/SDL_dynapi_procs.h
@@ -708,7 +708,7 @@ SDL_DYNAPI_PROC(SDL_bool,SDL_IsAndroidTV,(void),(),return)
SDL_DYNAPI_PROC(double,SDL_log10,(double a),(a),return)
SDL_DYNAPI_PROC(float,SDL_log10f,(float a),(a),return)
SDL_DYNAPI_PROC(char*,SDL_GameControllerMappingForDeviceIndex,(int a),(a),return)
-#ifdef __LINUX__
+#if defined(__LINUX__) && !defined(SDL_THREADS_DISABLED)
SDL_DYNAPI_PROC(int,SDL_LinuxSetThreadPriority,(Sint64 a, int b),(a,b),return)
#endif
SDL_DYNAPI_PROC(SDL_bool,SDL_HasAVX512F,(void),(),return)
--
2.17.1

35
package/sdl2/0001-src-core-linux-SDL_threadprio.c-fix-build-without-th.patch Normal file
View File

@ -0,0 +1,35 @@
From cb51ec369186628e016a10ccf25b2b26d5d2ef85 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Mon, 10 Feb 2020 21:31:36 +0100
Subject: [PATCH] src/core/linux/SDL_threadprio.c: fix build without threads
Add an include on SDL_error.h to avoid the following build failure
without threads:
/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: build/.libs/SDL_threadprio.o: in function `SDL_LinuxSetThreadPriority_REAL':
SDL_threadprio.c:(.text+0x0): undefined reference to `SDL_Unsupported'
Fixes:
- http://autobuild.buildroot.org/results/7f7712c5bd47de4a3fcec1e0d0526fd5a3ecd532
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: https://bugzilla.libsdl.org/show_bug.cgi?id=4971]
---
src/core/linux/SDL_threadprio.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/core/linux/SDL_threadprio.c b/src/core/linux/SDL_threadprio.c
index 162b1a3f1..2cbc4cb48 100644
--- a/src/core/linux/SDL_threadprio.c
+++ b/src/core/linux/SDL_threadprio.c
@@ -22,6 +22,7 @@
#ifdef __LINUX__
+#include "SDL_error.h"
#include "SDL_stdinc.h"
#if !SDL_THREADS_DISABLED
--
2.24.1