commit: 8b01e233478d2e386947ffb54184760f804199c0 Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Fri Aug 22 21:48:00 2025 +0000 Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> CommitDate: Sat Aug 23 07:26:05 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b01e233
dev-libs/libplatform: fix cmake4 and libcxx build Bug: https://bugs.gentoo.org/914866 Bug: https://bugs.gentoo.org/951812 Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/43535 Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org> .../files/libplatform-2.1.0.1-cmake4.patch | 22 ++++++++++++++++ .../files/libplatform-2.1.0.1-libcxx.patch | 29 ++++++++++++++++++++++ ...m-9999.ebuild => libplatform-2.1.0.1-r3.ebuild} | 16 +++++++----- dev-libs/libplatform/libplatform-9999.ebuild | 11 ++++---- 4 files changed, 66 insertions(+), 12 deletions(-) diff --git a/dev-libs/libplatform/files/libplatform-2.1.0.1-cmake4.patch b/dev-libs/libplatform/files/libplatform-2.1.0.1-cmake4.patch new file mode 100644 index 000000000000..4100869780f7 --- /dev/null +++ b/dev-libs/libplatform/files/libplatform-2.1.0.1-cmake4.patch @@ -0,0 +1,22 @@ +https://bugs.gentoo.org/951812 +https://github.com/Pulse-Eight/platform/issues/52 +https://github.com/Pulse-Eight/platform/commit/d7faed1c696b1a6a67f114a63a0f4c085f0f9195 + +Removed cmake_minimum unrelated chunk + +From d7faed1c696b1a6a67f114a63a0f4c085f0f9195 Mon Sep 17 00:00:00 2001 +From: Lars Op den Kamp <[email protected]> +Date: Tue, 25 Feb 2025 16:11:43 +0100 +Subject: [PATCH] fixed: match debug flags of the c++ library with .net on + windows + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,6 +1,6 @@ ++cmake_minimum_required(VERSION 3.12.0) + project(p8-platform) + +-cmake_minimum_required(VERSION 2.8.9) + enable_language(CXX) + + set(CMAKE_CXX_STANDARD 11) diff --git a/dev-libs/libplatform/files/libplatform-2.1.0.1-libcxx.patch b/dev-libs/libplatform/files/libplatform-2.1.0.1-libcxx.patch new file mode 100644 index 000000000000..845af8b591c9 --- /dev/null +++ b/dev-libs/libplatform/files/libplatform-2.1.0.1-libcxx.patch @@ -0,0 +1,29 @@ +https://bugs.gentoo.org/914866 +https://github.com/Pulse-Eight/platform/pull/45 +https://github.com/Pulse-Eight/platform/commit/a0d1a41ac47930a3d45020d1a8d26b90d3856ce9 + +From a0d1a41ac47930a3d45020d1a8d26b90d3856ce9 Mon Sep 17 00:00:00 2001 +From: Lukas Rusak <[email protected]> +Date: Thu, 10 Sep 2020 11:32:55 -0700 +Subject: [PATCH] StringUtils: fix build with -std=c++17 + +--- a/src/util/StringUtils.cpp ++++ b/src/util/StringUtils.cpp +@@ -453,7 +453,7 @@ static int isspace_c(char c) + + std::string& StringUtils::TrimLeft(std::string &str) + { +- str.erase(str.begin(), ::find_if(str.begin(), str.end(), ::not1(::ptr_fun(isspace_c)))); ++ str.erase(str.begin(), ::find_if(str.begin(), str.end(), [](char s) { return isspace_c(s) == 0; })); + return str; + } + +@@ -466,7 +466,7 @@ std::string& StringUtils::TrimLeft(std::string &str, const char* const chars) + + std::string& StringUtils::TrimRight(std::string &str) + { +- str.erase(::find_if(str.rbegin(), str.rend(), ::not1(::ptr_fun(isspace_c))).base(), str.end()); ++ str.erase(::find_if(str.rbegin(), str.rend(), [](char s) { return isspace_c(s) == 0; }).base(), str.end()); + return str; + } + diff --git a/dev-libs/libplatform/libplatform-9999.ebuild b/dev-libs/libplatform/libplatform-2.1.0.1-r3.ebuild similarity index 75% copy from dev-libs/libplatform/libplatform-9999.ebuild copy to dev-libs/libplatform/libplatform-2.1.0.1-r3.ebuild index ed44eae38b02..8e06612ccde1 100644 --- a/dev-libs/libplatform/libplatform-9999.ebuild +++ b/dev-libs/libplatform/libplatform-2.1.0.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,15 +11,19 @@ MY_PN_PREFIX="p8" DESCRIPTION="Platform support library used by libCEC and binary add-ons for Kodi" HOMEPAGE="https://github.com/Pulse-Eight/platform"; -LICENSE="GPL-2+" -SLOT="0" -IUSE="" - if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/Pulse-Eight/${MY_PN}.git"; inherit git-r3 else SRC_URI="https://github.com/Pulse-Eight/${MY_PN}/archive/${MY_PN_PREFIX}-${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${MY_PN}-${MY_PN_PREFIX}-${MY_PN}-${PV}" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" fi + +LICENSE="GPL-2+" +SLOT="0" + +PATCHES=( + "${FILESDIR}"/libplatform-2.1.0.1-cmake4.patch + "${FILESDIR}"/libplatform-2.1.0.1-libcxx.patch +) diff --git a/dev-libs/libplatform/libplatform-9999.ebuild b/dev-libs/libplatform/libplatform-9999.ebuild index ed44eae38b02..43f95db28ce2 100644 --- a/dev-libs/libplatform/libplatform-9999.ebuild +++ b/dev-libs/libplatform/libplatform-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,15 +11,14 @@ MY_PN_PREFIX="p8" DESCRIPTION="Platform support library used by libCEC and binary add-ons for Kodi" HOMEPAGE="https://github.com/Pulse-Eight/platform"; -LICENSE="GPL-2+" -SLOT="0" -IUSE="" - if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/Pulse-Eight/${MY_PN}.git"; inherit git-r3 else SRC_URI="https://github.com/Pulse-Eight/${MY_PN}/archive/${MY_PN_PREFIX}-${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${MY_PN}-${MY_PN_PREFIX}-${MY_PN}-${PV}" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" fi + +LICENSE="GPL-2+" +SLOT="0"
