From 90d4c81fa9b2142e7f568a24b1be0befe1ce23d0 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 10 Dec 2022 11:36:31 +0100 Subject: [PATCH] kodi: update disable-internal-texturepacker patch Signed-off-by: Matthias Reichl --- ...00.26-disable-internal-texturepacker.patch | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/packages/mediacenter/kodi/patches/kodi-100.26-disable-internal-texturepacker.patch b/packages/mediacenter/kodi/patches/kodi-100.26-disable-internal-texturepacker.patch index e7a8996751..f090fbda1e 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.26-disable-internal-texturepacker.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.26-disable-internal-texturepacker.patch @@ -1,16 +1,20 @@ diff --git a/cmake/modules/buildtools/FindTexturePacker.cmake b/cmake/modules/buildtools/FindTexturePacker.cmake -index a4acf6453a..c56630001a 100644 +index 4817d15799..c56630001a 100644 --- a/cmake/modules/buildtools/FindTexturePacker.cmake +++ b/cmake/modules/buildtools/FindTexturePacker.cmake -@@ -50,11 +50,6 @@ if(NOT TARGET TexturePacker::TexturePacker::Executable) - # and unset TEXTUREPACKER_EXECUTABLE variable - message(WARNING "Could not find '${APP_NAME_LC}-TexturePacker' or 'TexturePacker' executable in ${_tppath} supplied by -DWITH_TEXTUREPACKER. Make sure the executable file name matches these names!") +@@ -52,15 +52,6 @@ if(NOT TARGET TexturePacker::TexturePacker::Executable) endif() -- else() -- # Ship TexturePacker only on Linux and FreeBSD -- if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "Linux") -- set(INTERNAL_TEXTUREPACKER_INSTALLABLE TRUE CACHE BOOL "" FORCE) -- endif() endif() +- # Ship TexturePacker only on Linux and FreeBSD +- if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "Linux") +- # But skip shipping it if build architecture can be executed on host +- # and TEXTUREPACKER_EXECUTABLE is found +- if(NOT (HOST_CAN_EXECUTE_TARGET AND TEXTUREPACKER_EXECUTABLE)) +- set(INTERNAL_TEXTUREPACKER_INSTALLABLE TRUE CACHE BOOL "" FORCE) +- endif() +- endif() +- # Use it during build if build architecture can be executed on host + # and TEXTUREPACKER_EXECUTABLE is not found + if(HOST_CAN_EXECUTE_TARGET AND NOT TEXTUREPACKER_EXECUTABLE)