diff --git a/.checkpackageignore b/.checkpackageignore index e80e2a845f..cd0ccc1abd 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -706,7 +706,6 @@ package/keyutils/0002-cifs.patch Sob Upstream package/kmod/0001-fix-O_CLOEXEC.patch Upstream package/kodi-texturepacker/0001-texturepacker.patch Upstream package/kodi-texturepacker/0002-fix-texture-packer-cmake-source-dir.patch Upstream -package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch Upstream package/kodi/S50kodi Shellcheck Variables package/latencytop/0001-makefile.patch Upstream package/lbase64/0001-retro-compatible-with-Lua-5.1.patch Upstream diff --git a/package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch b/package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch index 057d2254bc..4fb95c8b4a 100644 --- a/package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch +++ b/package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch @@ -8,7 +8,7 @@ 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) +Upstream: Reverted (PR 17616 and 18680) Signed-off-by: Thomas Petazzoni (rebased and simplified for Kodi 17.0-Krypton) diff --git a/package/kodi/0002-cmake-modules-fix-python-detection.patch b/package/kodi/0002-cmake-modules-fix-python-detection.patch index 92a4ac904d..fcf35b25b2 100644 --- a/package/kodi/0002-cmake-modules-fix-python-detection.patch +++ b/package/kodi/0002-cmake-modules-fix-python-detection.patch @@ -5,7 +5,7 @@ Subject: [PATCH] cmake/modules: fix python detection Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN -Upstream: unknown +Upstream: https://github.com/xbmc/xbmc/pull/23230 --- cmake/modules/FindPython.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)