Skip to contentSkip to conversation

Revert "package/libplatform: bump version to 2.1.0"

PATCH New Bernd Kuhls 4 participants 6 messages Mar 6, 2017 – Mar 7, 2017

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH 1/2 Revert "package/libplatform: bump version to 2.1.0"

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 <[email protected]>
---
 .../0001-p8-platform-config-fix-lookup-paths.patch | 38 --------------------
 ...nfig.cmake-fix-paths-for-cross-compilatio.patch | 40 ++++++++++++++++++++++
 package/libplatform/libplatform.hash               |  2 +-
 package/libplatform/libplatform.mk                 |  8 ++---
 4 files changed, 45 insertions(+), 43 deletions(-)
 delete mode 100644 package/libplatform/0001-p8-platform-config-fix-lookup-paths.patch
 create mode 100644 package/libplatform/0001-platform-config.cmake-fix-paths-for-cross-compilatio.patch
package/libplatform/0001-p8-platform-config-fix-lookup-paths.patch deleted +0 -38
deleted file mode 100644
index d487fd942..000000000
@@ -1,38 +0,0 @@
-From 01b5478638c705af29f09ad4ed70289f70a21dcf Mon Sep 17 00:00:00 2001
-From: "Yann E. MORIN" <[email protected]>
-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 <[email protected]>
-Signed-off-by: "Yann E. MORIN" <[email protected]>
----
- 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 at .@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 at 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
-
package/libplatform/0001-platform-config.cmake-fix-paths-for-cross-compilatio.patch new file +40 -0
new file mode 100644
index 000000000..89f35bdb3
@@ -0,0 +1,40 @@
+From 65ba437ed5514dd5762a796d349ed5db49e40fe7 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <[email protected]>
+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 <[email protected]>
+---
+ 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 at .@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 at 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
+
package/libplatform/libplatform.hash +1 -1
index e3d5ed5a9..8975dfd8a 100644
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 88711f1b949285867538a0b2e4189532778e1515325dfa1851eae9d18b6affd9  libplatform-2.1.0.tar.gz
+sha256  3603ead8b16a48cb35b1e6dea330a693f10552b1a6ea036c5db9ec248cd8baf5  libplatform-feafe68e3e0b02c3261aefb3d711863ef6fadd38.tar.gz
package/libplatform/libplatform.mk +4 -4
index d9cd582f7..6d549151d 100644
@@ -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))
Signature · 1 line
2.11.0
author
#1 lore raw

PATCH 2/2 Revert "package/libcec: bump version to 4.0.2"

This reverts commit bf1c9828f2c7ef37a0af4da5532472fb7e03ba67.

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 <[email protected]>
---
 package/libcec/libcec.hash | 2 +-
 package/libcec/libcec.mk   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
package/libcec/libcec.hash +1 -1
index 5416c20fe..377f343a2 100644
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 b8b8dd31f3ebdd5472f03ab7d401600ea0d959b1288b9ca24bf457ef60e2ba27  libcec-4.0.2.tar.gz
+sha256  0f29d5a2d155b507807ba896bc3b3e50a0ab56bf8f543a2bf5c2798c790292b5  libcec-2c675dac48387c48c7f43c5d2547ef0c4ef5c7dd.tar.gz
package/libcec/libcec.mk +2 -2
index f00e10f5d..c9a05a5fb 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LIBCEC_VERSION = 4.0.2
-LIBCEC_SITE = $(call github,Pulse-Eight,libcec,libcec-$(LIBCEC_VERSION))
+LIBCEC_VERSION = 2c675dac48387c48c7f43c5d2547ef0c4ef5c7dd
+LIBCEC_SITE = $(call github,Pulse-Eight,libcec,$(LIBCEC_VERSION))
 LIBCEC_LICENSE = GPLv2+
 LIBCEC_LICENSE_FILES = COPYING
Signature · 1 line
2.11.0
#2 lore raw

PATCH 1/2 Revert "package/libplatform: bump version to 2.1.0"

In reply to Bernd Kuhls

Hello,

Quoted 7 lines · Bernd Kuhls

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 <[email protected]>
Quoted 8 lines
---
 .../0001-p8-platform-config-fix-lookup-paths.patch | 38 --------------------
 ...nfig.cmake-fix-paths-for-cross-compilatio.patch | 40 ++++++++++++++++++++++
 package/libplatform/libplatform.hash               |  2 +-
 package/libplatform/libplatform.mk                 |  8 ++---
 4 files changed, 45 insertions(+), 43 deletions(-)
 delete mode 100644 package/libplatform/0001-p8-platform-config-fix-lookup-paths.patch
 create mode 100644 package/libplatform/0001-platform-config.cmake-fix-paths-for-cross-compilatio.patch

Thanks, both commits applied. Perhaps we need to apply them to the LTS version of Buildroot as well?

Also, Bernd: what is the plan with Kodi 17 ? We still don't have a solution for the ugly patches needed on libraries that Kodi depends on. Would it be possible to make progress on this ?

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#3 lore raw

PATCH 1/2 Revert "package/libplatform: bump version to 2.1.0"

Quoted 19 lines · Thomas Petazzoni

Hello,

Quoted 7 lines · Bernd Kuhls

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 <[email protected]>
Quoted 8 lines
---
 .../0001-p8-platform-config-fix-lookup-paths.patch | 38 --------------------
 ...nfig.cmake-fix-paths-for-cross-compilatio.patch | 40 ++++++++++++++++++++++
 package/libplatform/libplatform.hash               |  2 +-
 package/libplatform/libplatform.mk                 |  8 ++---
 4 files changed, 45 insertions(+), 43 deletions(-)
 delete mode 100644 package/libplatform/0001-p8-platform-config-fix-lookup-paths.patch
 create mode 100644 package/libplatform/0001-platform-config.cmake-fix-paths-for-cross-compilatio.patch
Quoted 2 lines

Thanks, both commits applied. Perhaps we need to apply them to the LTS version of Buildroot as well?

Also, perhaps comments should be added to libplatform and libcec to mention
that their version must be synchronised with kodi?

Regards,
Arnout

Quoted 9 lines

Also, Bernd: what is the plan with Kodi 17 ? We still don't have a solution for the ugly patches needed on libraries that Kodi depends on. Would it be possible to make progress on this ?

Thanks,

Thomas

Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
#4 lore raw

PATCH 1/2 Revert "package/libplatform: bump version to 2.1.0"

Hello,

Quoted 5 lines · Arnout Vandecappelle
Quoted 2 lines

Thanks, both commits applied. Perhaps we need to apply them to the LTS version of Buildroot as well?

Also, perhaps comments should be added to libplatform and libcec to mention
that their version must be synchronised with kodi?

Agreed.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
#5 lore raw

PATCH 1/2 Revert "package/libplatform: bump version to 2.1.0"

In reply to Thomas Petazzoni
Quoted 20 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Hello,

Quoted 7 lines · Bernd Kuhls

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 <[email protected]>
Quoted 8 lines

---

.../0001-p8-platform-config-fix-lookup-paths.patch | 38 --------------------
...nfig.cmake-fix-paths-for-cross-compilatio.patch | 40 ++++++++++++++++++++++
package/libplatform/libplatform.hash               |  2 +-
package/libplatform/libplatform.mk                 |  8 ++---
4 files changed, 45 insertions(+), 43 deletions(-)

delete mode 100644 package/libplatform/0001-p8-platform-config-fix-lookup-paths.patch create mode 100644 package/libplatform/0001-platform-config.cmake-fix-paths-for-cross-compilatio.patch

Quoted 2 lines

Thanks, both commits applied. Perhaps we need to apply them to the LTS version of Buildroot as well?

Yes - Committed both to 2017.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard