![Bernd Kuhls](/assets/img/avatar_default.png)
Removed unneeded patches - 0001-Fixup-include-path.patch (not needed after CMake switch) - 0005-native-TexturePacker-fix-compilation-with-gcc-4.6.patch (applied upstream) - 0006-ffmpeg30.patch (was backported from 17.0-Krypton to 16.0-Jarvis) - 0007-exif-Fix-for-out-of-memory-errors-with-large-numbers.patch (was backported from 17.0-Krypton to 16.0-Jarvis) - 0008-Fix-nullpadding-issue-when-reading-certain-id3v1-tag.patch (was backported from 17.0-Krypton to 16.0-Jarvis) - 0009-lib-cximage-6.0-fix-compilation-with-gcc6.patch (cximage was removed in bump from 16.x to 17.0) - 0010-curl-support-version-7.5.0-and-upwards.patch (applied upstream) - 0011-xbmc_pvr_types.h-Fix-compilation-with-gcc6.patch (applied upstream) - 0012-Fix_includes_in_amcodec.patch (was backported from 17.0-Krypton to 16.0-Jarvis) Rebased patches - 0004-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch also renamed to 0001-... Removed dependencies not needed anymore: - boost41ae93f091
- giflibd44338baf1
- jasper/tiff00724eb109
- jpeg7d5bdfb9a0
- libdcadec378eb2687c
- libglew03ff0d5ea0
- libgcrypt was already an optional dependency in Kodi 16, not part of the CMake buildsystem anymore - libmpeg2d22c829d67
- libogg/libvorbis4c60969177
- libpngbe6b50c6c3
- librtmp, the new rtmp inputstream addon will be added laterd04f43a4eb
- libsquished03f828be
- xlib_libXmu - xlib_libXt Switched to CMake, autoconf was deprecated: https://github.com/xbmc/xbmc/pull/10797 The dependency for egl/gles on arm, formerly enforced by the automake build system, was not ported to CMake. Bumped BR2_TOOLCHAIN_GCC_AT_LEAST to 4.8 to fix build errors with gcc-4.7 found while testing http://autobuild.buildroot.net/toolchains/configs/sourcery-x86.config For details please read http://lists.busybox.net/pipermail/buildroot/2017-April/190195.html Added hard-dependency for libegl, needed after0ac305f7cf
Libva support depends on X11 https://github.com/xbmc/xbmc/blob/Krypton/project/cmake/modules/FindVAAPI.cmake#L42 and OpenGL/EGL https://github.com/xbmc/xbmc/blob/Krypton/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.h#L23 Libvdpau support depends on X11 https://github.com/xbmc/xbmc/blob/Krypton/project/cmake/modules/FindVDPAU.cmake#L21 and OpenGL/EGL https://github.com/xbmc/xbmc/blob/Krypton/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDPAU.h#L43 Updated clean-up hook and added host-xmlstarlet as dependency to manipulate the list of default system addons in addon-manifest.xml. Added dependency to BR2_ENABLE_LOCALE, needs iconv_open: https://github.com/xbmc/xbmc/blob/Krypton/xbmc/utils/CharsetConverter.cpp#L200 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> [Thomas: minor tweaks.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
43 lines
1.6 KiB
Diff
43 lines
1.6 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.
|
|
|
|
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>
|
|
---
|
|
project/cmake/KodiConfig.cmake.in | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/project/cmake/KodiConfig.cmake.in b/project/cmake/KodiConfig.cmake.in
|
|
index 76626ec..ffb8e1d 100644
|
|
--- a/project/cmake/KodiConfig.cmake.in
|
|
+++ b/project/cmake/KodiConfig.cmake.in
|
|
@@ -7,7 +7,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 @@ endif()
|
|
if(NOT WIN32)
|
|
set(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} @CXX11_SWITCH@")
|
|
endif()
|
|
-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
|
|
|