diff options
| author | Pavel Vinogradov | 2019-08-04 20:11:13 -0400 |
|---|---|---|
| committer | Pavel Vinogradov | 2019-08-04 20:11:13 -0400 |
| commit | cbc14e7e1ff07e79750edd4a227ffb207aa6c622 (patch) | |
| tree | 37e201d7efb43d9cb6c8d01d09908b90f8a76790 /video | |
| parent | 78faeeae9886a78ecd210ec323a95d3c814be746 (diff) | |
video/kodi: reorganized patching and added python finding fix
Diffstat (limited to 'video')
| -rw-r--r-- | video/kodi/HISTORY | 6 | ||||
| -rwxr-xr-x | video/kodi/PRE_BUILD | 3 | ||||
| -rw-r--r-- | video/kodi/patches/0001-std-isnan-isnan.patch (renamed from video/kodi/0001-std-isnan-isnan.patch) | 0 | ||||
| -rw-r--r-- | video/kodi/patches/crossguid.patch (renamed from video/kodi/crossguid.patch) | 0 | ||||
| -rw-r--r-- | video/kodi/patches/python.patch | 16 |
5 files changed, 23 insertions, 2 deletions
diff --git a/video/kodi/HISTORY b/video/kodi/HISTORY index 3571a41a09..7855cb6a1e 100644 --- a/video/kodi/HISTORY +++ b/video/kodi/HISTORY @@ -1,3 +1,9 @@ +2019-08-04 Pavel Vinogradov <public@sourcemage.org> + * PRE_BUILD: use apply_patch_dir now + * crossguid.patch, 0001-std-isnan-isnan.patch: moved to patches/ subdir + * patches/python.patch: added to correctly find python executable and + libraries + 2019-07-19 Pavel Vinogradov <public@sourcemage.org> * DEPENDS: dropped gnutls diff --git a/video/kodi/PRE_BUILD b/video/kodi/PRE_BUILD index 2abad818d8..7aa9ca6d44 100755 --- a/video/kodi/PRE_BUILD +++ b/video/kodi/PRE_BUILD @@ -1,5 +1,4 @@ default_pre_build && cd ${SOURCE_DIRECTORY} && -patch -Np1 < "${SPELL_DIRECTORY}/crossguid.patch" && -patch -Np1 < "${SPELL_DIRECTORY}/0001-std-isnan-isnan.patch" +apply_patch_dir patches diff --git a/video/kodi/0001-std-isnan-isnan.patch b/video/kodi/patches/0001-std-isnan-isnan.patch index e75deab3c9..e75deab3c9 100644 --- a/video/kodi/0001-std-isnan-isnan.patch +++ b/video/kodi/patches/0001-std-isnan-isnan.patch diff --git a/video/kodi/crossguid.patch b/video/kodi/patches/crossguid.patch index 9bae13dba4..9bae13dba4 100644 --- a/video/kodi/crossguid.patch +++ b/video/kodi/patches/crossguid.patch diff --git a/video/kodi/patches/python.patch b/video/kodi/patches/python.patch new file mode 100644 index 0000000000..5dc0fcf6d6 --- /dev/null +++ b/video/kodi/patches/python.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake +--- a/cmake/modules/FindPython.cmake ++++ b/cmake/modules/FindPython.cmake +@@ -6,10 +6,10 @@ + # PYTHON_LIBRARIES - The python libraries + + if(PKG_CONFIG_FOUND) +- pkg_check_modules(PC_PYTHON python>=2.7 QUIET) ++ find_package(PythonLibs 2.7 REQUIRED) + endif() + +-find_program(PYTHON_EXECUTABLE python ONLY_CMAKE_FIND_ROOT_PATH) ++find_program(PYTHON_EXECUTABLE python2.7 ONLY_CMAKE_FIND_ROOT_PATH) + find_library(PYTHON_LIBRARY NAMES python2.7 PATHS ${PC_PYTHON_LIBDIR}) + find_path(PYTHON_INCLUDE_DIR NAMES Python.h PATHS ${PC_PYTHON_INCLUDE_DIRS} ${DEPENDS_PATH}/include/python2.7) + |