summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-05-05 07:04:50 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-05-05 21:17:37 +0100
commit8558c5292af05f86bda1f3d880fe0694dda18577 (patch)
tree1c27de7637922370e8ea23f2fa738fb37a725d2b /meta/recipes-graphics
parentbf6c6623612d2712e5f99818f0f5ed8905bc90cc (diff)
downloadpoky-8558c5292af05f86bda1f3d880fe0694dda18577.tar.gz
libsdl2: upgrade 2.0.20 -> 2.0.22
(From OE-Core rev: 047f05c7a641db4138cbf3b3ea965873fe75035c) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/libsdl2/libsdl2/0001-Disable-libunwind-in-native-OE-builds-by-not-looking.patch10
-rw-r--r--meta/recipes-graphics/libsdl2/libsdl2/0001-sdlchecks.cmake-pass-cflags-to-the-appropriate-cmake.patch46
-rw-r--r--meta/recipes-graphics/libsdl2/libsdl2/0001-video-restore-ability-to-disable-fb-accel-via-hint.patch36
-rw-r--r--meta/recipes-graphics/libsdl2/libsdl2/optional-libunwind-generic.patch18
-rw-r--r--meta/recipes-graphics/libsdl2/libsdl2_2.0.22.bb (renamed from meta/recipes-graphics/libsdl2/libsdl2_2.0.20.bb)5
5 files changed, 42 insertions, 73 deletions
diff --git a/meta/recipes-graphics/libsdl2/libsdl2/0001-Disable-libunwind-in-native-OE-builds-by-not-looking.patch b/meta/recipes-graphics/libsdl2/libsdl2/0001-Disable-libunwind-in-native-OE-builds-by-not-looking.patch
index 214664f621..57bc522393 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2/0001-Disable-libunwind-in-native-OE-builds-by-not-looking.patch
+++ b/meta/recipes-graphics/libsdl2/libsdl2/0001-Disable-libunwind-in-native-OE-builds-by-not-looking.patch
@@ -1,4 +1,4 @@
1From 50c691e83f81b235bb96ef996dd4568ffaae256f Mon Sep 17 00:00:00 2001 1From 0234c546d86174fafe9ab280cf5f44de50b73676 Mon Sep 17 00:00:00 2001
2From: Carlos Rafael Giani <crg7475@mailbox.org> 2From: Carlos Rafael Giani <crg7475@mailbox.org>
3Date: Fri, 18 Mar 2022 12:06:23 +0100 3Date: Fri, 18 Mar 2022 12:06:23 +0100
4Subject: [PATCH] Disable libunwind in native OE builds by not looking for 4Subject: [PATCH] Disable libunwind in native OE builds by not looking for
@@ -16,15 +16,16 @@ By not looking for the libunwind header, the rest of the libunwind
16specific bits in the CMake build script are disabled. 16specific bits in the CMake build script are disabled.
17 17
18Upstream-Status: Inappropriate [OE specific] 18Upstream-Status: Inappropriate [OE specific]
19
19--- 20---
20 CMakeLists.txt | 2 +- 21 CMakeLists.txt | 2 +-
21 1 file changed, 1 insertion(+), 1 deletion(-) 22 1 file changed, 1 insertion(+), 1 deletion(-)
22 23
23diff --git a/CMakeLists.txt b/CMakeLists.txt 24diff --git a/CMakeLists.txt b/CMakeLists.txt
24index 64f9fbf..12a4d8f 100644 25index 644715a..bbf2e28 100644
25--- a/CMakeLists.txt 26--- a/CMakeLists.txt
26+++ b/CMakeLists.txt 27+++ b/CMakeLists.txt
27@@ -862,7 +862,7 @@ if(SDL_LIBC) 28@@ -869,7 +869,7 @@ if(SDL_LIBC)
28 check_include_file(sys/types.h HAVE_SYS_TYPES_H) 29 check_include_file(sys/types.h HAVE_SYS_TYPES_H)
29 foreach(_HEADER 30 foreach(_HEADER
30 stdio.h stdlib.h stddef.h stdarg.h malloc.h memory.h string.h limits.h float.h 31 stdio.h stdlib.h stddef.h stdarg.h malloc.h memory.h string.h limits.h float.h
@@ -33,6 +34,3 @@ index 64f9fbf..12a4d8f 100644
33 string(TOUPPER "HAVE_${_HEADER}" _UPPER) 34 string(TOUPPER "HAVE_${_HEADER}" _UPPER)
34 string(REPLACE "." "_" _HAVE_H ${_UPPER}) 35 string(REPLACE "." "_" _HAVE_H ${_UPPER})
35 check_include_file("${_HEADER}" ${_HAVE_H}) 36 check_include_file("${_HEADER}" ${_HAVE_H})
36--
372.32.0
38
diff --git a/meta/recipes-graphics/libsdl2/libsdl2/0001-sdlchecks.cmake-pass-cflags-to-the-appropriate-cmake.patch b/meta/recipes-graphics/libsdl2/libsdl2/0001-sdlchecks.cmake-pass-cflags-to-the-appropriate-cmake.patch
deleted file mode 100644
index e5d6cda0eb..0000000000
--- a/meta/recipes-graphics/libsdl2/libsdl2/0001-sdlchecks.cmake-pass-cflags-to-the-appropriate-cmake.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From dbf0a3f6ea77a1d5f5e3c4dec7a22fcc09a49537 Mon Sep 17 00:00:00 2001
2From: Max Krummenacher <max.krummenacher@toradex.com>
3Date: Mon, 10 Jan 2022 21:52:02 +0000
4Subject: [PATCH] cmake: sdlchecks.cmake: pass cflags to the appropriate cmake
5 variable
6
7If egl.pc sets at least two macros as the i.MX Vivante driver does, e.g.:
8| Cflags: -I${includedir} -DLINUX -DWL_EGL_PLATFORM
9
10then we get the following error during configuration:
11
12| -- Performing Test HAVE_OPENGL_EGL
13| CMake Error: Parse error in command line argument: WL_EGL_PLATFORM
14| Should be: VAR:type=value
15
16If one changes to add a value to the macro, e.g.
17| Cflags: -I${includedir} -DLINUX=1 -DWL_EGL_PLATFORM=1
18then cmake does not error out but the macro is not passed to the
19C compiler.
20
21CMAKE_REQUIRED_FLAGS is the wrong variable to pass the CFLAGS in,
22CMAKE_REQUIRED_DEFINITIONS should be used.
23
24Upstream-Status: Submitted [https://github.com/libsdl-org/SDL/pull/5209]
25Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
26---
27 cmake/sdlchecks.cmake | 3 +--
28 1 file changed, 1 insertion(+), 2 deletions(-)
29
30diff --git a/cmake/sdlchecks.cmake b/cmake/sdlchecks.cmake
31index 32be19c..f61b8df 100644
32--- a/cmake/sdlchecks.cmake
33+++ b/cmake/sdlchecks.cmake
34@@ -808,8 +808,7 @@ endmacro()
35 macro(CheckEGL)
36 if (SDL_OPENGL OR SDL_OPENGLES)
37 pkg_check_modules(EGL egl)
38- string(REPLACE "-D_THREAD_SAFE;" "-D_THREAD_SAFE=1;" EGL_CFLAGS "${EGL_CFLAGS}")
39- set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${EGL_CFLAGS}")
40+ set(CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS} ${EGL_CFLAGS}")
41 check_c_source_compiles("
42 #define EGL_API_FB
43 #define MESA_EGL_NO_X11_HEADERS
44--
452.20.1
46
diff --git a/meta/recipes-graphics/libsdl2/libsdl2/0001-video-restore-ability-to-disable-fb-accel-via-hint.patch b/meta/recipes-graphics/libsdl2/libsdl2/0001-video-restore-ability-to-disable-fb-accel-via-hint.patch
new file mode 100644
index 0000000000..fc74d30556
--- /dev/null
+++ b/meta/recipes-graphics/libsdl2/libsdl2/0001-video-restore-ability-to-disable-fb-accel-via-hint.patch
@@ -0,0 +1,36 @@
1From 14ad91658fd296e34bb9e833281e72c871bfb189 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Tue, 3 May 2022 12:31:50 +0200
4Subject: [PATCH] video: restore ability to disable fb accel via hint
5
6Somewhere in code refactoring between .20 and .22 this check
7was lost, and so the hint had no effect anymore.
8
9Upstream-Status: Submitted [https://github.com/libsdl-org/SDL/pull/5611]
10Signed-off-by: Alexander Kanavin <alex@linutronix.de>
11---
12 src/video/SDL_video.c | 8 ++++++++
13 1 file changed, 8 insertions(+)
14
15diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
16index 93c803e..cbe7616 100644
17--- a/src/video/SDL_video.c
18+++ b/src/video/SDL_video.c
19@@ -2503,6 +2503,14 @@ SDL_CreateWindowFramebuffer(SDL_Window * window)
20 if (!_this->checked_texture_framebuffer) {
21 SDL_bool attempt_texture_framebuffer = SDL_TRUE;
22
23+ /* See if the user or application wants to specifically disable the framebuffer */
24+ const char *hint = SDL_GetHint(SDL_HINT_FRAMEBUFFER_ACCELERATION);
25+ if (hint) {
26+ if (*hint == '0' || SDL_strcasecmp(hint, "false") == 0) {
27+ attempt_texture_framebuffer = SDL_FALSE;
28+ }
29+ }
30+
31 if (_this->is_dummy) { /* dummy driver never has GPU support, of course. */
32 attempt_texture_framebuffer = SDL_FALSE;
33 }
34--
352.30.2
36
diff --git a/meta/recipes-graphics/libsdl2/libsdl2/optional-libunwind-generic.patch b/meta/recipes-graphics/libsdl2/libsdl2/optional-libunwind-generic.patch
deleted file mode 100644
index 757b99a5f6..0000000000
--- a/meta/recipes-graphics/libsdl2/libsdl2/optional-libunwind-generic.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1Do not error when libunwind-generic is not found, Not all
2implementations of libunwind will provide this library therefore
3do not make it hard error if its not found.
4
5Upstream-Status: Submitted [https://github.com/libsdl-org/SDL/pull/5194]
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7
8--- a/CMakeLists.txt
9+++ b/CMakeLists.txt
10@@ -1358,7 +1358,7 @@ elseif(UNIX AND NOT APPLE AND NOT ANDROI
11 if(HAVE_LIBUNWIND_H)
12 # We've already found the header, so REQUIRE the lib to be present
13 pkg_search_module(UNWIND REQUIRED libunwind)
14- pkg_search_module(UNWIND_GENERIC REQUIRED libunwind-generic)
15+ pkg_search_module(UNWIND_GENERIC libunwind-generic)
16 list(APPEND EXTRA_LIBS ${UNWIND_LIBRARIES} ${UNWIND_GENERIC_LIBRARIES})
17 endif()
18 endif()
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.20.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.22.bb
index c1c827af79..7678319770 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.20.bb
+++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.22.bb
@@ -22,14 +22,13 @@ LIC_FILES_CHKSUM:append = " ${@bb.utils.contains('PACKAGECONFIG', 'arm-neon', 'f
22PROVIDES = "virtual/libsdl2" 22PROVIDES = "virtual/libsdl2"
23 23
24SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \ 24SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \
25 file://optional-libunwind-generic.patch \ 25 file://0001-video-restore-ability-to-disable-fb-accel-via-hint.patch \
26 file://0001-sdlchecks.cmake-pass-cflags-to-the-appropriate-cmake.patch \
27 " 26 "
28SRC_URI:append:class-native = " file://0001-Disable-libunwind-in-native-OE-builds-by-not-looking.patch" 27SRC_URI:append:class-native = " file://0001-Disable-libunwind-in-native-OE-builds-by-not-looking.patch"
29 28
30S = "${WORKDIR}/SDL2-${PV}" 29S = "${WORKDIR}/SDL2-${PV}"
31 30
32SRC_URI[sha256sum] = "c56aba1d7b5b0e7e999e4a7698c70b63a3394ff9704b5f6e1c57e0c16f04dd06" 31SRC_URI[sha256sum] = "fe7cbf3127882e3fc7259a75a0cb585620272c51745d3852ab9dd87960697f2e"
33 32
34inherit cmake lib_package binconfig-disabled pkgconfig 33inherit cmake lib_package binconfig-disabled pkgconfig
35 34