mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-29 14:16:31 +00:00
package/sdl2: bump version to 2.0.12
patch 0001: already applied upstream patch 0002: already applied upstream Adjust license hash as the copyright year was changed Signed-off-by: Michael Fischer <mf@go-sys.de> [yann.morin.1998@free.fr: two spaces in hash files] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
parent
6e6bd86309
commit
730db2649c
@ -1,35 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
@ -1,41 +0,0 @@
|
|||||||
|
|
||||||
# HG changeset patch
|
|
||||||
# User Paul Cercueil <paul@crapouillou.net>
|
|
||||||
# Date 1576820863 28800
|
|
||||||
# Node ID 4f5bef55183c677d12a7da8f3392879ed50670a3
|
|
||||||
# Parent 01f16d7f36cb9f4fa02016e57fbe915fdea71cc8
|
|
||||||
kmsdrm: Fix busy-loop within libc's dlopen()
|
|
||||||
For some obscure reason, the order in which the libdrm/libgbm libraries
|
|
||||||
are loaded matters.
|
|
||||||
|
|
||||||
Without this fix, the first call to check_modesetting() will work and
|
|
||||||
load then unload all symbols properly, but the second call to this
|
|
||||||
function will lock up as soon as dlopen() is called on libdrm.
|
|
||||||
|
|
||||||
Swapping the order in which the libdrm and libgbm libraries are loaded
|
|
||||||
is enough to fix (or work around?) this issue.
|
|
||||||
|
|
||||||
Fixes #4891:
|
|
||||||
https://bugzilla.libsdl.org/show_bug.cgi?id=4891
|
|
||||||
|
|
||||||
Upstream: https://hg.libsdl.org/SDL/rev/4f5bef55183c
|
|
||||||
|
|
||||||
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
|
|
||||||
[yann.morin.1998@free.fr: add upstream commit URL]
|
|
||||||
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
|
|
||||||
|
|
||||||
diff -r 01f16d7f36cb -r 4f5bef55183c src/video/kmsdrm/SDL_kmsdrmdyn.c
|
|
||||||
--- a/src/video/kmsdrm/SDL_kmsdrmdyn.c Thu Dec 19 21:45:44 2019 -0800
|
|
||||||
+++ b/src/video/kmsdrm/SDL_kmsdrmdyn.c Thu Dec 19 21:47:43 2019 -0800
|
|
||||||
@@ -50,8 +50,8 @@
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static kmsdrmdynlib kmsdrmlibs[] = {
|
|
||||||
- {NULL, SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC},
|
|
||||||
- {NULL, SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC_GBM}
|
|
||||||
+ {NULL, SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC_GBM},
|
|
||||||
+ {NULL, SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC}
|
|
||||||
};
|
|
||||||
|
|
||||||
static void *
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.0.10.tar.gz.sig
|
# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.0.12.tar.gz.sig
|
||||||
sha256 b4656c13a1f0d0023ae2f4a9cf08ec92fffb464e0f24238337784159b8b91d57 SDL2-2.0.10.tar.gz
|
sha256 349268f695c02efbc9b9148a70b85e58cefbbf704abd3e91be654db7f1e2c863 SDL2-2.0.12.tar.gz
|
||||||
# Locally calculated
|
# Locally calculated
|
||||||
sha256 a7c8d0b3167c502921192585a582eb8477ad9862330f4d8b9e4a8bb4c1a9d29e COPYING.txt
|
sha256 ae4df3759a726538607b84c00ab8f8a5567d9f38ad5397486eb9b5c5f626caef COPYING.txt
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
SDL2_VERSION = 2.0.10
|
SDL2_VERSION = 2.0.12
|
||||||
SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz
|
SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz
|
||||||
SDL2_SITE = http://www.libsdl.org/release
|
SDL2_SITE = http://www.libsdl.org/release
|
||||||
SDL2_LICENSE = Zlib
|
SDL2_LICENSE = Zlib
|
||||||
|
Loading…
x
Reference in New Issue
Block a user