Bump buildroot to 2019.02
This commit is contained in:
@@ -1,42 +0,0 @@
|
||||
From a0acea5bcce3f47badbfeeab7bc2e36eba08fd84 Mon Sep 17 00:00:00 2001
|
||||
From: Sam Lantinga <slouken@libsdl.org>
|
||||
Date: Mon, 27 Aug 2018 11:51:05 -0700
|
||||
Subject: [PATCH] Fixed the DirectFB renderer not being enabled in autoconf
|
||||
builds
|
||||
|
||||
Upstream-url: https://hg.libsdl.org/SDL/raw-rev/751cdc74d55c
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
configure | 3 +++
|
||||
configure.in | 1 +
|
||||
2 files changed, 4 insertions(+)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index e88b38001..40ac14d21 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -21501,6 +21501,9 @@ fi
|
||||
|
||||
$as_echo "#define SDL_VIDEO_DRIVER_DIRECTFB 1" >>confdefs.h
|
||||
|
||||
+
|
||||
+$as_echo "#define SDL_VIDEO_RENDER_DIRECTFB 1" >>confdefs.h
|
||||
+
|
||||
SOURCES="$SOURCES $srcdir/src/video/directfb/*.c"
|
||||
EXTRA_CFLAGS="$EXTRA_CFLAGS $DIRECTFB_CFLAGS"
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 5bf5d717b..ce1d57ea1 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -2163,6 +2163,7 @@ AC_HELP_STRING([--enable-directfb-shared], [dynamically load directfb support [[
|
||||
, enable_directfb_shared=yes)
|
||||
|
||||
AC_DEFINE(SDL_VIDEO_DRIVER_DIRECTFB, 1, [ ])
|
||||
+ AC_DEFINE(SDL_VIDEO_RENDER_DIRECTFB, 1, [ ])
|
||||
SOURCES="$SOURCES $srcdir/src/video/directfb/*.c"
|
||||
EXTRA_CFLAGS="$EXTRA_CFLAGS $DIRECTFB_CFLAGS"
|
||||
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
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
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.0.8.tar.gz.sig
|
||||
sha256 edc77c57308661d576e843344d8638e025a7818bff73f8fbfab09c3c5fd092ec SDL2-2.0.8.tar.gz
|
||||
# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.0.9.tar.gz.sig
|
||||
sha256 255186dc676ecd0c1dbf10ec8a2cc5d6869b5079d8a38194c2aecdff54b324b1 SDL2-2.0.9.tar.gz
|
||||
# Locally calculated
|
||||
sha256 61e627031e1160bf8b9bdbc9cda27656d422ea8eaab199b64b4a4a4168437154 COPYING.txt
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
SDL2_VERSION = 2.0.8
|
||||
SDL2_VERSION = 2.0.9
|
||||
SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz
|
||||
SDL2_SITE = http://www.libsdl.org/release
|
||||
SDL2_LICENSE = Zlib
|
||||
|
||||
Reference in New Issue
Block a user