jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-25 12:16:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "package/libplatform: bump version to 2.1.0"

Browse Source 
This reverts commit 2ac3045453d701b1fbea0d04333642a76fbfecc4.

This commit was part of the Kodi 17 series and was committed too early,
current Kodi 16 is incompatible with this bump and needs to be
reverted, fixes https://bugs.busybox.net/show_bug.cgi?id=9711

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Bernd Kuhls 2017-03-06 19:11:59 +01:00 committed by Thomas Petazzoni
parent 0025e7961d
commit 3e05aa6f53
4 changed files with 45 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
package/libplatform/0001-p8-platform-config-fix-lookup-paths.patch
View File

@ -1,38 +0,0 @@
From 01b5478638c705af29f09ad4ed70289f70a21dcf Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Mon, 6 Feb 2017 14:04:47 +0100
Subject: [PATCH] p8-platform-config: fix lookup paths
Use the proper methods to find the headers and the library.
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
p8-platform-config.cmake.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/p8-platform-config.cmake.in b/p8-platform-config.cmake.in
index 47f30f1..f59418d 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_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@")
set (p8-platform_LINKER_FLAGS "@p8-platform_LINKER_FLAGS@")
set (p8-platform_CONFIG_VARS "@p8-platform_CONFIG_VARS@")
@@ -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")
else(WIN32)
- set (p8-platform_LIBRARY "-L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lp8-platform")
+ find_library (p8-platform_LIBRARY p8-platform)
endif(WIN32)
set (p8-platform_LIBRARIES ${p8-platform_LIBRARY} "@p8-platform_LIBRARIES@")
mark_as_advanced (p8-platform_LIBRARY)
--
2.7.4

40
package/libplatform/0001-platform-config.cmake-fix-paths-for-cross-compilatio.patch Normal file
View File

@ -0,0 +1,40 @@
From 65ba437ed5514dd5762a796d349ed5db49e40fe7 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 29 Jul 2015 21:26:16 +0200
Subject: [PATCH] platform-config.cmake: fix paths for cross-compilation
Headers and library paths in platform-config.cmake must take into
account ${CMAKE_FIND_ROOT_PATH} to work in cross-compilation.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
platform-config.cmake.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/platform-config.cmake.in b/platform-config.cmake.in
index 7fe35fe..78b5085 100644
--- a/platform-config.cmake.in
+++ b/platform-config.cmake.in
@@ -10,16 +10,16 @@
#
# propagate these properties from one build system to the other
set (platform_VERSION "@platform_VERSION_MAJOR@.@platform_VERSION_MINOR@")
-set (platform_INCLUDE_DIRS @platform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX@/include)
+set (platform_INCLUDE_DIRS ${CMAKE_FIND_ROOT_PATH}/@platform_INCLUDE_DIRS@ ${CMAKE_FIND_ROOT_PATH}/@CMAKE_INSTALL_PREFIX@/include)
set (platform_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@")
set (platform_LINKER_FLAGS "@platform_LINKER_FLAGS@")
set (platform_CONFIG_VARS "@platform_CONFIG_VARS@")
# libraries come from the build tree where this file was generated
if(WIN32)
- set (platform_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/platform.lib")
+ set (platform_LIBRARY "${CMAKE_FIND_ROOT_PATH}/@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/platform.lib")
else(WIN32)
- set (platform_LIBRARY "-L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lplatform")
+ set (platform_LIBRARY "-L${CMAKE_FIND_ROOT_PATH}/@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lplatform")
endif(WIN32)
set (platform_LIBRARIES ${platform_LIBRARY} "@platform_LIBRARIES@")
mark_as_advanced (platform_LIBRARY)
--
2.5.0

2
package/libplatform/libplatform.hash
View File

@ -1,2 +1,2 @@
# Locally computed
sha256 88711f1b949285867538a0b2e4189532778e1515325dfa1851eae9d18b6affd9 libplatform-2.1.0.tar.gz
sha256 3603ead8b16a48cb35b1e6dea330a693f10552b1a6ea036c5db9ec248cd8baf5 libplatform-feafe68e3e0b02c3261aefb3d711863ef6fadd38.tar.gz

8
package/libplatform/libplatform.mk
View File

@ -4,10 +4,10 @@
#
################################################################################
LIBPLATFORM_VERSION = 2.1.0
LIBPLATFORM_SITE = $(call github,Pulse-Eight,platform,p8-platform-$(LIBPLATFORM_VERSION))
LIBPLATFORM_LICENSE = GPLv2+
LIBPLATFORM_LICENSE_FILES = src/os.h
LIBPLATFORM_VERSION = feafe68e3e0b02c3261aefb3d711863ef6fadd38
LIBPLATFORM_SITE = $(call github,Pulse-Eight,platform,$(LIBPLATFORM_VERSION))
LIBPLATFORM_LICENSE = GPLv2+, PHP license v3.01
LIBPLATFORM_LICENSE_FILES = src/os.h src/util/fstrcmp.c
LIBPLATFORM_INSTALL_STAGING = YES
$(eval $(cmake-package))