From patchwork Fri Nov 3 20:02:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 33668 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id AED9AC00A5A for ; Fri, 3 Nov 2023 20:02:28 +0000 (UTC) Received: from a27-30.smtp-out.us-west-2.amazonses.com (a27-30.smtp-out.us-west-2.amazonses.com [54.240.27.30]) by mx.groups.io with SMTP id smtpd.web11.63230.1699041739596554532 for ; Fri, 03 Nov 2023 13:02:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky header.b=WecqzeKy; dkim=pass header.i=@amazonses.com header.s=hsbnp7p3ensaochzwyq5wwmceodymuwv header.b=Nlm2h7Dk; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.30, mailfrom: 0101018b96c780ef-cfc07ba5-c281-4f14-8be0-c0e25f80d070-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky; d=yoctoproject.org; t=1699041739; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=bpVchkl2YSWxE4WQJzr7F+Qf++8On1S3fMsjVhSlqog=; b=WecqzeKyIJxfOIGOSWvD7YYum7E2Om40a/S7GWu6rXSP2warjiBluO+CHEjKQcqU di1v4sIFwuo1dLQZgES0XtoFyWOZELpG50qH4+eKpWL1Rh2YNCpHhSoTISUQHXcLvNw q83VLEwKKzsayMjj2yVJmOgGU5YmY7ER+Xd3nxOI= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=hsbnp7p3ensaochzwyq5wwmceodymuwv; d=amazonses.com; t=1699041739; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=bpVchkl2YSWxE4WQJzr7F+Qf++8On1S3fMsjVhSlqog=; b=Nlm2h7DkyOb45kS1CT/nKNORIkyGNYmKaqHSjByQwM+bnfCEflPBC2qViDlx/nII 3YRabgTc84g38O/jlooQ0/81AyMooRYgUultGsiFwxli22attqR12uFr8iqR7xG9ieM wyYPKA4xRw/OoHmSO0E8ibcZ0ZgsU7AdsrSRR7S8= MIME-Version: 1.0 From: auh@yoctoproject.org To: Forced@yoctoproject.org, maintainer@yoctoproject.org, for@yoctoproject.org, AUH@yoctoproject.org Cc: openembedded-devel@lists.openembedded.org Subject: [AUH] p8platform: upgrading to 8 FAILED Message-ID: <0101018b96c780ef-cfc07ba5-c281-4f14-8be0-c0e25f80d070-000000@us-west-2.amazonses.com> Date: Fri, 3 Nov 2023 20:02:18 +0000 Feedback-ID: 1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2023.11.03-54.240.27.30 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 03 Nov 2023 20:02:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/106079 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *p8platform* to *8* has Failed(do_compile). Detailed error information: do_compile failed Next steps: - apply the patch: git am 0001-p8platform-upgrade-2.1.0.1-8.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From 80395fc33eaffdb1573314eb1d9cd1ff6a510667 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Fri, 3 Nov 2023 17:32:52 +0000 Subject: [PATCH] p8platform: upgrade 2.1.0.1 -> 8 --- ...DME.md-with-basic-build-instructions.patch | 54 ++++++ ...ule-via-https-instead-of-git-ssh-to-.patch | 19 +++ ...-p8-platform-config-fix-lookup-paths.patch | 35 ++++ .../0004-Fix-Win64-compile-warnings.patch | 45 +++++ ...reset-behaviour-in-case-of-broadcast.patch | 23 +++ ...ude-timeutils-defines-when-building-.patch | 38 +++++ ...th-vs2019.-include-pdb-files.-suppor.patch | 159 ++++++++++++++++++ ...e-updated-support-scripts-for-vs2019.patch | 16 ++ .../0009-changed-default-to-vs2019.patch | 16 ++ ...th-vs2019-and-also-include-pdb-files.patch | 63 +++++++ ...-StringUtils-fix-build-with-std-c-17.patch | 31 ++++ .../p8platform/p8platform_git.bb | 20 ++- 12 files changed, 515 insertions(+), 4 deletions(-) create mode 100644 meta-oe/recipes-extended/p8platform/p8platform/0001-Update-README.md-with-basic-build-instructions.patch create mode 100644 meta-oe/recipes-extended/p8platform/p8platform/0002-reference-submodule-via-https-instead-of-git-ssh-to-.patch create mode 100644 meta-oe/recipes-extended/p8platform/p8platform/0003-p8-platform-config-fix-lookup-paths.patch create mode 100644 meta-oe/recipes-extended/p8platform/p8platform/0004-Fix-Win64-compile-warnings.patch create mode 100644 meta-oe/recipes-extended/p8platform/p8platform/0005-Fix-CEvent-auto-reset-behaviour-in-case-of-broadcast.patch create mode 100644 meta-oe/recipes-extended/p8platform/p8platform/0006-fixed-don-t-include-timeutils-defines-when-building-.patch create mode 100644 meta-oe/recipes-extended/p8platform/p8platform/0007-changed-build-with-vs2019.-include-pdb-files.-suppor.patch create mode 100644 meta-oe/recipes-extended/p8platform/p8platform/0008-changed-use-updated-support-scripts-for-vs2019.patch create mode 100644 meta-oe/recipes-extended/p8platform/p8platform/0009-changed-default-to-vs2019.patch create mode 100644 meta-oe/recipes-extended/p8platform/p8platform/0010-build-with-vs2019-and-also-include-pdb-files.patch create mode 100644 meta-oe/recipes-extended/p8platform/p8platform/0011-StringUtils-fix-build-with-std-c-17.patch diff --git a/meta-oe/recipes-extended/p8platform/p8platform/0001-Update-README.md-with-basic-build-instructions.patch b/meta-oe/recipes-extended/p8platform/p8platform/0001-Update-README.md-with-basic-build-instructions.patch new file mode 100644 index 000000000..a03416eca --- /dev/null +++ b/meta-oe/recipes-extended/p8platform/p8platform/0001-Update-README.md-with-basic-build-instructions.patch @@ -0,0 +1,54 @@ +From fe904839a820b94b4420fe324cc11d75c0b90f38 Mon Sep 17 00:00:00 2001 +From: Lars Op den Kamp +Date: Thu, 13 Jul 2017 12:49:27 +0200 +Subject: [PATCH] Update README.md with basic build instructions + +--- + README.md | 39 +++++++++++++++++++++++++++++++++++++-- + 1 file changed, 37 insertions(+), 2 deletions(-) + +diff --git a/README.md b/README.md +index 02de9cd..25af515 100644 +--- a/README.md ++++ b/README.md +@@ -1,3 +1,38 @@ +-# platform +-Platform support library used by libCEC and binary add-ons for Kodi ++![Pulse-Eight logo](https://pulseeight.files.wordpress.com/2016/02/pulse-eight-logo-white-on-green.png?w=200) + ++# About ++This library provides platform specific support for other libraries, and is used by libCEC and binary add-ons for Kodi ++ ++# Supported platforms ++ ++## Linux, BSD & Apple OS X ++To compile this library on Linux, you'll need the following dependencies: ++* [cmake 2.6 or better] (http://www.cmake.org/) ++* a supported C++ 11 compiler ++ ++Follow these instructions to compile and install the library: ++``` ++apt-get update ++apt-get install cmake build-essential ++git clone https://github.com/Pulse-Eight/platform.git ++mkdir platform/build ++cd platform/build ++cmake .. ++make -j4 ++sudo make install ++sudo ldconfig ++``` ++ ++## Microsoft Windows ++To compile this library on Windows, you'll need the following dependencies: ++* [cmake 2.6 or better] (http://www.cmake.org/) ++* [Visual Studio 2013 (v120) or 2015 (v140)] (https://www.visualstudio.com/) ++ ++Follow these instructions to compile and install the library: ++``` ++git clone https://github.com/Pulse-Eight/platform.git ++cd platform ++git submodule update --init --recursive ++cd ++build.cmd ++``` diff --git a/meta-oe/recipes-extended/p8platform/p8platform/0002-reference-submodule-via-https-instead-of-git-ssh-to-.patch b/meta-oe/recipes-extended/p8platform/p8platform/0002-reference-submodule-via-https-instead-of-git-ssh-to-.patch new file mode 100644 index 000000000..a036591ff --- /dev/null +++ b/meta-oe/recipes-extended/p8platform/p8platform/0002-reference-submodule-via-https-instead-of-git-ssh-to-.patch @@ -0,0 +1,19 @@ +From a2c815aaa16848a817dca88d18e2c2a4af3aaa0a Mon Sep 17 00:00:00 2001 +From: Thibault Jochem +Date: Wed, 15 Feb 2017 07:21:35 +0100 +Subject: [PATCH] reference submodule via https instead of git/ssh to allow + public clone (without ssh key registered to github). + +--- + .gitmodules | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/.gitmodules b/.gitmodules +index 1bb4d48..5dd42f2 100644 +--- a/.gitmodules ++++ b/.gitmodules +@@ -1,3 +1,3 @@ + [submodule "support"] + path = support +- url = git@github.com:Pulse-Eight/libcec-support.git ++ url = https://github.com/Pulse-Eight/libcec-support.git diff --git a/meta-oe/recipes-extended/p8platform/p8platform/0003-p8-platform-config-fix-lookup-paths.patch b/meta-oe/recipes-extended/p8platform/p8platform/0003-p8-platform-config-fix-lookup-paths.patch new file mode 100644 index 000000000..fb9e4be8b --- /dev/null +++ b/meta-oe/recipes-extended/p8platform/p8platform/0003-p8-platform-config-fix-lookup-paths.patch @@ -0,0 +1,35 @@ +From 8b3fbb1670f1602d2a9eca38ac25d961276baa2a Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +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 +Signed-off-by: "Yann E. MORIN" +--- + 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) diff --git a/meta-oe/recipes-extended/p8platform/p8platform/0004-Fix-Win64-compile-warnings.patch b/meta-oe/recipes-extended/p8platform/p8platform/0004-Fix-Win64-compile-warnings.patch new file mode 100644 index 000000000..152fcb920 --- /dev/null +++ b/meta-oe/recipes-extended/p8platform/p8platform/0004-Fix-Win64-compile-warnings.patch @@ -0,0 +1,45 @@ +From 4258e47f331d2302e944947d8dcd61baccd6620d Mon Sep 17 00:00:00 2001 +From: Zoltan Csizmadia +Date: Mon, 7 Aug 2017 22:51:03 -0500 +Subject: [PATCH] Fix Win64 compile warnings + +--- + src/util/StringUtils.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/util/StringUtils.cpp b/src/util/StringUtils.cpp +index 510e2d5..3df26ce 100644 +--- a/src/util/StringUtils.cpp ++++ b/src/util/StringUtils.cpp +@@ -668,7 +668,7 @@ vector StringUtils::Split(const std::string& input, const std::string& d + size_t sizeS2 = delimiter.size(); + size_t isize = input.size(); + +- vector positions; ++ vector positions; + + newPos = input.find(delimiter, 0); + +@@ -687,11 +687,11 @@ vector StringUtils::Split(const std::string& input, const std::string& d + + // numFound is the number of delimiters which is one less + // than the number of substrings +- unsigned int numFound = positions.size(); ++ size_t numFound = positions.size(); + if (iMaxStrings > 0 && numFound >= iMaxStrings) + numFound = iMaxStrings - 1; + +- for ( unsigned int i = 0; i <= numFound; i++ ) ++ for ( size_t i = 0; i <= numFound; i++ ) + { + string s; + if ( i == 0 ) +@@ -1058,7 +1058,7 @@ std::string StringUtils::CreateUUID() + if (!m_uuidInitialized) + { + /* use current time as the seed for rand()*/ +- srand(time(NULL)); ++ srand((unsigned int)time(NULL)); + m_uuidInitialized = true; + } + diff --git a/meta-oe/recipes-extended/p8platform/p8platform/0005-Fix-CEvent-auto-reset-behaviour-in-case-of-broadcast.patch b/meta-oe/recipes-extended/p8platform/p8platform/0005-Fix-CEvent-auto-reset-behaviour-in-case-of-broadcast.patch new file mode 100644 index 000000000..d29c52864 --- /dev/null +++ b/meta-oe/recipes-extended/p8platform/p8platform/0005-Fix-CEvent-auto-reset-behaviour-in-case-of-broadcast.patch @@ -0,0 +1,23 @@ +From 070e97c7ba33963bdc6fe178b15275abf47fc1ab Mon Sep 17 00:00:00 2001 +From: Sergey Shramchenko +Date: Tue, 7 Aug 2018 20:08:33 +0300 +Subject: [PATCH] Fix CEvent auto-reset behaviour in case of broadcast signal. + +--- + src/threads/mutex.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/threads/mutex.h b/src/threads/mutex.h +index 8dbbffd..1ae0ef0 100644 +--- a/src/threads/mutex.h ++++ b/src/threads/mutex.h +@@ -351,7 +351,8 @@ namespace P8PLATFORM + { + CLockObject lock(m_mutex); + bool bReturn(m_bSignaled); +- if (bReturn && (--m_iWaitingThreads == 0 || !m_bBroadcast) && m_bAutoReset) ++ --m_iWaitingThreads; ++ if (bReturn && (m_iWaitingThreads == 0 || !m_bBroadcast) && m_bAutoReset) + m_bSignaled = false; + return bReturn; + } diff --git a/meta-oe/recipes-extended/p8platform/p8platform/0006-fixed-don-t-include-timeutils-defines-when-building-.patch b/meta-oe/recipes-extended/p8platform/p8platform/0006-fixed-don-t-include-timeutils-defines-when-building-.patch new file mode 100644 index 000000000..6312cbb83 --- /dev/null +++ b/meta-oe/recipes-extended/p8platform/p8platform/0006-fixed-don-t-include-timeutils-defines-when-building-.patch @@ -0,0 +1,38 @@ +From c4d29a92db53d4ff84b4e01da497f01a68bca6d6 Mon Sep 17 00:00:00 2001 +From: Lars Op den Kamp +Date: Fri, 3 Apr 2020 11:14:29 +0200 +Subject: [PATCH] fixed: don't include timeutils defines when building swig on + windows + +--- + src/util/timeutils.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/util/timeutils.h b/src/util/timeutils.h +index f22184f..1196504 100644 +--- a/src/util/timeutils.h ++++ b/src/util/timeutils.h +@@ -44,7 +44,7 @@ + + namespace P8PLATFORM + { +- #if defined(__WINDOWS__) ++ #if defined(__WINDOWS__) && !defined(SWIGPYTHON) + struct timezone + { + int tz_minuteswest; +@@ -68,12 +68,12 @@ namespace P8PLATFORM + pcur_time->tv_usec = current.millitm * 1000L; + if (tz) + { +- tz->tz_minuteswest = current.timezone; /* minutes west of Greenwich */ ++ tz->tz_minuteswest = current.timezone; /* minutes west of Greenwich */ + tz->tz_dsttime = current.dstflag; /* type of dst correction */ + } + return 0; + } +- #endif ++ #endif // defined(__WINDOWS__) && !defined(SWIGPYTHON) + + inline int64_t GetTimeMs() + { diff --git a/meta-oe/recipes-extended/p8platform/p8platform/0007-changed-build-with-vs2019.-include-pdb-files.-suppor.patch b/meta-oe/recipes-extended/p8platform/p8platform/0007-changed-build-with-vs2019.-include-pdb-files.-suppor.patch new file mode 100644 index 000000000..4e12c24a2 --- /dev/null +++ b/meta-oe/recipes-extended/p8platform/p8platform/0007-changed-build-with-vs2019.-include-pdb-files.-suppor.patch @@ -0,0 +1,159 @@ +From 309d21526d717aa382311e06d51342892d86f3a3 Mon Sep 17 00:00:00 2001 +From: Lars Op den Kamp +Date: Thu, 23 Apr 2020 15:50:13 +0200 +Subject: [PATCH] changed: build with vs2019. include pdb files. support path + with spaces + +--- + CMakeLists.txt | 50 ++++++++++++++++++++++++++++++++++--------- + windows/build-lib.cmd | 16 ++++++++++---- + windows/build.cmd | 12 ++++++----- + 3 files changed, 59 insertions(+), 19 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7144b0b..4a7ad80 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -23,9 +23,9 @@ if(WIN32) + endif() + + set(p8-platform_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/p8-platform") +-IF(WIN32) ++if(WIN32) + LIST(APPEND p8-platform_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/p8-platform/windows") +-ENDIF(WIN32) ++endif(WIN32) + set(p8-platform_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) + + if(NOT ${CORE_SYSTEM_NAME} STREQUAL "") +@@ -38,23 +38,47 @@ set(SOURCES src/util/StringUtils.cpp) + + add_library(p8-platform ${SOURCES} ${PLAT_SOURCES}) + target_link_libraries(p8-platform ${p8-platform_LIBRARIES}) +-set_target_properties(p8-platform PROPERTIES VERSION ${p8-platform_VERSION_MAJOR}.${p8-platform_VERSION_MINOR}.${p8-platform_VERSION_PATCH} +- SOVERSION ${p8-platform_VERSION_MAJOR}) ++set_target_properties(p8-platform ++ PROPERTIES ++ VERSION ${p8-platform_VERSION_MAJOR}.${p8-platform_VERSION_MINOR}.${p8-platform_VERSION_PATCH} ++ SOVERSION ${p8-platform_VERSION_MAJOR}) ++ ++if(WIN32) ++ if (MSVC) ++ # generate pdb in release mode too ++ set_target_properties(p8-platform ++ PROPERTIES ++ COMPILE_PDB_NAME_DEBUG p8-platform${CMAKE_DEBUG_POSTFIX} ++ COMPILE_PDB_NAME_RELEASE p8-platform ++ COMPILE_PDB_NAME_MINSIZEREL p8-platform ++ COMPILE_PDB_NAME_RELWITHDEBINFO p8-platform) ++ ++ if (${WIN64}) ++ # default setting that got removed in recent vs versions, generates a warning if set ++ string(REPLACE "/arch:SSE2" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) ++ endif(${WIN64}) ++ ++ endif(MSVC) ++ ++ if (NOT ${WIN64}) ++ add_definitions(-D_USE_32BIT_TIME_T) ++ endif(NOT ${WIN64}) ++endif(WIN32) + + install(TARGETS p8-platform DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(FILES src/os.h DESTINATION include/p8-platform) +-IF(WIN32) +- INSTALL(FILES src/windows/dlfcn-win32.h ++if(WIN32) ++ install(FILES src/windows/dlfcn-win32.h + src/windows/os-socket.h + src/windows/os-threads.h + src/windows/os-types.h + DESTINATION include/p8-platform/windows) +-ELSE(WIN32) ++else(WIN32) + install(FILES src/posix/os-socket.h + src/posix/os-threads.h + src/posix/os-types.h + DESTINATION include/p8-platform/posix) +-ENDIF(WIN32) ++endif(WIN32) + install(FILES src/sockets/cdevsocket.h + src/sockets/socket.h + src/sockets/tcp.h +@@ -71,11 +95,17 @@ install(FILES src/util/atomic.h + src/util/util.h + DESTINATION include/p8-platform/util) + +-IF(NOT WIN32) ++if(MSVC) ++ # install generated pdb ++ install(FILES $/p8-platform.pdb ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}") ++endif(MSVC) ++ ++if(NOT WIN32) + configure_file(p8-platform.pc.in p8-platform.pc @ONLY) + install(FILES ${CMAKE_BINARY_DIR}/p8-platform.pc + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) +-ENDIF(NOT WIN32) ++endif(NOT WIN32) + + # config mode + configure_file (p8-platform-config.cmake.in +diff --git a/windows/build-lib.cmd b/windows/build-lib.cmd +index 5d5bf1a..875bfce 100644 +--- a/windows/build-lib.cmd ++++ b/windows/build-lib.cmd +@@ -11,14 +11,22 @@ SET VSVERSION=%3 + SET INSTALLPATH=%4 + IF [%4] == [] GOTO missingparams + ++SET INSTALLPATH=%INSTALLPATH:"=% + SET BUILDTARGET=%INSTALLPATH%\cmake\%BUILDARCH% + SET TARGET=%INSTALLPATH%\%BUILDARCH% + +-call %MYDIR%..\support\windows\cmake\generate.cmd %BUILDARCH% nmake %MYDIR%..\ %BUILDTARGET% %TARGET% %BUILDTYPE% %VSVERSION% static +-call %MYDIR%..\support\windows\cmake\build.cmd %BUILDARCH% %BUILDTARGET% %VSVERSION% +-goto exit ++CALL "%MYDIR%..\support\windows\cmake\generate.cmd" %BUILDARCH% nmake "%MYDIR%..\" "%BUILDTARGET%" "%TARGET%" %BUILDTYPE% %VSVERSION% static ++CALL "%MYDIR%..\support\windows\cmake\build.cmd" %BUILDARCH% "%BUILDTARGET%" %VSVERSION% ++GOTO exit + + :missingparams +-echo "build-lib.cmd requires 4 parameters" ++ECHO.%~dp0 requires 4 parameters ++ECHO. %~dp0 [architecture] [type] [version] [install path] ++ECHO. ++ECHO. architecture: amd64 x86 ++ECHO. type: Release Debug ++ECHO. version: Visual Studio version (2019) ++ECHO. install path: installation path without quotes ++exit /b 99 + + :exit +\ No newline at end of file +diff --git a/windows/build.cmd b/windows/build.cmd +index 1f796a6..9bf76fb 100644 +--- a/windows/build.cmd ++++ b/windows/build.cmd +@@ -6,13 +6,15 @@ SETLOCAL + + SET MYDIR=%~dp0 + SET BUILDTYPE=Release +-SET VSVERSION=12 ++SET VSVERSION=2019 + SET INSTALLPATH=%MYDIR%..\build + +-rmdir %MYDIR%..\build /s /q ++IF EXIST "%MYDIR%..\build" ( ++ RMDIR /s /q "%MYDIR%..\build" ++) + +-for %%T in (amd64 x86) do ( +- call %MYDIR%\build-lib.cmd %%T %BUILDTYPE% %VSVERSION% %INSTALLPATH% ++FOR %%T IN (amd64 x86) DO ( ++ CALL "%MYDIR%\build-lib.cmd" %%T %BUILDTYPE% %VSVERSION% "%INSTALLPATH%" + ) + +-rmdir %MYDIR%..\build\cmake /s /q ++RMDIR /s /q "%MYDIR%..\build\cmake" diff --git a/meta-oe/recipes-extended/p8platform/p8platform/0008-changed-use-updated-support-scripts-for-vs2019.patch b/meta-oe/recipes-extended/p8platform/p8platform/0008-changed-use-updated-support-scripts-for-vs2019.patch new file mode 100644 index 000000000..528944f06 --- /dev/null +++ b/meta-oe/recipes-extended/p8platform/p8platform/0008-changed-use-updated-support-scripts-for-vs2019.patch @@ -0,0 +1,16 @@ +From 4f38abdf7f429a0baf3a8bd33c7982e15983f308 Mon Sep 17 00:00:00 2001 +From: Lars Op den Kamp +Date: Sat, 25 Apr 2020 09:58:29 +0200 +Subject: [PATCH] changed: use updated support scripts for vs2019 + +--- + support | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/support b/support +index 1149a12..d0a6b56 160000 +--- a/support ++++ b/support +@@ -1 +1 @@ +-Subproject commit 1149a12c79595a03a1915585159d5e6952484325 ++Subproject commit d0a6b566f9723fbab971cbcc17696f6da06bf879 diff --git a/meta-oe/recipes-extended/p8platform/p8platform/0009-changed-default-to-vs2019.patch b/meta-oe/recipes-extended/p8platform/p8platform/0009-changed-default-to-vs2019.patch new file mode 100644 index 000000000..5c16aa694 --- /dev/null +++ b/meta-oe/recipes-extended/p8platform/p8platform/0009-changed-default-to-vs2019.patch @@ -0,0 +1,16 @@ +From db5633fcfac7e049b489d10f35905c0261c2ebdc Mon Sep 17 00:00:00 2001 +From: Lars Op den Kamp +Date: Sat, 25 Apr 2020 10:57:29 +0200 +Subject: [PATCH] changed: default to vs2019 + +--- + support | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/support b/support +index d0a6b56..7c41211 160000 +--- a/support ++++ b/support +@@ -1 +1 @@ +-Subproject commit d0a6b566f9723fbab971cbcc17696f6da06bf879 ++Subproject commit 7c4121112af37d641ea02383d53b50a38087115a diff --git a/meta-oe/recipes-extended/p8platform/p8platform/0010-build-with-vs2019-and-also-include-pdb-files.patch b/meta-oe/recipes-extended/p8platform/p8platform/0010-build-with-vs2019-and-also-include-pdb-files.patch new file mode 100644 index 000000000..8792003d5 --- /dev/null +++ b/meta-oe/recipes-extended/p8platform/p8platform/0010-build-with-vs2019-and-also-include-pdb-files.patch @@ -0,0 +1,63 @@ +From 2f19606e07a4eeffa6d374118d5754e51ab72287 Mon Sep 17 00:00:00 2001 +From: Lars Op den Kamp +Date: Thu, 9 Jul 2020 22:30:25 +0200 +Subject: [PATCH] build with vs2019 and also include pdb files + +--- + CMakeLists.txt | 2 +- + support | 2 +- + windows/build-lib.cmd | 16 +++++++++++++++- + 3 files changed, 17 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4a7ad80..f5b2ff8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -13,7 +13,7 @@ set(p8-platform_NAME p8-platform) + set(p8-platform_DESCRIPTION "Pulse-Eight platform support library") + set(p8-platform_VERSION_MAJOR 2) + set(p8-platform_VERSION_MINOR 1) +-set(p8-platform_VERSION_PATCH 0) ++set(p8-platform_VERSION_PATCH 1) + + set(CMAKE_POSITION_INDEPENDENT_CODE on) + +diff --git a/support b/support +index 7c41211..416da1d 160000 +--- a/support ++++ b/support +@@ -1 +1 @@ +-Subproject commit 7c4121112af37d641ea02383d53b50a38087115a ++Subproject commit 416da1d0e60ee2397f31d4eb8f85886a9ef3327a +diff --git a/windows/build-lib.cmd b/windows/build-lib.cmd +index 875bfce..fe985a7 100644 +--- a/windows/build-lib.cmd ++++ b/windows/build-lib.cmd +@@ -15,6 +15,20 @@ SET INSTALLPATH=%INSTALLPATH:"=% + SET BUILDTARGET=%INSTALLPATH%\cmake\%BUILDARCH% + SET TARGET=%INSTALLPATH%\%BUILDARCH% + ++rem Check support submodule ++IF NOT EXIST "%MYDIR%..\support\windows\cmake\build.cmd" ( ++ rem Try to init the git submodules ++ cd "%MYDIR%.." ++ git submodule update --init -r >nul 2>&1 ++ ++ IF NOT EXIST "%MYDIR%..\support\windows\cmake\build.cmd" ( ++ ECHO.*** support git submodule has not been checked out *** ++ ECHO. ++ ECHO.See docs\README.windows.md ++ EXIT /b 2 ++ ) ++) ++ + CALL "%MYDIR%..\support\windows\cmake\generate.cmd" %BUILDARCH% nmake "%MYDIR%..\" "%BUILDTARGET%" "%TARGET%" %BUILDTYPE% %VSVERSION% static + CALL "%MYDIR%..\support\windows\cmake\build.cmd" %BUILDARCH% "%BUILDTARGET%" %VSVERSION% + GOTO exit +@@ -29,4 +43,4 @@ ECHO. version: Visual Studio version (2019) + ECHO. install path: installation path without quotes + exit /b 99 + +-:exit +\ No newline at end of file ++:exit diff --git a/meta-oe/recipes-extended/p8platform/p8platform/0011-StringUtils-fix-build-with-std-c-17.patch b/meta-oe/recipes-extended/p8platform/p8platform/0011-StringUtils-fix-build-with-std-c-17.patch new file mode 100644 index 000000000..c9792f64b --- /dev/null +++ b/meta-oe/recipes-extended/p8platform/p8platform/0011-StringUtils-fix-build-with-std-c-17.patch @@ -0,0 +1,31 @@ +From 300089ced2b8322db1197b76becd78bcea4de088 Mon Sep 17 00:00:00 2001 +From: Lukas Rusak +Date: Thu, 10 Sep 2020 11:32:55 -0700 +Subject: [PATCH] StringUtils: fix build with -std=c++17 + +--- + src/util/StringUtils.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/util/StringUtils.cpp b/src/util/StringUtils.cpp +index 3df26ce..e8effd5 100644 +--- 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/meta-oe/recipes-extended/p8platform/p8platform_git.bb b/meta-oe/recipes-extended/p8platform/p8platform_git.bb index bb9574feb..db082d154 100644 --- a/meta-oe/recipes-extended/p8platform/p8platform_git.bb +++ b/meta-oe/recipes-extended/p8platform/p8platform_git.bb @@ -4,10 +4,22 @@ HOMEPAGE = "http://libcec.pulse-eight.com/" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://src/os.h;md5=752555fa94e82005d45fd201fee5bd33" -PV = "2.1.0.1+git${SRCPV}" - -SRC_URI = "git://github.com/Pulse-Eight/platform.git;branch=master;protocol=https" -SRCREV = "a7cd0d5780ed80a4e70480d1650749f29e8a1fb2" +PV = "8" + +SRC_URI = "git://github.com/Pulse-Eight/platform.git;branch=master;protocol=https \ + file://0001-Update-README.md-with-basic-build-instructions.patch \ + file://0002-reference-submodule-via-https-instead-of-git-ssh-to-.patch \ + file://0003-p8-platform-config-fix-lookup-paths.patch \ + file://0004-Fix-Win64-compile-warnings.patch \ + file://0005-Fix-CEvent-auto-reset-behaviour-in-case-of-broadcast.patch \ + file://0006-fixed-don-t-include-timeutils-defines-when-building-.patch \ + file://0007-changed-build-with-vs2019.-include-pdb-files.-suppor.patch \ + file://0008-changed-use-updated-support-scripts-for-vs2019.patch \ + file://0009-changed-default-to-vs2019.patch \ + file://0010-build-with-vs2019-and-also-include-pdb-files.patch \ + file://0011-StringUtils-fix-build-with-std-c-17.patch \ + " +SRCREV = "2d90f98620e25f47702c9e848380c0d93f29462b" S = "${WORKDIR}/git"