Skip to content

Commit 979debf

Browse files
authored
Merge pull request #139 from meta-flutter/jw/systemd-dep
new build dependency for ivi-homescreen
2 parents e5e0070 + 682bafb commit 979debf

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

configs/desktop-homescreen.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@
3636
"PLUGIN_WEBVIEW": "-DBUILD_PLUGIN_WEBVIEW_FLUTTER_VIEW=${FLUTTER_WORKSPACE_CEF_PREBUILT_LOAD} -DCEF_ROOT=${FLUTTER_WORKSPACE}/app/ivi-homescreen-plugins/plugins/webview_flutter_view/third_party/cef_binary_128.4.9+g9840ad9+chromium-128.0.6613.120_linux64_minimal",
3737
"PLUGIN_WEBRTC": "-DBUILD_PLUGIN_WEBRTC=${FLUTTER_WORKSPACE_LIBWEBRTC_LOAD} -DLIBWEBRTC_INC_DIR=${LIBWEBRTC_INC_DIR} -DLIBWEBRTC_LIB=${LIBWEBRTC_LIB}",
3838
"PLUGIN_ARGS": "-DBUILD_PLUGIN_FILAMENT_VIEW=ON ${PLUGIN_WEBVIEW} -DBUILD_PLUGIN_NAV_RENDER_VIEW=${FLUTTER_WORKSPACE_MAPLIBRE_VULKAN_LOAD} -DBUILD_PLUGIN_LAYER_PLAYGROUND_VIEW=OFF -DBUILD_PLUGIN_AUDIOPLAYERS_LINUX=OFF -DBUILD_PLUGIN_URL_LAUNCHER=ON -DBUILD_PLUGIN_FILE_SELECTOR=ON -DBUILD_PLUGIN_GO_ROUTER=ON -DBUILD_PLUGIN_SECURE_STORAGE=OFF -DBUILD_PLUGIN_DESKTOP_WINDOW_LINUX=ON ${PLUGIN_FIREBASE} ${PLUGIN_RIVE} ${PLUGIN_PDF} ${FLUGIN_FILAMENT_VIEW} ${PLUGIN_WEBRTC} ${PLUGIN_CAMERA} ${PLUGIN_CAMERA_PIPEWIRE} ${PLUGIN_FLATPAK}",
39+
"PKG_CONFIG_PATH": "${CAMERA_INSTALL_PREFIX}/lib64/pkgconfig:${PKG_CONFIG_PATH}",
3940
"HOMESCREEN_CMAKE_ARGS": "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DLLVM_CONFIG=${LLVM_CONFIG} -DSANITIZE_ADDRESS=OFF -DENABLE_DLT=OFF -DBUILD_UNIT_TESTS=OFF -DBUILD_DOCS=OFF -DBUILD_CRASH_HANDLER=OFF -DENABLE_IVI_SHELL_CLIENT=OFF -DENABLE_XDG_CLIENT=ON -DENABLE_AGL_SHELL_CLIENT=${FLUTTER_WORKSPACE_AGL_COMPOSITOR_LOAD} -DENABLE_LTO=ON -DENABLE_STATIC_LINK=ON -DDEBUG_PLATFORM_MESSAGES=OFF -DBUILD_BACKEND_WAYLAND_EGL=ON -DBUILD_BACKEND_WAYLAND_VULKAN=OFF -DBUILD_EGL_TRANSPARENCY=ON -DBUILD_EGL_ENABLE_3D=ON -DBUILD_EGL_ENABLE_MULTISAMPLE=ON -DPLUGINS_DIR=${PLUGINS_DIR} ${PLUGIN_ARGS}${CMD_LINE_CMAKE_PLUGIN_ARGS}",
40-
"HOMESCREEN_EXE": "LD_LIBRARY_PATH=${LIBWEBRTC_LIB_DIR}:${RIVE_TEXT_LIB_DIR} SPDLOG_LEVEL=debug ${HOMESCREEN_BUILD_DIR}/shell/homescreen -b ${PLATFORM_ID_DIR_RELATIVE}",
41+
"HOMESCREEN_EXE": "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${CAMERA_INSTALL_PREFIX}/lib64:${LIBWEBRTC_LIB_DIR}:${RIVE_TEXT_LIB_DIR} SPDLOG_LEVEL=debug ${HOMESCREEN_BUILD_DIR}/shell/homescreen -b ${PLATFORM_ID_DIR_RELATIVE}",
4142
"PING_CMD": "[ -n \"$WAYLAND_DISPLAY\" ] && echo \"Type=wayland\"",
4243
"CREATE_BUNDLE_FOLDER": "mkdir -p ${PLATFORM_ID_DIR_RELATIVE}/data ${PLATFORM_ID_DIR_RELATIVE}/lib",
4344
"COPY_PLATFORM_ID_TO_BUNDLE_FOLDER": "cp -r ${PLATFORM_ID_DIR}/config.toml ${PLATFORM_ID_DIR_RELATIVE}/",
@@ -94,7 +95,7 @@
9495
"shell": true,
9596
"cmds": [
9697
"sudo apt-get update -y",
97-
"if [ -n \"$GITHUB_ACTIONS\" ]; then sudo apt-get install -yq flatpak libflatpak-dev gnome-software-plugin-flatpak; fi",
98+
"if [ -n \"$GITHUB_ACTIONS\" ]; then sudo apt-get install -yq libsystemd-dev flatpak libflatpak-dev gnome-software-plugin-flatpak; fi",
9899
"if [ -n \"$GITHUB_ACTIONS\" ]; then sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo; fi",
99100
"if [ -n \"$GITHUB_ACTIONS\" ]; then flatpak remotes; fi"
100101
],
@@ -126,7 +127,7 @@
126127
"shell": true,
127128
"cmds": [
128129
"sudo apt-get update -y",
129-
"if [ -n \"$GITHUB_ACTIONS\" ]; then sudo apt-get install -yq flatpak libflatpak-dev gnome-software-plugin-flatpak; fi",
130+
"if [ -n \"$GITHUB_ACTIONS\" ]; then sudo apt-get install -yq libsystemd-dev flatpak libflatpak-dev gnome-software-plugin-flatpak; fi",
130131
"if [ -n \"$GITHUB_ACTIONS\" ]; then sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo; fi",
131132
"if [ -n \"$GITHUB_ACTIONS\" ]; then flatpak remotes; fi"
132133
],
@@ -156,7 +157,7 @@
156157
"shell": true,
157158
"cmds": [
158159
"sudo dnf update -y",
159-
"sudo dnf -yq install SDL2-devel libsecret-devel zenity",
160+
"sudo dnf -yq install SDL2-devel libsecret-devel zenity systemd-devel ",
160161
"sudo dnf -yq install libunwind-devel gstreamer1-devel gstreamer1-plugins-base-devel gstreamer1-plugins-bad-free-devel gstreamer1-plugins-bad-free-extras gstreamer1-plugins-base-tools gstreamer1-plugins-good gstreamer1-plugins-good-extras gstreamer1-plugins-ugly-free",
161162
"sudo dnf -yq install flatpak",
162163
"if command -v flatpak >/dev/null 2>&1; then flatpak remote-add --if-not-exists --user flathub https://dl.flathub.org/repo/flathub.flatpakrepo || echo 'Flatpak remote add failed, continuing...'; fi",
@@ -167,7 +168,7 @@
167168
"rhel": {
168169
"cmds": [
169170
"sudo dnf update -y",
170-
"sudo dnf -y install zenity",
171+
"sudo dnf -y install zenity systemd-devel",
171172
"sudo dnf -y install libunwind-devel gstreamer1-devel gstreamer1-plugins-base-devel gstreamer1-plugins-bad-free-devel gstreamer1-plugins-base-tools gstreamer1-plugins-good gstreamer1-plugins-ugly-free",
172173
"sudo dnf -y install flatpak",
173174
"if command -v flatpak >/dev/null 2>&1; then flatpak remote-add --if-not-exists --user flathub https://dl.flathub.org/repo/flathub.flatpakrepo || echo 'Flatpak remote add failed, continuing...'; fi",

0 commit comments

Comments
 (0)