148e695e37
Rebased patch 0001. Removed patch 0002, not needed anymore due to use of system ffmpeg package. Added patch 0002 to fix build with gcc-4.9, gcc-4.8 stays broken. Switch from python2 to python3, reworked dependencies. Rework platform handling following upstream changes, only the choice of a render system (OpenGL vs. OpenGLES) is needed now, for details see upstream PR 18534. Add configure options to force detection of the host version of wayland-scanner. Use system ffmpeg instead of internal build. Added dependency to spdlog, for reference see upstream PR 17498. cpluff was removed upstream. Add configure option to use host version of flatc. Add configure option to disable tests, for reference see upstream PR 17489. Added optional dependency to libudfread, for reference see upstream PR 17612. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
46 lines
1.7 KiB
Diff
46 lines
1.7 KiB
Diff
From 6604cce38fed748e98d3bd2bf9d0f368d67eeb3c Mon Sep 17 00:00:00 2001
|
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
Date: Wed, 29 Jul 2015 23:13:33 +0200
|
|
Subject: [PATCH] kodi-config.cmake: use CMAKE_FIND_ROOT_PATH to fix
|
|
cross-compilation
|
|
|
|
When cross-compiling, the location at build time of the libraries is
|
|
not the same as the one at run-time. The CMAKE_FIND_ROOT_PATH variable
|
|
is here to handle this difference, so use it in kodi-config.cmake.
|
|
|
|
Upstream status: Reverted (PR 17616)
|
|
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
(rebased and simplified for Kodi 17.0-Krypton)
|
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
|
(rebased for Kodi 19.0-Matrix)
|
|
---
|
|
cmake/KodiConfig.cmake.in | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/cmake/KodiConfig.cmake.in b/cmake/KodiConfig.cmake.in
|
|
index a06d889fca9d..ff299807ea44 100644
|
|
--- a/cmake/KodiConfig.cmake.in
|
|
+++ b/cmake/KodiConfig.cmake.in
|
|
@@ -9,7 +9,7 @@ if(NOT @APP_NAME_UC@_PREFIX)
|
|
set(@APP_NAME_UC@_PREFIX @APP_PREFIX@)
|
|
endif()
|
|
if(NOT @APP_NAME_UC@_INCLUDE_DIR)
|
|
- set(@APP_NAME_UC@_INCLUDE_DIR @APP_INCLUDE_DIR@)
|
|
+ set(@APP_NAME_UC@_INCLUDE_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_INCLUDE_DIR@)
|
|
endif()
|
|
if(NOT @APP_NAME_UC@_LIB_DIR)
|
|
set(@APP_NAME_UC@_LIB_DIR @APP_LIB_DIR@)
|
|
@@ -18,7 +18,7 @@ if(NOT @APP_NAME_UC@_DATA_DIR)
|
|
set(@APP_NAME_UC@_DATA_DIR @APP_DATA_DIR@)
|
|
endif()
|
|
set(APP_RENDER_SYSTEM @APP_RENDER_SYSTEM@)
|
|
-list(APPEND CMAKE_MODULE_PATH @APP_LIB_DIR@ @APP_DATA_DIR@/cmake)
|
|
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@ ${CMAKE_FIND_ROOT_PATH}/@APP_DATA_DIR@/cmake)
|
|
|
|
string(REPLACE ";" " " ARCH_DEFINES "@ARCH_DEFINES@")
|
|
add_definitions(${ARCH_DEFINES} -DBUILD_KODI_ADDON)
|
|
--
|
|
2.5.0
|
|
|