Skip to content

Commit

Permalink
webos: umediaserver=r28.* umediaserver-clang=r28.5 (uMediaserver: add…
Browse files Browse the repository at this point in the history 
… missing #include to fix build with boost-1.85.0)

:Release Notes:
https://www.boost.org/doc/libs/1_85_0/libs/filesystem/doc/deprecated.html
operations.hpp
  The header provides filesystem_error, file_status, directory_entry,
  directory_iterator, recursive_directory_iterator and associated enums
  and functions.

  Explicitly include headers exception.hpp, file_status.hpp and/or
  directory.hpp to introduce the required components.

:Detailed Notes:
Fixes:
http://gecko.lge.com:8000/Errors/Details/854828

FAILED: src/server/CMakeFiles/umediaserver.dir/uMediaserver.cpp.o
ccache TOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot-native/usr/bin/aarch64-webos-linux/aarch64-webos-linux-g++ --sysroot=TOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot -DUMS_INTERNAL_API_VERSION=2 -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/git/include/public -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/git/src/server -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/git/src/logger -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/git/src/timer -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/git/src/utils -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/git/src/resource_manager -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/git/src/ums_connector -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/git/src/pipeline -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/git/src/process_pool -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/git/src/pipeline_manager -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/git/src/dbi -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/git/src/registry -mcpu=cortex-a72+crc -mbranch-protection=standard -fstack-protector-strong  -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -Werror=return-type  --sysroot=TOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot  -O2 -pipe -g -feliminate-unused-debug-types -fcanon-prefix-map  -fmacro-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/git=/usr/src/debug/umediaserver/1.0.0-gav.46  -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/git=/usr/src/debug/umediaserver/1.0.0-gav.46  -fmacro-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/build=/usr/src/debug/umediaserver/1.0.0-gav.46  -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/build=/usr/src/debug/umediaserver/1.0.0-gav.46  -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot=  -fmacro-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot=  -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot-native=  -fvisibility-inlines-hidden -std=c++11 -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/git/include/public -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/git/src/resource_manager -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot/usr/include -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot/usr/include -pthread -pthread -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot/usr/include/gstreamer-1.0 -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot/usr/include/orc-0.4 -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot/usr/include/gstreamer-1.0 -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot/usr/include -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot/usr/include/glib-2.0 -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot/usr/lib/glib-2.0/include -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot/usr/include -DUSE_PMLOG_DECLARATION -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot/usr/include/glib-2.0 -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot/usr/lib/glib-2.0/include -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot/usr/include -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot/usr/include/glib-2.0 -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot/usr/lib/glib-2.0/include -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot/usr/include -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot/usr/include -DLTTNG_PMTRACE -DTRACEPOINT_DEFINE -DTRACEPOINT_PROBE_DYNAMIC_LINKAGE -DENABLE_PMTRACE -DPERFLOG_USE_PMLOG -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysrootinclude -DNDEBUG -MD -MT src/server/CMakeFiles/umediaserver.dir/uMediaserver.cpp.o -MF src/server/CMakeFiles/umediaserver.dir/uMediaserver.cpp.o.d -o src/server/CMakeFiles/umediaserver.dir/uMediaserver.cpp.o -c TOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/git/src/server/uMediaserver.cpp
../git/src/server/uMediaserver.cpp: In member function 'void uMediaServer::uMediaserver::readDynamicPipelineConfigs()':
../git/src/server/uMediaserver.cpp:336:21: error: 'directory_iterator' is not a member of 'fs'; did you mean 'directory_entry'?
  336 |                 fs::directory_iterator end_iter;
      |                     ^~~~~~~~~~~~~~~~~~
      |                     directory_entry
../git/src/server/uMediaserver.cpp:337:26: error: 'directory_iterator' is not a member of 'fs'; did you mean 'directory_entry'?
  337 |                 for (fs::directory_iterator dir_iter(dynamic_config_dir); dir_iter!=end_iter; dir_iter++) {
      |                          ^~~~~~~~~~~~~~~~~~
      |                          directory_entry
../git/src/server/uMediaserver.cpp:337:75: error: 'dir_iter' was not declared in this scope
  337 |                 for (fs::directory_iterator dir_iter(dynamic_config_dir); dir_iter!=end_iter; dir_iter++) {
      |                                                                           ^~~~~~~~
../git/src/server/uMediaserver.cpp:337:85: error: 'end_iter' was not declared in this scope
  337 |                 for (fs::directory_iterator dir_iter(dynamic_config_dir); dir_iter!=end_iter; dir_iter++) {
      |                                                                                     ^~~~~~~~

:Testing Performed:
Only build tested.

:QA Notes:
No change to image.

:Issues Addressed:
[WRQ-23876] CCC: umediaserver=r28.* umediaserver-clang=r28.5 (uMediaserver: add missing #include to fix build with boost-1.85.0)
[WRQ-17959] Create GPVB with Yocto 5.1 Styhead

Change-Id: If286ed1a38f63548d3a106293ee4c142b88b794f
Reviewed-on: http://gpro.lge.com/c/webos-pro/meta-lg-webos/+/409773
Reviewed-by: Ghane Simit <[email protected]>
Reviewed-by: Abdul Khader <[email protected]>
Reviewed-by: Hieu Van Nguyen <[email protected]>
Reviewed-by: Jaekyu Lee <[email protected]>
Reviewed-by: Yangwoo Byun <[email protected]>
  • Loading branch information
@shr-project
shr-project committed Jul 10, 2024
1 parent c0e9823 commit 38757fd
Show file tree
Hide file tree
Showing 3 changed files with 72 additions and 3 deletions.
3 changes: 2 additions & 1 deletion meta-webos/recipes-webos/umediaserver/umediaserver-clang.bb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ PACKAGECONFIG[webruntime-libcxx] = ",,chromium-toolchain-native chromium-stdlib"
PACKAGECONFIG[system-libcxx] = ",,llvm-native clang"

WEBOS_REPO_NAME = "umediaserver"
FILESEXTRAPATHS:prepend := "${THISDIR}/umediaserver:"

PR = "${INC_PR}.4"
PR = "${INC_PR}.5"

OECMAKE_CXX_FLAGS += "-Wno-c++11-narrowing -Wno-format-security"
OECMAKE_TARGET_COMPILE = "umedia_api resource_mgr_client resource_mgr_client_c"
Expand Down
6 changes: 4 additions & 2 deletions meta-webos/recipes-webos/umediaserver/umediaserver.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ DEPENDS += "gstreamer1.0 gstreamer1.0-plugins-base"
DEPENDS += "${@'' if '${WEBOS_DISTRO_PRERELEASE}' == '' else 'pmtrace'}"
RDEPENDS:${PN} = "umediaserver-configs"

INC_PR = "r27"
INC_PR = "r28"

inherit webos_component
inherit webos_enhanced_submissions
Expand All @@ -40,7 +40,9 @@ COMPATIBLE_MACHINE:x86-64 = "(.*)"

WEBOS_VERSION = "1.0.0-gav.46_6867736010545963dcc66574ed31f38c75a8cfda"

SRC_URI = "${WEBOSOSE_GIT_REPO_COMPLETE}"
SRC_URI = "${WEBOSOSE_GIT_REPO_COMPLETE} \
file://0001-uMediaserver-add-missing-include-to-fix-build-with-b.patch \
"
S = "${WORKDIR}/git"

# umediaserver-python contains the Python bindings
Expand Down
66 changes: 66 additions & 0 deletions ...umediaserver/umediaserver/0001-uMediaserver-add-missing-include-to-fix-build-with-b.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
From 0749fb30ba00f65ff8beb49fd94130b96c213249 Mon Sep 17 00:00:00 2001
From: Martin Jansa <[email protected]>
Date: Fri, 31 May 2024 12:05:26 +0000
Subject: [PATCH] uMediaserver: add missing #include to fix build with
boost-1.85.0

:Release Notes:
https://www.boost.org/doc/libs/1_85_0/libs/filesystem/doc/deprecated.html
operations.hpp
The header provides filesystem_error, file_status, directory_entry,
directory_iterator, recursive_directory_iterator and associated enums
and functions.

Explicitly include headers exception.hpp, file_status.hpp and/or
directory.hpp to introduce the required components.

:Detailed Notes:
Fixes:
http://gecko.lge.com:8000/Errors/Details/854828

FAILED: src/server/CMakeFiles/umediaserver.dir/uMediaserver.cpp.o
ccache TOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot-native/usr/bin/aarch64-webos-linux/aarch64-webos-linux-g++ --sysroot=TOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot -DUMS_INTERNAL_API_VERSION=2 -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/git/include/public -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/git/src/server -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/git/src/logger -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/git/src/timer -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/git/src/utils -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/git/src/resource_manager -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/git/src/ums_connector -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/git/src/pipeline -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/git/src/process_pool -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/git/src/pipeline_manager -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/git/src/dbi -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/git/src/registry -mcpu=cortex-a72+crc -mbranch-protection=standard -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -Werror=return-type --sysroot=TOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot -O2 -pipe -g -feliminate-unused-debug-types -fcanon-prefix-map -fmacro-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/git=/usr/src/debug/umediaserver/1.0.0-gav.46 -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/git=/usr/src/debug/umediaserver/1.0.0-gav.46 -fmacro-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/build=/usr/src/debug/umediaserver/1.0.0-gav.46 -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/build=/usr/src/debug/umediaserver/1.0.0-gav.46 -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot= -fmacro-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot= -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot-native= -fvisibility-inlines-hidden -std=c++11 -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/git/include/public -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/git/src/resource_manager -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot/usr/include -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot/usr/include -pthread -pthread -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot/usr/include/gstreamer-1.0 -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot/usr/include/orc-0.4 -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot/usr/include/gstreamer-1.0 -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot/usr/include -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot/usr/include/glib-2.0 -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot/usr/lib/glib-2.0/include -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot/usr/include -DUSE_PMLOG_DECLARATION -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot/usr/include/glib-2.0 -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot/usr/lib/glib-2.0/include -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot/usr/include -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot/usr/include/glib-2.0 -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot/usr/lib/glib-2.0/include -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot/usr/include -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysroot/usr/include -DLTTNG_PMTRACE -DTRACEPOINT_DEFINE -DTRACEPOINT_PROBE_DYNAMIC_LINKAGE -DENABLE_PMTRACE -DPERFLOG_USE_PMLOG -ITOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/recipe-sysrootinclude -DNDEBUG -MD -MT src/server/CMakeFiles/umediaserver.dir/uMediaserver.cpp.o -MF src/server/CMakeFiles/umediaserver.dir/uMediaserver.cpp.o.d -o src/server/CMakeFiles/umediaserver.dir/uMediaserver.cpp.o -c TOPDIR/BUILD/work/raspberrypi4_64-webos-linux/umediaserver/1.0.0-gav.46/git/src/server/uMediaserver.cpp
../git/src/server/uMediaserver.cpp: In member function 'void uMediaServer::uMediaserver::readDynamicPipelineConfigs()':
../git/src/server/uMediaserver.cpp:336:21: error: 'directory_iterator' is not a member of 'fs'; did you mean 'directory_entry'?
336 | fs::directory_iterator end_iter;
| ^~~~~~~~~~~~~~~~~~
| directory_entry
../git/src/server/uMediaserver.cpp:337:26: error: 'directory_iterator' is not a member of 'fs'; did you mean 'directory_entry'?
337 | for (fs::directory_iterator dir_iter(dynamic_config_dir); dir_iter!=end_iter; dir_iter++) {
| ^~~~~~~~~~~~~~~~~~
| directory_entry
../git/src/server/uMediaserver.cpp:337:75: error: 'dir_iter' was not declared in this scope
337 | for (fs::directory_iterator dir_iter(dynamic_config_dir); dir_iter!=end_iter; dir_iter++) {
| ^~~~~~~~
../git/src/server/uMediaserver.cpp:337:85: error: 'end_iter' was not declared in this scope
337 | for (fs::directory_iterator dir_iter(dynamic_config_dir); dir_iter!=end_iter; dir_iter++) {
| ^~~~~~~~

:Testing Performed:
Only build tested.

:QA Notes:
No change to image.

:Issues Addressed:
[WRQ-17959] Create GPVB with Yocto 5.1 Styhead

Change-Id: I6ad507d2499b4c99f3419b70a21eff60e7e655aa
---
Upstream-Status: Submitted [http://gpro.lge.com/c/webosose/umediaserver/+/409750 uMediaserver: add missing #include to fix build with boost-1.85.0]

src/server/uMediaserver.cpp | 1 +
1 file changed, 1 insertion(+)

diff --git a/src/server/uMediaserver.cpp b/src/server/uMediaserver.cpp
index 51d381e..58ce00b 100644
--- a/src/server/uMediaserver.cpp
+++ b/src/server/uMediaserver.cpp
@@ -33,6 +33,7 @@
#include <fstream>
#include <functional>
#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/directory.hpp>
#include <sys/inotify.h>
#include <libconfig.h++>

0 comments on commit 38757fd

Please sign in to comment.