From: Daniel Golle <daniel@makrotopia.org>
Date: Sun, 8 Dec 2024 02:00:37 +0000 (+0000)
Subject: sdl2: get rid of libunwind for good
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=88bf1425a10b88f3200e0aab57bdcc502dce8dae;p=feed%2Fvideo.git

sdl2: get rid of libunwind for good

Previous attempts to prevent linking against libunwind were incomplete.
Simply don't call CheckLibUnwind macro.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---

diff --git a/libs/sdl2/patches/110-tests-no-libunwind.patch b/libs/sdl2/patches/110-tests-no-libunwind.patch
index eb9ec8d..85fa9cb 100644
--- a/libs/sdl2/patches/110-tests-no-libunwind.patch
+++ b/libs/sdl2/patches/110-tests-no-libunwind.patch
@@ -1,10 +1,10 @@
---- a/cmake/sdlchecks.cmake
-+++ b/cmake/sdlchecks.cmake
-@@ -1406,7 +1406,4 @@ macro(CheckLibUnwind)
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1622,7 +1622,6 @@ elseif(UNIX AND NOT APPLE AND NOT RISCOS
+       endif()
+ 
      endif()
-   endif()
+-    CheckLibUnwind()
  
--  if(found_libunwind)
--    set(HAVE_LIBUNWIND_H TRUE)
--  endif()
- endmacro()
+     if(HAVE_DBUS_DBUS_H)
+       list(APPEND SOURCE_FILES "${SDL2_SOURCE_DIR}/src/core/linux/SDL_dbus.c")