diff --git a/packages/mediacenter/p8-platform/package.mk b/packages/mediacenter/p8-platform/package.mk index 4f9e30bac3..f4a8c7761b 100644 --- a/packages/mediacenter/p8-platform/package.mk +++ b/packages/mediacenter/p8-platform/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="p8-platform" -PKG_VERSION="32190045c7eb6883c0662db2f91b4ceeab904fc2" -PKG_SHA256="5225417c2c174d49124d0e44d32e3828f9b83464422445d303adb2dc3111686d" +PKG_VERSION="f6a565efa00581b791e3a63258950a0a3194da86" +PKG_SHA256="e62568e627fd80fe314f7a3120548f8f2977401801fee253ea426a13b009a288" PKG_LICENSE="GPL" PKG_SITE="http://www.kodi.tv" PKG_URL="https://github.com/Pulse-Eight/platform/archive/$PKG_VERSION.tar.gz" diff --git a/packages/mediacenter/p8-platform/patches/p8-platform-02-cmake_install_prefix_toolchain.patch b/packages/mediacenter/p8-platform/patches/p8-platform-02-cmake_install_prefix_toolchain.patch index 6f2a694a71..8602c31015 100644 --- a/packages/mediacenter/p8-platform/patches/p8-platform-02-cmake_install_prefix_toolchain.patch +++ b/packages/mediacenter/p8-platform/patches/p8-platform-02-cmake_install_prefix_toolchain.patch @@ -1,30 +1,30 @@ -diff -Naur a/p8-platform-config.cmake.in b/p8-platform-config.cmake.in ---- a/p8-platform-config.cmake.in 2016-01-19 20:51:52.000000000 +0100 -+++ b/p8-platform-config.cmake.in 2017-01-03 19:48:27.000000000 +0100 -@@ -10,16 +10,16 @@ +diff --git a/p8-platform-config.cmake.in b/p8-platform-config.cmake.in +index f59418d..df7ed21 100644 +--- a/p8-platform-config.cmake.in ++++ b/p8-platform-config.cmake.in +@@ -10,7 +10,7 @@ # # propagate these properties from one build system to the other set (p8-platform_VERSION "@p8-platform_VERSION_MAJOR@.@p8-platform_VERSION_MINOR@") --set (p8-platform_INCLUDE_DIRS @p8-platform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX@/include) +-find_path (p8-platform_INCLUDE_DIRS p8-platform/os.h) +set (p8-platform_INCLUDE_DIRS @p8-platform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX_TOOLCHAIN@/include/p8-platform) set (p8-platform_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@") set (p8-platform_LINKER_FLAGS "@p8-platform_LINKER_FLAGS@") set (p8-platform_CONFIG_VARS "@p8-platform_CONFIG_VARS@") - - # libraries come from the build tree where this file was generated +@@ -19,7 +19,7 @@ set (p8-platform_CONFIG_VARS "@p8-platform_CONFIG_VARS@") if(WIN32) -- set (p8-platform_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/p8-platform.lib") -+ set (p8-platform_LIBRARY "@CMAKE_INSTALL_PREFIX_TOOLCHAIN@/@CMAKE_INSTALL_LIBDIR@/p8-platform.lib") + set (p8-platform_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/p8-platform.lib") else(WIN32) -- set (p8-platform_LIBRARY "-L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lp8-platform") +- find_library (p8-platform_LIBRARY p8-platform) + set (p8-platform_LIBRARY "-L@CMAKE_INSTALL_PREFIX_TOOLCHAIN@/@CMAKE_INSTALL_LIBDIR@ -lp8-platform") endif(WIN32) set (p8-platform_LIBRARIES ${p8-platform_LIBRARY} "@p8-platform_LIBRARIES@") mark_as_advanced (p8-platform_LIBRARY) -diff -Naur a/p8-platform.pc.in b/p8-platform.pc.in ---- a/p8-platform.pc.in 2016-01-19 20:51:52.000000000 +0100 -+++ b/p8-platform.pc.in 2017-01-03 19:48:13.000000000 +0100 -@@ -7,4 +7,4 @@ +diff --git a/p8-platform.pc.in b/p8-platform.pc.in +index f97a2d4..58cd057 100644 +--- a/p8-platform.pc.in ++++ b/p8-platform.pc.in +@@ -7,4 +7,4 @@ Name: @p8-platform_NAME@ Description: @p8-platform_DESCRIPTION@ @p8-platform_VERSION_MAJOR@.@p8-platform_VERSION_MINOR@ Version: @p8-platform_VERSION_MAJOR@.@p8-platform_VERSION_MINOR@.@p8-platform_VERSION_PATCH@ Libs: -L${libdir} -lp8-platform