Merge pull request #158 from meta-flutter/fix/remove-fluorite

Remove Fluorite & Filament

Author: kerberjg

.github/workflows/fedora.yml

@@ -58,7 +58,7 @@ jobs:
           cd $GITHUB_WORKSPACE
           pwd; ls -la
           chown -R user:user .
-          su - user -c "cd $GITHUB_WORKSPACE && pwd && ls -la && export CI=true && export GITHUB_ACTIONS=true && ./flutter_workspace.py --enable=filament --stdin-file=/dev/null"
+          su - user -c "cd $GITHUB_WORKSPACE && pwd && ls -la && export CI=true && export GITHUB_ACTIONS=true && ./flutter_workspace.py --stdin-file=/dev/null"
           cat ./setup_env.sh
 
       - name: Test workspace
@@ -74,4 +74,4 @@ jobs:
         run: |
           cd $GITHUB_WORKSPACE
           pwd; ls -la
-          su - user -c "cd $GITHUB_WORKSPACE && pwd && ls -la && export CI=true && export GITHUB_ACTIONS=true && . ./setup_env.sh && ./flutter_workspace.py --create-aot --app-path=./app/tcna-packages/packages/filament_scene/example/"
+          su - user -c "cd $GITHUB_WORKSPACE && pwd && ls -la && export CI=true && export GITHUB_ACTIONS=true && . ./setup_env.sh && ./flutter_workspace.py --create-aot --app-path=./app/tcna-packages/packages/flatpak/example/"

.github/workflows/ubuntu-legacy.yml

@@ -70,7 +70,7 @@ jobs:
           cd $GITHUB_WORKSPACE
           pwd; ls -la
           export DEBIAN_FRONTEND=noninteractive; echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
-          sudo -u user bash -c "./flutter_workspace.py --enable=filament"
+          sudo -u user bash -c "./flutter_workspace.py"
           cat ./setup_env.sh
 
       - name: Test workspace
@@ -88,4 +88,4 @@ jobs:
           cd $GITHUB_WORKSPACE
           pwd; ls -la
           sudo -u user bash -c ". ./setup_env.sh && \
-          ./flutter_workspace.py --create-aot --app-path=./app/tcna-packages/packages/filament_scene/example/"
+          ./flutter_workspace.py --create-aot --app-path=./app/tcna-packages/packages/flatpak/example/"

.github/workflows/ubuntu.yml

@@ -55,7 +55,7 @@ jobs:
         run: |
           cd $GITHUB_WORKSPACE
           pwd; ls -la
-          PREFER_LLVM=${{ matrix.llvm }} ./flutter_workspace.py --enable=filament
+          PREFER_LLVM=${{ matrix.llvm }} ./flutter_workspace.py
           echo "Checking LLVM config..."
           cat setup_env.sh; echo ""
           FOUND_LLVM_VER=$(grep -oP 'export PREFER_LLVM=\K[0-9]+' setup_env.sh)
@@ -86,4 +86,4 @@ jobs:
           cd $GITHUB_WORKSPACE
           pwd; ls -la
           . ./setup_env.sh
-          ./flutter_workspace.py --create-aot --app-path=./app/tcna-packages/packages/filament_scene/example/
+          ./flutter_workspace.py --create-aot --app-path=./app/tcna-packages/packages/flatpak/example/

.github/workflows/windows.yaml

@@ -150,7 +150,7 @@ jobs:
           }
           
           Write-Host "Starting flutter_workspace.py..."
-          ./flutter_workspace.ps1 --enable "filament-windows"
+          ./flutter_workspace.ps1
 
       - name: Test workspace
         env:

README.md

@@ -23,40 +23,6 @@ This script reads a configuration folder of JSON files, or a single JSON configu
 
     python3 -m pip install virtualenv
 
--Requirements to build `filament-windows/flutter-engine-windows`
-  
-  -Enable long path support for git
-
-      git config --global core.longpaths true
-
-  -Enable Developer Mode to allow symlink creation without Admin rights
-
-    On Windows 10/11, enabling Developer Mode allows non-admin users to create symlinks
-
-    Go to Settings > Search for developer settings
-    Turn on Developer Mode
-    Restart your terminal
-
-  -Install Windows 10 SDK from Visual Studio installer
-
-   if ARM64 Windows machine copy `C:\Program Files (x86)\Windows Kits\10\Debuggers\arm64` to `C:\Program Files (x86)\Windows Kits\10\Debuggers\arm64` to appease flutter/tools/gen.bat
-
-  -Install ninja and add to path after depot_tools
-
-  -Optional install WinDgb - AKA Wind-Bag
-  
-    winget install Microsoft.WinDbg
-
-  -Running
-
-    Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser
-    .\flutter_workspace.ps1 --enable "filament-windows,flutter-engine-windows"
-
-  -Running setup_env.ps1
-
-    Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser
-    .\setup_env.ps1
-
 ### create_aot.py
 
 create AOT is used to create libapp.so for use on a device.  It requires an active FLUTTER_WORKSPACE.
@@ -187,15 +153,15 @@ Pass folder for storing dart and engine json files.
 
 Platform Load Exceptions.  Pass platform-id values.  Select multiple platform ids by seperating with `,`.
 
-e.g. `--plex=filament,firebase-cpp-sdk`
+e.g. `--plex=flatpak,firebase-cpp-sdk`
 
 This option also has the impact of forcing the environmental variable `FLUTTER_WORKSPACE_<platfor id>)_LOAD=OFF`.  This variable can be used reliably in a configuration type other than `dependency`.
 
 #### --enable="..."
 
 Enable Platform Configuration(s).  Pass platform-id values.  Select multiple platform ids by seperating with `,`.
 
-e.g. `--enable=filament`
+e.g. `--enable=flatpak`
 
 This option also has the impact of forcing the environmental variable `FLUTTER_WORKSPACE_<platfor id>)_LOAD=ON`.  This variable can be used reliably in a configuration type other than `dependency`.
 

configs/desktop-homescreen.json

@@ -28,17 +28,16 @@
     "PLUGIN_CAMERA": "-DBUILD_PLUGIN_CAMERA=${FLUTTER_WORKSPACE_LIBCAMERA_LOAD}",
     "PLUGIN_CAMERA_PIPEWIRE": "-DBUILD_PLUGIN_CAMERA_PIPEWIRE=${FLUTTER_WORKSPACE_PIPEWIRE_LOAD}",
     "PLUGIN_FLATPAK": "-DBUILD_PLUGIN_FLATPAK=OFF",
-    "FLUGIN_FILAMENT_VIEW": "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DBUILD_PLUGIN_FILAMENT_VIEW=${FLUTTER_WORKSPACE_FILAMENT_LOAD} -DFILAMENT_INCLUDE_DIR=${FILAMENT_INCLUDE_DIR} -DFILAMENT_LINK_LIBRARIES_DIR=${FILAMENT_LINK_LIBRARIES_DIR} -DFILAMENT_BUILD_TYPE=${FILAMENT_BUILD_TYPE}",
     "PLUGIN_PDF": "-DBUILD_PLUGIN_PDF=${FLUTTER_WORKSPACE_PDFIUM_LOAD}",
     "LIBWEBRTC_SRC_DIR": "${FLUTTER_WORKSPACE}/app/libwebrtc/src",
     "LIBWEBRTC_INC_DIR": "${LIBWEBRTC_SRC_DIR}/libwebrtc/include",
     "LIBWEBRTC_LIB_DIR": "${LIBWEBRTC_SRC_DIR}/out/Linux-Debug",
     "LIBWEBRTC_LIB": "${LIBWEBRTC_LIB_DIR}/libwebrtc.so",
     "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",
     "PLUGIN_WEBRTC": "-DBUILD_PLUGIN_WEBRTC=${FLUTTER_WORKSPACE_LIBWEBRTC_LOAD} -DLIBWEBRTC_INC_DIR=${LIBWEBRTC_INC_DIR} -DLIBWEBRTC_LIB=${LIBWEBRTC_LIB}",
-    "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}",
+    "PLUGIN_ARGS": "${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} ${PLUGIN_WEBRTC} ${PLUGIN_CAMERA} ${PLUGIN_CAMERA_PIPEWIRE} ${PLUGIN_FLATPAK}",
     "PKG_CONFIG_PATH": "${CAMERA_INSTALL_PREFIX}/lib64/pkgconfig:${PKG_CONFIG_PATH}",
-    "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}",
+    "HOMESCREEN_CMAKE_ARGS": "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON -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}",
     "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}",
     "PING_CMD": "[ -n \"$WAYLAND_DISPLAY\" ] && echo \"Type=wayland\"",
     "CREATE_BUNDLE_FOLDER": "mkdir -p ${PLATFORM_ID_DIR_RELATIVE}/data ${PLATFORM_ID_DIR_RELATIVE}/lib",