[Buildroot] [PATCH v3 00/11] flutter package improvements

[Buildroot] [PATCH v3 00/11] flutter package improvements

[Adam Duskett]

Hello;

Included in this patch series are several packages that improve the current
set of flutter packages available to users.

This is the third set for this patch series that includes the following
changes:

  - I rewrote the commit messages for every patch to be far more comprehensive.
    These commit messages have also been ran through grammarly to ensure that
    there are no typos or glaring gramatical errors.

  - I have dropped the "package/xdg-user-dirs: new package" and
    "package/flutter-gallery: depend on xdg-user-dirs and fix build options"
    commits, as xdg-user-dirs is not needed by Amarula nor was I asked to
    port it. This means that flutter-gallery will still need the
    0001-remove-GetStorage.patch to function.

  - Updated flutter from 3.16.4 to 3.16.5

These packages have been tested on a x86_64 host with an AMD Ryzen 9 6900HS
with Docker 24.0.5:
  - The following distributions:
    - Fedora 39: Host system
    - Ubuntu 22.04: Docker
    - Debian 11: Docker

  - The following targets:
    - BR2_aarch64
    - BR2_arm
    - BR2_x86_64

Also, these packages have tested with the following testing command:

./support/testing/run-tests \
  -d ./dl \
  -o ./output \
  -k \
  tests.package.test_flutter.TestFlutter

I hope that the quality of these patches are to the maintainers satisfaction.
If there are any problems, please feel free to email me directly and I will
respond back as soon as possible.

Adam Duskett

Adam Duskett (11):
  package/Config.in: move flutter-pi
  package/Config.in: move flutter-gallery menu entry
  package/flutter-sdk-bin: bump version to 3.16.5
  package/flutter-engine: bump version to 3.16.5
  package/flutter-pi: bump version to
    f34d7bdbda713ba607b9625541ddfa314d9999a0
  package/flutter-pi: add the charset converter plugin as a menuconfig
    option
  package/flutter-engine: Add profile runtime mode selection
  package/flutter-sdk-bin: add dart arguments for different runtime
    modes
  package/flutter-gallery: add a configure step
  package/flutter-gallery: clean up install_target_cmds
  package/flutter-sdk-bin/Config.in.host: add pub-cache location option

 package/Config.in                             |  4 +-
 package/flutter-engine/Config.in              | 25 ++++++++
 package/flutter-engine/flutter-engine.mk      |  6 +-
 package/flutter-gallery/flutter-gallery.mk    | 17 ++++--
 ...er_surface-properly-fallback-to-surf.patch | 59 -------------------
 package/flutter-pi/Config.in                  |  7 +++
 package/flutter-pi/flutter-pi.hash            |  2 +-
 package/flutter-pi/flutter-pi.mk              |  8 ++-
 package/flutter-sdk-bin/Config.in.host        | 11 ++++
 package/flutter-sdk-bin/flutter-sdk-bin.hash  |  2 +-
 package/flutter-sdk-bin/flutter-sdk-bin.mk    | 25 +++++---
 11 files changed, 87 insertions(+), 79 deletions(-)
 delete mode 100644 package/flutter-pi/0001-src-egl_gbm_render_surface-properly-fallback-to-surf.patch

-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v3 01/11] package/Config.in: move flutter-pi

[Adam Duskett]

package/flutter-pi was place erroneous under the "Graphic libraries"
section of the menu "Graphic libraries and applications (graphic/text)"
menu. However, as flutter-pi is an application that runs graphic applicaitons
it is better suited to be placed under the "Graphic applications" section.

Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
 package/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/Config.in b/package/Config.in
index d5d89c50aa..9ec185f16c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -314,6 +314,7 @@ comment "Graphic applications"
 	source "package/cage/Config.in"
 	source "package/cog/Config.in"
 	source "package/dmenu-wayland/Config.in"
+	source "package/flutter-pi/Config.in"
 	source "package/foot/Config.in"
 	source "package/fswebcam/Config.in"
 	source "package/ghostscript/Config.in"
@@ -348,7 +349,6 @@ comment "Graphic libraries"
 	source "package/fbterm/Config.in"
 	source "package/fbv/Config.in"
 	source "package/flutter-gallery/Config.in"
-	source "package/flutter-pi/Config.in"
 	source "package/freerdp/Config.in"
 	source "package/graphicsmagick/Config.in"
 	source "package/imagemagick/Config.in"
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v3 01/11] package/Config.in: move flutter-pi

[Yann E. MORIN]

Adam, All,

On 2024-01-02 16:59 -0700, Adam Duskett spake thusly:
> package/flutter-pi was place erroneous under the "Graphic libraries"
                         ^^^^^^^^^^^^^^^
I fixed the grammar, adn took the opportunity to reflow the commit log.

Applied to master, thanks.

> section of the menu "Graphic libraries and applications (graphic/text)"
> menu. However, as flutter-pi is an application that runs graphic applicaitons
> it is better suited to be placed under the "Graphic applications" section.
> 
> Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
> ---
>  package/Config.in | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/package/Config.in b/package/Config.in
> index d5d89c50aa..9ec185f16c 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -314,6 +314,7 @@ comment "Graphic applications"
>  	source "package/cage/Config.in"
>  	source "package/cog/Config.in"
>  	source "package/dmenu-wayland/Config.in"
> +	source "package/flutter-pi/Config.in"
>  	source "package/foot/Config.in"
>  	source "package/fswebcam/Config.in"
>  	source "package/ghostscript/Config.in"
> @@ -348,7 +349,6 @@ comment "Graphic libraries"
>  	source "package/fbterm/Config.in"
>  	source "package/fbv/Config.in"
>  	source "package/flutter-gallery/Config.in"
> -	source "package/flutter-pi/Config.in"
>  	source "package/freerdp/Config.in"
>  	source "package/graphicsmagick/Config.in"
>  	source "package/imagemagick/Config.in"
> -- 
> 2.43.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v3 01/11] package/Config.in: move flutter-pi

[Peter Korsgaard]

>>>>> "Adam" == Adam Duskett <adam.duskett@amarulasolutions.com> writes:

 > package/flutter-pi was place erroneous under the "Graphic libraries"
 > section of the menu "Graphic libraries and applications (graphic/text)"
 > menu. However, as flutter-pi is an application that runs graphic applicaitons
 > it is better suited to be placed under the "Graphic applications" section.

 > Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>

Committed to 2023.11.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v3 02/11] package/Config.in: move flutter-gallery menu entry

[Adam Duskett]

package/flutter-gallery was place erroneous under the "Graphic libraries"
section of the menu "Graphic libraries and applications (graphic/text)"
menu. However, as flutter-gallery is a flutter-based graphical user interface
(GUI) application, it is better suited to be placed under the
"Graphic applications" section.

Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
 package/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/Config.in b/package/Config.in
index 9ec185f16c..a03415546a 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -314,6 +314,7 @@ comment "Graphic applications"
 	source "package/cage/Config.in"
 	source "package/cog/Config.in"
 	source "package/dmenu-wayland/Config.in"
+	source "package/flutter-gallery/Config.in"
 	source "package/flutter-pi/Config.in"
 	source "package/foot/Config.in"
 	source "package/fswebcam/Config.in"
@@ -348,7 +349,6 @@ comment "Graphic libraries"
 	source "package/fbset/Config.in"
 	source "package/fbterm/Config.in"
 	source "package/fbv/Config.in"
-	source "package/flutter-gallery/Config.in"
 	source "package/freerdp/Config.in"
 	source "package/graphicsmagick/Config.in"
 	source "package/imagemagick/Config.in"
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v3 02/11] package/Config.in: move flutter-gallery menu entry

[Yann E. MORIN]

Adam, All,

On 2024-01-02 16:59 -0700, Adam Duskett spake thusly:
> package/flutter-gallery was place erroneous under the "Graphic libraries"

I fixed the same grammar typo, and also reflowed the commit log.

Applied to master, thanks.

Regards,
Yann E. MORIN.

> section of the menu "Graphic libraries and applications (graphic/text)"
> menu. However, as flutter-gallery is a flutter-based graphical user interface
> (GUI) application, it is better suited to be placed under the
> "Graphic applications" section.
> 
> Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
> ---
>  package/Config.in | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/package/Config.in b/package/Config.in
> index 9ec185f16c..a03415546a 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -314,6 +314,7 @@ comment "Graphic applications"
>  	source "package/cage/Config.in"
>  	source "package/cog/Config.in"
>  	source "package/dmenu-wayland/Config.in"
> +	source "package/flutter-gallery/Config.in"
>  	source "package/flutter-pi/Config.in"
>  	source "package/foot/Config.in"
>  	source "package/fswebcam/Config.in"
> @@ -348,7 +349,6 @@ comment "Graphic libraries"
>  	source "package/fbset/Config.in"
>  	source "package/fbterm/Config.in"
>  	source "package/fbv/Config.in"
> -	source "package/flutter-gallery/Config.in"
>  	source "package/freerdp/Config.in"
>  	source "package/graphicsmagick/Config.in"
>  	source "package/imagemagick/Config.in"
> -- 
> 2.43.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v3 02/11] package/Config.in: move flutter-gallery menu entry

[Peter Korsgaard]

>>>>> "Adam" == Adam Duskett <adam.duskett@amarulasolutions.com> writes:

 > package/flutter-gallery was place erroneous under the "Graphic libraries"
 > section of the menu "Graphic libraries and applications (graphic/text)"
 > menu. However, as flutter-gallery is a flutter-based graphical user interface
 > (GUI) application, it is better suited to be placed under the
 > "Graphic applications" section.

 > Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>

Committed to 2023.11.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v3 03/11] package/flutter-sdk-bin: bump version to 3.16.5

[Adam Duskett]

On line 66 of flutter_tools/lib/runner.dart, the following lines have been
replaced:

```
if (args.contains('--disable-telemetry') &&
            args.contains('--enable-telemetry'))
```

with the following:

```
if (args.contains('--disable-analytics') &&
    args.contains('--enable-analytics')) {
```

As such, the option in package/flutter-sdk-bin/flutter-sdk-bin.mk on line 27
changes from "--disable-telemetry" to "--disable-analytics."

A subsequent look at the rest of the file including the logic around the
change of the name of the above option provides no other elevant changes
that would apply to this package update.

Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
v2 -> v3: Updted to 3.16.5

 package/flutter-sdk-bin/flutter-sdk-bin.hash | 2 +-
 package/flutter-sdk-bin/flutter-sdk-bin.mk   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.hash b/package/flutter-sdk-bin/flutter-sdk-bin.hash
index a204de1807..f0a855f2c9 100644
--- a/package/flutter-sdk-bin/flutter-sdk-bin.hash
+++ b/package/flutter-sdk-bin/flutter-sdk-bin.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  b6bc6f93423488c67110e0fe56523cd2260f3a4c379ed015cd1c7fab66362739  flutter_linux_3.13.9-stable.tar.xz
+sha256  57e59fa3a31be7e87b3847cdf782f1323578bbf70a0cd35f3615f01ab429ac29  flutter_linux_3.16.5-stable.tar.xz
 sha256  a598db94b6290ffbe10b5ecf911057b6a943351c727fdda9e5f2891d68700a20  LICENSE
diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.mk b/package/flutter-sdk-bin/flutter-sdk-bin.mk
index e8e71b6ab0..a28cf645f3 100644
--- a/package/flutter-sdk-bin/flutter-sdk-bin.mk
+++ b/package/flutter-sdk-bin/flutter-sdk-bin.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FLUTTER_SDK_BIN_VERSION = 3.13.9
+FLUTTER_SDK_BIN_VERSION = 3.16.5
 FLUTTER_SDK_BIN_SITE = https://storage.googleapis.com/flutter_infra_release/releases/stable/linux
 FLUTTER_SDK_BIN_SOURCE = flutter_linux_$(FLUTTER_SDK_BIN_VERSION)-stable.tar.xz
 FLUTTER_SDK_BIN_LICENSE = BSD-3-Clause
@@ -25,7 +25,7 @@ HOST_FLUTTER_SDK_BIN_ENV = \
 HOST_FLUTTER_SDK_BIN_CONF_OPTS = \
 	--clear-features \
 	--no-analytics \
-	--disable-telemetry \
+	--disable-analytics \
 	--enable-custom-devices \
 	--enable-linux-desktop \
 	--no-enable-android \
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v3 03/11] package/flutter-sdk-bin: bump version to 3.16.5

[Yann E. MORIN]

Adam, All,

On 2024-01-02 16:59 -0700, Adam Duskett spake thusly:
> On line 66 of flutter_tools/lib/runner.dart, the following lines have been
> replaced:
> 
> ```
> if (args.contains('--disable-telemetry') &&
>             args.contains('--enable-telemetry'))
> ```
> 
> with the following:
> 
> ```
> if (args.contains('--disable-analytics') &&
>     args.contains('--enable-analytics')) {
> ```
> 
> As such, the option in package/flutter-sdk-bin/flutter-sdk-bin.mk on line 27
> changes from "--disable-telemetry" to "--disable-analytics."

I've shortenned the above to just state that upstream had changed the
name of the option.

> A subsequent look at the rest of the file including the logic around the
> change of the name of the above option provides no other elevant changes
> that would apply to this package update.
> 
> Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
> v2 -> v3: Updted to 3.16.5
> 
>  package/flutter-sdk-bin/flutter-sdk-bin.hash | 2 +-
>  package/flutter-sdk-bin/flutter-sdk-bin.mk   | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.hash b/package/flutter-sdk-bin/flutter-sdk-bin.hash
> index a204de1807..f0a855f2c9 100644
> --- a/package/flutter-sdk-bin/flutter-sdk-bin.hash
> +++ b/package/flutter-sdk-bin/flutter-sdk-bin.hash
> @@ -1,3 +1,3 @@
>  # Locally calculated
> -sha256  b6bc6f93423488c67110e0fe56523cd2260f3a4c379ed015cd1c7fab66362739  flutter_linux_3.13.9-stable.tar.xz
> +sha256  57e59fa3a31be7e87b3847cdf782f1323578bbf70a0cd35f3615f01ab429ac29  flutter_linux_3.16.5-stable.tar.xz
>  sha256  a598db94b6290ffbe10b5ecf911057b6a943351c727fdda9e5f2891d68700a20  LICENSE
> diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.mk b/package/flutter-sdk-bin/flutter-sdk-bin.mk
> index e8e71b6ab0..a28cf645f3 100644
> --- a/package/flutter-sdk-bin/flutter-sdk-bin.mk
> +++ b/package/flutter-sdk-bin/flutter-sdk-bin.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
>  
> -FLUTTER_SDK_BIN_VERSION = 3.13.9
> +FLUTTER_SDK_BIN_VERSION = 3.16.5
>  FLUTTER_SDK_BIN_SITE = https://storage.googleapis.com/flutter_infra_release/releases/stable/linux
>  FLUTTER_SDK_BIN_SOURCE = flutter_linux_$(FLUTTER_SDK_BIN_VERSION)-stable.tar.xz
>  FLUTTER_SDK_BIN_LICENSE = BSD-3-Clause
> @@ -25,7 +25,7 @@ HOST_FLUTTER_SDK_BIN_ENV = \
>  HOST_FLUTTER_SDK_BIN_CONF_OPTS = \
>  	--clear-features \
>  	--no-analytics \
> -	--disable-telemetry \
> +	--disable-analytics \
>  	--enable-custom-devices \
>  	--enable-linux-desktop \
>  	--no-enable-android \
> -- 
> 2.43.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v3 04/11] package/flutter-engine: bump version to 3.16.5

[Adam Duskett]

Flutter 3.16 includes 1,954 commits and improvements.

Flutter 3.16.0 also sets Material 3 as the default visual style for
applications.

A brief changelog can be found here:
https://docs.flutter.dev/release/release-notes/release-notes-3.16.0

A full changelog is provided below, which is provided at the end of the
brief changelog page found above:
https://github.com/flutter/engine/compare/3.13.0%E2%80%A63.16.0-0.5.pre

This package update has been tested on a x86_64 host with Docker 24.0.5:
  - The following distributions:
    - Fedora 39: Host system
    - Ubuntu 22.04: Docker
    - Debian 11: Docker

  - The following targets:
    - BR2_aarch64
    - BR2_arm
    - BR2_x86_64

Also, the package is tested with the following testing command:

./support/testing/run-tests \
  -d ./dl \
  -o ./output \
  -k \
  tests.package.test_flutter.TestFlutter

Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
v2 -> v3: Updted to 3.16.5

 package/flutter-engine/flutter-engine.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/flutter-engine/flutter-engine.mk b/package/flutter-engine/flutter-engine.mk
index d31d435d79..c3ac144f2a 100644
--- a/package/flutter-engine/flutter-engine.mk
+++ b/package/flutter-engine/flutter-engine.mk
@@ -21,7 +21,7 @@
 #
 # There is no hash provided, as the gn binary (used for configuration) relies
 # on the .git directories. As such, a reproducible tarball is not possible.
-FLUTTER_ENGINE_VERSION = 3.13.9
+FLUTTER_ENGINE_VERSION = 3.16.5
 
 # There is nothing for Buildroot to download. This is handled by gclient.
 FLUTTER_ENGINE_SITE =
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v3 04/11] package/flutter-engine: bump version to 3.16.5

[Yann E. MORIN]

Adam, All,

On 2024-01-02 16:59 -0700, Adam Duskett spake thusly:
> Flutter 3.16 includes 1,954 commits and improvements.
> 
> Flutter 3.16.0 also sets Material 3 as the default visual style for
> applications.
> 
> A brief changelog can be found here:
> https://docs.flutter.dev/release/release-notes/release-notes-3.16.0
> 
> A full changelog is provided below, which is provided at the end of the
> brief changelog page found above:
> https://github.com/flutter/engine/compare/3.13.0%E2%80%A63.16.0-0.5.pre
> 
> This package update has been tested on a x86_64 host with Docker 24.0.5:
>   - The following distributions:
>     - Fedora 39: Host system
>     - Ubuntu 22.04: Docker
>     - Debian 11: Docker
> 
>   - The following targets:
>     - BR2_aarch64
>     - BR2_arm
>     - BR2_x86_64
> 
> Also, the package is tested with the following testing command:
> 
> ./support/testing/run-tests \
>   -d ./dl \
>   -o ./output \
>   -k \
>   tests.package.test_flutter.TestFlutter

As we discussed about ivi-homescreen, testing details are very welcome,
but they are better placed in a post-commit note, so that they do not
end up in the commit log. So I dropped those.

> Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
> v2 -> v3: Updted to 3.16.5
> 
>  package/flutter-engine/flutter-engine.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/package/flutter-engine/flutter-engine.mk b/package/flutter-engine/flutter-engine.mk
> index d31d435d79..c3ac144f2a 100644
> --- a/package/flutter-engine/flutter-engine.mk
> +++ b/package/flutter-engine/flutter-engine.mk
> @@ -21,7 +21,7 @@
>  #
>  # There is no hash provided, as the gn binary (used for configuration) relies
>  # on the .git directories. As such, a reproducible tarball is not possible.
> -FLUTTER_ENGINE_VERSION = 3.13.9
> +FLUTTER_ENGINE_VERSION = 3.16.5
>  
>  # There is nothing for Buildroot to download. This is handled by gclient.
>  FLUTTER_ENGINE_SITE =
> -- 
> 2.43.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v3 05/11] package/flutter-pi: bump version to f34d7bdbda713ba607b9625541ddfa314d9999a0

[Adam Duskett]

For f34d7bdbda713ba607b9625541ddfa314d9999a0, there is a single commit:
```
Docs say it shouldn't make a difference, though in
https://github.com/ardera/flutter-pi/issues/370 it was reported to resolve
a memory leak on iMX6.
``

However, there are 14 commits between the current version of d62e84 and f34d7b.
Some highlights include:
  - egl_gbm_render_surface: fix initialization of is_locked:
  - src/egl_gbm_render_surface: properly fallback to surface with no modifier
  - user input: store mt positions separately
  - video player: Transition to READY before NULL
  - check all malloc returns

Users reading this commit may find a full list of changes found here:
https://github.com/ardera/flutter-pi/commits/master/

In addition, commit 6a28738 introduces the charset_converter, which is a
platform-side implementation of the charset_converter plugin found here:
https://pub.dev/packages/charset_converter

The charset_converter plugin does the following:
```
Encode and decode charsets using platform built-in converter.
This plugin saves app package size as you don't need external charset maps or
whole libraries like iconv. This package doesn't even contain any Dart
dependencies. However, this comes with the dependency on the platform.
```

As this is a new plugin, disable it by default and enable it in the next patch
in this series.

Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
 ...er_surface-properly-fallback-to-surf.patch | 59 -------------------
 package/flutter-pi/flutter-pi.hash            |  2 +-
 package/flutter-pi/flutter-pi.mk              |  3 +-
 3 files changed, 3 insertions(+), 61 deletions(-)
 delete mode 100644 package/flutter-pi/0001-src-egl_gbm_render_surface-properly-fallback-to-surf.patch

diff --git a/package/flutter-pi/0001-src-egl_gbm_render_surface-properly-fallback-to-surf.patch b/package/flutter-pi/0001-src-egl_gbm_render_surface-properly-fallback-to-surf.patch
deleted file mode 100644
index 7a1a49b3d4..0000000000
--- a/package/flutter-pi/0001-src-egl_gbm_render_surface-properly-fallback-to-surf.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 856f9849763535d62ed01b538ba23905875c93f4 Mon Sep 17 00:00:00 2001
-From: "Yann E. MORIN" <yann.morin.1998@free.fr>
-Date: Tue, 26 Sep 2023 20:31:17 +0200
-Subject: [PATCH] src/egl_gbm_render_surface: properly fallback to surface with
- no modifier
-
-In 869fa7fcfbeb, we added a fallback to be able to create an EGL sruface
-when the driver do not support modifiers, like the llvmpipe software
-renderer (or like some proprietary drivers, like the MALI ones), as
-reported in #269 [0].
-
-However, in c6537673c9b6, there was a big overhaul of renderer
-infrastructure. That commit lost the with-modifiers code path and only
-kept the without-modifiers fallback one (i.e. it only kept the call to
-gbm_surface_create(), not to gbm_surface_create_with_modifiers()).
-
-Then in b0d09f5032a4, the with-modifier code path was re-instated, but
-in a way that made it exclusive with the without-modifiers one. That is,
-the without-modifiers code path was not a fallback to when the other
-failed.
-
-Re-instate the fallback mechanism as intiially implemented.
-
-[0] https://github.com/ardera/flutter-pi/issues/269
-
-Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
-Upstream: https://github.com/ardera/flutter-pi/pull/367
----
- src/egl_gbm_render_surface.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/egl_gbm_render_surface.c b/src/egl_gbm_render_surface.c
-index ce9e5e7..8a58667 100644
---- a/src/egl_gbm_render_surface.c
-+++ b/src/egl_gbm_render_surface.c
-@@ -146,6 +146,7 @@ static int egl_gbm_render_surface_init(
-     }
- #endif
- 
-+    gbm_surface = NULL;
-     if (allowed_modifiers != NULL) {
-         gbm_surface = gbm_surface_create_with_modifiers(
-             gbm_device,
-@@ -158,9 +159,10 @@ static int egl_gbm_render_surface_init(
-         if (gbm_surface == NULL) {
-             ok = errno;
-             LOG_ERROR("Couldn't create GBM surface for rendering. gbm_surface_create_with_modifiers: %s\n", strerror(ok));
--            return ok;
-+            LOG_ERROR("Will retry without modifiers\n");
-         }
--    } else {
-+    }
-+    if (gbm_surface == NULL) {
-         gbm_surface = gbm_surface_create(
-             gbm_device,
-             size.x,
--- 
-2.25.1
-
diff --git a/package/flutter-pi/flutter-pi.hash b/package/flutter-pi/flutter-pi.hash
index f7148963a4..6c5371d18a 100644
--- a/package/flutter-pi/flutter-pi.hash
+++ b/package/flutter-pi/flutter-pi.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  e4af79c8f53c15913f52a83a221f099a2a750d023a0bc4560d0db6f15def79a2  flutter-pi-d62e84350d2869b3ec1dfb1af21bfe234c4b817f-br1.tar.gz
+sha256  cf10ca9e26beea036ccf218e6a900de5f1f2000e00c03e7a48898c2a0c99f591  flutter-pi-f34d7bdbda713ba607b9625541ddfa314d9999a0-br1.tar.gz
 sha256  b34df9d3e1b4e5d1ba70b1740ec74b69f1189b44efd0c96b898b074ef8db1c70  LICENSE
diff --git a/package/flutter-pi/flutter-pi.mk b/package/flutter-pi/flutter-pi.mk
index 27f140c177..4ec89bdfad 100644
--- a/package/flutter-pi/flutter-pi.mk
+++ b/package/flutter-pi/flutter-pi.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FLUTTER_PI_VERSION = d62e84350d2869b3ec1dfb1af21bfe234c4b817f
+FLUTTER_PI_VERSION = f34d7bdbda713ba607b9625541ddfa314d9999a0
 FLUTTER_PI_SITE = https://github.com/ardera/flutter-pi.git
 FLUTTER_PI_SITE_METHOD = git
 FLUTTER_PI_LICENSE = MIT
@@ -27,6 +27,7 @@ FLUTTER_PI_CONF_OPTS = \
 	-DENABLE_VULKAN=OFF \
 	-DFILESYSTEM_LAYOUT=meta-flutter \
 	-DLINT_EGL_HEADERS=OFF \
+	-DBUILD_CHARSET_CONVERTER_PLUGIN=OFF \
 	-DTRY_BUILD_GSTREAMER_AUDIO_PLAYER_PLUGIN=OFF \
 	-DTRY_BUILD_GSTREAMER_VIDEO_PLAYER_PLUGIN=OFF \
 	-DTRY_ENABLE_OPENGL=OFF \
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v3 05/11] package/flutter-pi: bump version to f34d7bdbda713ba607b9625541ddfa314d9999a0

[Yann E. MORIN]

Adam, All,

On 2024-01-02 16:59 -0700, Adam Duskett spake thusly:
> For f34d7bdbda713ba607b9625541ddfa314d9999a0, there is a single commit:
> ```
> Docs say it shouldn't make a difference, though in
> https://github.com/ardera/flutter-pi/issues/370 it was reported to resolve
> a memory leak on iMX6.
> ``

I am not sure singling out single upstream commits is so intersting, and
that one was not really critical (a bug fix for a memory leak does not
really warrant being singled out). So I dropped that part.

> However, there are 14 commits between the current version of d62e84 and f34d7b.
> Some highlights include:
>   - egl_gbm_render_surface: fix initialization of is_locked:
>   - src/egl_gbm_render_surface: properly fallback to surface with no modifier
>   - user input: store mt positions separately
>   - video player: Transition to READY before NULL
>   - check all malloc returns

Such a list of a few highlights is indeed pretty interesting, thanks!
I added a note below the second item, as it allows us to drop our patch.

> Users reading this commit may find a full list of changes found here:
> https://github.com/ardera/flutter-pi/commits/master/

Users interested in seeing what upstream has done will go to the upstrem
repo or homepage, whatever the package, so I dropped that part.

> In addition, commit 6a28738 introduces the charset_converter, which is a
> platform-side implementation of the charset_converter plugin found here:
> https://pub.dev/packages/charset_converter
> 
> The charset_converter plugin does the following:
> ```
> Encode and decode charsets using platform built-in converter.
> This plugin saves app package size as you don't need external charset maps or
> whole libraries like iconv. This package doesn't even contain any Dart
> dependencies. However, this comes with the dependency on the platform.
> ```
> 
> As this is a new plugin, disable it by default and enable it in the next patch
> in this series.

I trimmed that to drop te plugin description (it is not added now, so the
description is not interesting in this commit).

> Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  ...er_surface-properly-fallback-to-surf.patch | 59 -------------------
>  package/flutter-pi/flutter-pi.hash            |  2 +-
>  package/flutter-pi/flutter-pi.mk              |  3 +-
>  3 files changed, 3 insertions(+), 61 deletions(-)
>  delete mode 100644 package/flutter-pi/0001-src-egl_gbm_render_surface-properly-fallback-to-surf.patch
> 
> diff --git a/package/flutter-pi/0001-src-egl_gbm_render_surface-properly-fallback-to-surf.patch b/package/flutter-pi/0001-src-egl_gbm_render_surface-properly-fallback-to-surf.patch
> deleted file mode 100644
> index 7a1a49b3d4..0000000000
> --- a/package/flutter-pi/0001-src-egl_gbm_render_surface-properly-fallback-to-surf.patch
> +++ /dev/null
> @@ -1,59 +0,0 @@
> -From 856f9849763535d62ed01b538ba23905875c93f4 Mon Sep 17 00:00:00 2001
> -From: "Yann E. MORIN" <yann.morin.1998@free.fr>
> -Date: Tue, 26 Sep 2023 20:31:17 +0200
> -Subject: [PATCH] src/egl_gbm_render_surface: properly fallback to surface with
> - no modifier
> -
> -In 869fa7fcfbeb, we added a fallback to be able to create an EGL sruface
> -when the driver do not support modifiers, like the llvmpipe software
> -renderer (or like some proprietary drivers, like the MALI ones), as
> -reported in #269 [0].
> -
> -However, in c6537673c9b6, there was a big overhaul of renderer
> -infrastructure. That commit lost the with-modifiers code path and only
> -kept the without-modifiers fallback one (i.e. it only kept the call to
> -gbm_surface_create(), not to gbm_surface_create_with_modifiers()).
> -
> -Then in b0d09f5032a4, the with-modifier code path was re-instated, but
> -in a way that made it exclusive with the without-modifiers one. That is,
> -the without-modifiers code path was not a fallback to when the other
> -failed.
> -
> -Re-instate the fallback mechanism as intiially implemented.
> -
> -[0] https://github.com/ardera/flutter-pi/issues/269
> -
> -Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> -Upstream: https://github.com/ardera/flutter-pi/pull/367
> ----
> - src/egl_gbm_render_surface.c | 6 ++++--
> - 1 file changed, 4 insertions(+), 2 deletions(-)
> -
> -diff --git a/src/egl_gbm_render_surface.c b/src/egl_gbm_render_surface.c
> -index ce9e5e7..8a58667 100644
> ---- a/src/egl_gbm_render_surface.c
> -+++ b/src/egl_gbm_render_surface.c
> -@@ -146,6 +146,7 @@ static int egl_gbm_render_surface_init(
> -     }
> - #endif
> - 
> -+    gbm_surface = NULL;
> -     if (allowed_modifiers != NULL) {
> -         gbm_surface = gbm_surface_create_with_modifiers(
> -             gbm_device,
> -@@ -158,9 +159,10 @@ static int egl_gbm_render_surface_init(
> -         if (gbm_surface == NULL) {
> -             ok = errno;
> -             LOG_ERROR("Couldn't create GBM surface for rendering. gbm_surface_create_with_modifiers: %s\n", strerror(ok));
> --            return ok;
> -+            LOG_ERROR("Will retry without modifiers\n");
> -         }
> --    } else {
> -+    }
> -+    if (gbm_surface == NULL) {
> -         gbm_surface = gbm_surface_create(
> -             gbm_device,
> -             size.x,
> --- 
> -2.25.1
> -
> diff --git a/package/flutter-pi/flutter-pi.hash b/package/flutter-pi/flutter-pi.hash
> index f7148963a4..6c5371d18a 100644
> --- a/package/flutter-pi/flutter-pi.hash
> +++ b/package/flutter-pi/flutter-pi.hash
> @@ -1,3 +1,3 @@
>  # Locally calculated
> -sha256  e4af79c8f53c15913f52a83a221f099a2a750d023a0bc4560d0db6f15def79a2  flutter-pi-d62e84350d2869b3ec1dfb1af21bfe234c4b817f-br1.tar.gz
> +sha256  cf10ca9e26beea036ccf218e6a900de5f1f2000e00c03e7a48898c2a0c99f591  flutter-pi-f34d7bdbda713ba607b9625541ddfa314d9999a0-br1.tar.gz
>  sha256  b34df9d3e1b4e5d1ba70b1740ec74b69f1189b44efd0c96b898b074ef8db1c70  LICENSE
> diff --git a/package/flutter-pi/flutter-pi.mk b/package/flutter-pi/flutter-pi.mk
> index 27f140c177..4ec89bdfad 100644
> --- a/package/flutter-pi/flutter-pi.mk
> +++ b/package/flutter-pi/flutter-pi.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
>  
> -FLUTTER_PI_VERSION = d62e84350d2869b3ec1dfb1af21bfe234c4b817f
> +FLUTTER_PI_VERSION = f34d7bdbda713ba607b9625541ddfa314d9999a0
>  FLUTTER_PI_SITE = https://github.com/ardera/flutter-pi.git
>  FLUTTER_PI_SITE_METHOD = git
>  FLUTTER_PI_LICENSE = MIT
> @@ -27,6 +27,7 @@ FLUTTER_PI_CONF_OPTS = \
>  	-DENABLE_VULKAN=OFF \
>  	-DFILESYSTEM_LAYOUT=meta-flutter \
>  	-DLINT_EGL_HEADERS=OFF \
> +	-DBUILD_CHARSET_CONVERTER_PLUGIN=OFF \
>  	-DTRY_BUILD_GSTREAMER_AUDIO_PLAYER_PLUGIN=OFF \
>  	-DTRY_BUILD_GSTREAMER_VIDEO_PLAYER_PLUGIN=OFF \
>  	-DTRY_ENABLE_OPENGL=OFF \
> -- 
> 2.43.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v3 06/11] package/flutter-pi: add the charset converter plugin as a menuconfig option

[Adam Duskett]

Commit 6a28738 introduces the charset_converter, which is a platform-side
implementation of the charset_converter plugin found here:
https://pub.dev/packages/charset_converter

The charset_converter plugin does the following:
```
Encode and decode charsets using platform built-in converter.
This plugin saves app package size as you don't need external charset maps or
whole libraries like iconv. This package doesn't even contain any Dart
dependencies. However, this comes with the dependency on the platform.
```

  - Remove -DBUILD_CHARSET_CONVERTER_PLUGIN=OFF as the default in
    FLUTTER_PI_CONF_OPTS.

  - Add a new Menuconfig option BR2_PACKAGE_FLUTTER_PI_CHARSET_CONVERTER_PLUGIN
    with a brief description about the new plugin and a link to the plugin that
    provides a full explination.

  - Add logic around the BR2_PACKAGE_FLUTTER_PI_CHARSET_CONVERTER_PLUGIN option
    to enable or disable the plugin if selected or not.

Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
 package/flutter-pi/Config.in     | 7 +++++++
 package/flutter-pi/flutter-pi.mk | 7 ++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/package/flutter-pi/Config.in b/package/flutter-pi/Config.in
index ecebfad89b..45b6b4faef 100644
--- a/package/flutter-pi/Config.in
+++ b/package/flutter-pi/Config.in
@@ -23,6 +23,13 @@ if BR2_PACKAGE_FLUTTER_PI
 
 comment "plugins"
 
+config BR2_PACKAGE_FLUTTER_PI_CHARSET_CONVERTER_PLUGIN
+	bool "charset converter"
+	help
+	  Adds platform-side implementation of charset_converter plugin.
+
+	  See: https://pub.dev/packages/charset_converter
+
 config BR2_PACKAGE_FLUTTER_PI_GSTREAMER_AUDIO_PLAYER_PLUGIN
 	bool "gstreamer audio player"
 	depends on BR2_PACKAGE_HAS_LIBGLES
diff --git a/package/flutter-pi/flutter-pi.mk b/package/flutter-pi/flutter-pi.mk
index 4ec89bdfad..ab640d704a 100644
--- a/package/flutter-pi/flutter-pi.mk
+++ b/package/flutter-pi/flutter-pi.mk
@@ -27,7 +27,6 @@ FLUTTER_PI_CONF_OPTS = \
 	-DENABLE_VULKAN=OFF \
 	-DFILESYSTEM_LAYOUT=meta-flutter \
 	-DLINT_EGL_HEADERS=OFF \
-	-DBUILD_CHARSET_CONVERTER_PLUGIN=OFF \
 	-DTRY_BUILD_GSTREAMER_AUDIO_PLAYER_PLUGIN=OFF \
 	-DTRY_BUILD_GSTREAMER_VIDEO_PLAYER_PLUGIN=OFF \
 	-DTRY_ENABLE_OPENGL=OFF \
@@ -43,6 +42,12 @@ else
 FLUTTER_PI_CONF_OPTS += -DLTO=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_FLUTTER_PI_CHARSET_CONVERTER_PLUGIN),y)
+FLUTTER_PI_CONF_OPTS += -DBUILD_CHARSET_CONVERTER_PLUGIN=ON
+else
+FLUTTER_PI_CONF_OPTS += -DBUILD_CHARSET_CONVERTER_PLUGIN=OFF
+endif
+
 ifeq ($(BR2_PACKAGE_FLUTTER_PI_GSTREAMER_AUDIO_PLAYER_PLUGIN),y)
 FLUTTER_PI_DEPENDENCIES += gstreamer1 gst1-plugins-base
 FLUTTER_PI_CONF_OPTS += -DBUILD_GSTREAMER_AUDIO_PLAYER_PLUGIN=ON
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v3 06/11] package/flutter-pi: add the charset converter plugin as a menuconfig option

[Yann E. MORIN]

Adam, All,

On 2024-01-02 16:59 -0700, Adam Duskett spake thusly:
> Commit 6a28738 introduces the charset_converter, which is a platform-side
> implementation of the charset_converter plugin found here:
> https://pub.dev/packages/charset_converter
> 
> The charset_converter plugin does the following:
> ```
> Encode and decode charsets using platform built-in converter.
> This plugin saves app package size as you don't need external charset maps or
> whole libraries like iconv. This package doesn't even contain any Dart
> dependencies. However, this comes with the dependency on the platform.
> ```

I moved the description to the help text, so that users have a bit more
details to decide whether to enable it or not.

>   - Remove -DBUILD_CHARSET_CONVERTER_PLUGIN=OFF as the default in
>     FLUTTER_PI_CONF_OPTS.
> 
>   - Add a new Menuconfig option BR2_PACKAGE_FLUTTER_PI_CHARSET_CONVERTER_PLUGIN
>     with a brief description about the new plugin and a link to the plugin that
>     provides a full explination.
> 
>   - Add logic around the BR2_PACKAGE_FLUTTER_PI_CHARSET_CONVERTER_PLUGIN option
>     to enable or disable the plugin if selected or not.

This commit log is otherwise just descriptive of the change, not
explanatory, but there's not much to explain, and the title text (which
I slightly reworded) says it all, so that's fine to have  mostly empty
commit log sometimes. ;-)

> Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/flutter-pi/Config.in     | 7 +++++++
>  package/flutter-pi/flutter-pi.mk | 7 ++++++-
>  2 files changed, 13 insertions(+), 1 deletion(-)
> 
> diff --git a/package/flutter-pi/Config.in b/package/flutter-pi/Config.in
> index ecebfad89b..45b6b4faef 100644
> --- a/package/flutter-pi/Config.in
> +++ b/package/flutter-pi/Config.in
> @@ -23,6 +23,13 @@ if BR2_PACKAGE_FLUTTER_PI
>  
>  comment "plugins"
>  
> +config BR2_PACKAGE_FLUTTER_PI_CHARSET_CONVERTER_PLUGIN
> +	bool "charset converter"
> +	help
> +	  Adds platform-side implementation of charset_converter plugin.
> +
> +	  See: https://pub.dev/packages/charset_converter
> +
>  config BR2_PACKAGE_FLUTTER_PI_GSTREAMER_AUDIO_PLAYER_PLUGIN
>  	bool "gstreamer audio player"
>  	depends on BR2_PACKAGE_HAS_LIBGLES
> diff --git a/package/flutter-pi/flutter-pi.mk b/package/flutter-pi/flutter-pi.mk
> index 4ec89bdfad..ab640d704a 100644
> --- a/package/flutter-pi/flutter-pi.mk
> +++ b/package/flutter-pi/flutter-pi.mk
> @@ -27,7 +27,6 @@ FLUTTER_PI_CONF_OPTS = \
>  	-DENABLE_VULKAN=OFF \
>  	-DFILESYSTEM_LAYOUT=meta-flutter \
>  	-DLINT_EGL_HEADERS=OFF \
> -	-DBUILD_CHARSET_CONVERTER_PLUGIN=OFF \
>  	-DTRY_BUILD_GSTREAMER_AUDIO_PLAYER_PLUGIN=OFF \
>  	-DTRY_BUILD_GSTREAMER_VIDEO_PLAYER_PLUGIN=OFF \
>  	-DTRY_ENABLE_OPENGL=OFF \
> @@ -43,6 +42,12 @@ else
>  FLUTTER_PI_CONF_OPTS += -DLTO=OFF
>  endif
>  
> +ifeq ($(BR2_PACKAGE_FLUTTER_PI_CHARSET_CONVERTER_PLUGIN),y)
> +FLUTTER_PI_CONF_OPTS += -DBUILD_CHARSET_CONVERTER_PLUGIN=ON
> +else
> +FLUTTER_PI_CONF_OPTS += -DBUILD_CHARSET_CONVERTER_PLUGIN=OFF
> +endif
> +
>  ifeq ($(BR2_PACKAGE_FLUTTER_PI_GSTREAMER_AUDIO_PLAYER_PLUGIN),y)
>  FLUTTER_PI_DEPENDENCIES += gstreamer1 gst1-plugins-base
>  FLUTTER_PI_CONF_OPTS += -DBUILD_GSTREAMER_AUDIO_PLAYER_PLUGIN=ON
> -- 
> 2.43.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v3 07/11] package/flutter-engine: Add profile runtime mode selection

[Adam Duskett]

Buildroot only offers two possible runtime modes for Flutter that are
automatically selected based on what the user has selected:
  - debug if BR2_ENABLE_RUNTIME_DEBUG is enabled.
  - release if BR2_ENABLE_RUNTIME_DEBUG is not enabled.

However, Flutter also offers the profile runtime mode option.

From https://docs.flutter.dev/testing/build-modes:

```
"Use profile mode when you want to analyze performance."

What is profile mode?
Some debugging ability is maintained in profile mode, which is enough to
profile your app's performance. Profile mode is turned off on the emulator
and simulator because their behavior does not represent actual performance.
```

As Flutter projects can be heavy and consume many resources, it is necessary
to allow users developing a Flutter application to profile their application
during development.

This patch introduces a new choice: FLUTTER_ENGINE_RUNTIME_MODE_PROFILE.
If unselected, the global option BR2_ENABLE_RUNTIME_DEBUG continues to
determine whether to build Flutter in release or debug mode. This new option
may confuse some users who wonder where the release and debug options are, so
the help menu section under the FLUTTER_ENGINE_RUNTIME_MODE_PROFILE option
explains that the global BR2_ENABLE_RUNTIME_DEBUG option controls the debug
and release modes.

Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
 package/flutter-engine/Config.in         | 25 ++++++++++++++++++++++++
 package/flutter-engine/flutter-engine.mk |  4 +++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/package/flutter-engine/Config.in b/package/flutter-engine/Config.in
index 2ec5b90ffd..3c92e40f74 100644
--- a/package/flutter-engine/Config.in
+++ b/package/flutter-engine/Config.in
@@ -39,6 +39,31 @@ config BR2_PACKAGE_FLUTTER_ENGINE
 
 	  https://github.com/flutter/engine
 
+if BR2_PACKAGE_FLUTTER_ENGINE
+
+config FLUTTER_ENGINE_RUNTIME_MODE_PROFILE
+	bool "enable profiling"
+	help
+	  Some debugging ability is maintained—enough to profile your
+	  apps performance. Profile mode is disabled on the emulator
+	  and simulator, because their behavior is not representative
+	  of real performance. Profile mode is similar to release mode,
+	  with the following differences:
+
+	  - Some service extensions, such as the one that enables the
+	    performance overlay, are enabled.
+
+	  - Tracing is enabled, and tools supporting source-level
+	    debugging (such as DevTools) can connect to the process.
+
+	  If this option is left unselected, the global option
+	  BR2_ENABLE_RUNTIME_DEBUG determines whether to build Flutter
+	  in release or debug mode.
+
+	  https://docs.flutter.dev/testing/build-modes#profile
+
+endif
+
 comment "flutter-engine needs an OpenGL or OpenGLES backend"
 	depends on BR2_PACKAGE_FLUTTER_ENGINE_ARCH_SUPPORTS
 	depends on !BR2_PACKAGE_HAS_LIBGL && !BR2_PACKAGE_HAS_LIBGLES
diff --git a/package/flutter-engine/flutter-engine.mk b/package/flutter-engine/flutter-engine.mk
index c3ac144f2a..e972612097 100644
--- a/package/flutter-engine/flutter-engine.mk
+++ b/package/flutter-engine/flutter-engine.mk
@@ -52,7 +52,9 @@ FLUTTER_ENGINE_TARGET_ARCH = x64
 FLUTTER_ENGINE_TARGET_TRIPPLE = x86_64-unknown-linux-gnu
 endif
 
-ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y)
+ifeq ($(FLUTTER_ENGINE_RUNTIME_MODE_PROFILE),y)
+FLUTTER_ENGINE_RUNTIME_MODE=profile
+else ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y)
 FLUTTER_ENGINE_RUNTIME_MODE=debug
 else
 FLUTTER_ENGINE_RUNTIME_MODE=release
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v3 07/11] package/flutter-engine: Add profile runtime mode selection

[Yann E. MORIN]

Adam, All,

On 2024-01-02 16:59 -0700, Adam Duskett spake thusly:
> Buildroot only offers two possible runtime modes for Flutter that are
> automatically selected based on what the user has selected:
>   - debug if BR2_ENABLE_RUNTIME_DEBUG is enabled.
>   - release if BR2_ENABLE_RUNTIME_DEBUG is not enabled.
> 
> However, Flutter also offers the profile runtime mode option.
> 
> From https://docs.flutter.dev/testing/build-modes:
> 
> ```
> "Use profile mode when you want to analyze performance."
> 
> What is profile mode?
> Some debugging ability is maintained in profile mode, which is enough to
> profile your app's performance. Profile mode is turned off on the emulator
> and simulator because their behavior does not represent actual performance.
> ```
> 
> As Flutter projects can be heavy and consume many resources, it is necessary
> to allow users developing a Flutter application to profile their application
> during development.
> 
> This patch introduces a new choice: FLUTTER_ENGINE_RUNTIME_MODE_PROFILE.
> If unselected, the global option BR2_ENABLE_RUNTIME_DEBUG continues to
> determine whether to build Flutter in release or debug mode. This new option
> may confuse some users who wonder where the release and debug options are, so
> the help menu section under the FLUTTER_ENGINE_RUNTIME_MODE_PROFILE option
> explains that the global BR2_ENABLE_RUNTIME_DEBUG option controls the debug
> and release modes.

Thanks, this is a pretty good commit log! It has all the nedded
information: the current state, the issue that causes, how you fixed it,
and some important note about lifting an ambiguity for the user. Thanks!

> Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/flutter-engine/Config.in         | 25 ++++++++++++++++++++++++
>  package/flutter-engine/flutter-engine.mk |  4 +++-
>  2 files changed, 28 insertions(+), 1 deletion(-)
> 
> diff --git a/package/flutter-engine/Config.in b/package/flutter-engine/Config.in
> index 2ec5b90ffd..3c92e40f74 100644
> --- a/package/flutter-engine/Config.in
> +++ b/package/flutter-engine/Config.in
> @@ -39,6 +39,31 @@ config BR2_PACKAGE_FLUTTER_ENGINE
>  
>  	  https://github.com/flutter/engine
>  
> +if BR2_PACKAGE_FLUTTER_ENGINE
> +
> +config FLUTTER_ENGINE_RUNTIME_MODE_PROFILE
> +	bool "enable profiling"
> +	help
> +	  Some debugging ability is maintained—enough to profile your
> +	  apps performance. Profile mode is disabled on the emulator
> +	  and simulator, because their behavior is not representative
> +	  of real performance. Profile mode is similar to release mode,
> +	  with the following differences:
> +
> +	  - Some service extensions, such as the one that enables the
> +	    performance overlay, are enabled.
> +
> +	  - Tracing is enabled, and tools supporting source-level
> +	    debugging (such as DevTools) can connect to the process.
> +
> +	  If this option is left unselected, the global option
> +	  BR2_ENABLE_RUNTIME_DEBUG determines whether to build Flutter
> +	  in release or debug mode.
> +
> +	  https://docs.flutter.dev/testing/build-modes#profile
> +
> +endif
> +
>  comment "flutter-engine needs an OpenGL or OpenGLES backend"
>  	depends on BR2_PACKAGE_FLUTTER_ENGINE_ARCH_SUPPORTS
>  	depends on !BR2_PACKAGE_HAS_LIBGL && !BR2_PACKAGE_HAS_LIBGLES
> diff --git a/package/flutter-engine/flutter-engine.mk b/package/flutter-engine/flutter-engine.mk
> index c3ac144f2a..e972612097 100644
> --- a/package/flutter-engine/flutter-engine.mk
> +++ b/package/flutter-engine/flutter-engine.mk
> @@ -52,7 +52,9 @@ FLUTTER_ENGINE_TARGET_ARCH = x64
>  FLUTTER_ENGINE_TARGET_TRIPPLE = x86_64-unknown-linux-gnu
>  endif
>  
> -ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y)
> +ifeq ($(FLUTTER_ENGINE_RUNTIME_MODE_PROFILE),y)
> +FLUTTER_ENGINE_RUNTIME_MODE=profile
> +else ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y)
>  FLUTTER_ENGINE_RUNTIME_MODE=debug
>  else
>  FLUTTER_ENGINE_RUNTIME_MODE=release
> -- 
> 2.43.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v3 08/11] package/flutter-sdk-bin: add dart arguments for different runtime modes

[Adam Duskett]

Now that profile mode is an option for the flutter-engine package, the logic
in package/flutter-sdk-bin/flutter-sdk-bin.mk is no longer sufficient.

Add an ifeq statement for FLUTTER_ENGINE_RUNTIME_MODE_PROFILE and set the
following logic, borrowed from
https://github.com/meta-flutter/meta-flutter/blob/kirkstone/conf/include/flutter-app.inc#L239

```
HOST_FLUTTER_SDK_BIN_PROFILE_FLAGS = --track-widget-creation
HOST_FLUTTER_SDK_BIN_SDK_VM_PROFILE = true
```

The FLUTTER_ENGINE_RUNTIME_MODE_PROFILE also sets
HOST_FLUTTER_SDK_BIN_SDK_PRODUCT to false, and the
HOST_FLUTTER_SDK_BIN_SDK_ROOT to
$(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/common/flutter_patched_sdk. Which is the
same as Debug mode.

The -Ddart.vm.profile option is no longer hard coded to false and is set to
the value of the HOST_FLUTTER_SDK_BIN_SDK_VM_PROFILE variable.

Finally, add the following new variables to HOST_FLUTTER_SDK_BIN_DART_ARGS:
  - HOST_FLUTTER_SDK_BIN_DEBUG_FLAGS
  - HOST_FLUTTER_SDK_BIN_PROFILE_FLAGS

Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
 package/flutter-sdk-bin/flutter-sdk-bin.mk | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.mk b/package/flutter-sdk-bin/flutter-sdk-bin.mk
index a28cf645f3..e7fd09cb56 100644
--- a/package/flutter-sdk-bin/flutter-sdk-bin.mk
+++ b/package/flutter-sdk-bin/flutter-sdk-bin.mk
@@ -55,13 +55,20 @@ define HOST_FLUTTER_SDK_BIN_INSTALL_CMDS
 endef
 
 ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y)
-HOST_FLUTTER_SDK_BIN_SDK_ROOT = \
-	$(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/common/flutter_patched_sdk
+HOST_FLUTTER_SDK_BIN_DEBUG_FLAGS = --enable-asserts
 HOST_FLUTTER_SDK_BIN_SDK_PRODUCT = false
+HOST_FLUTTER_SDK_BIN_SDK_ROOT = $(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/common/flutter_patched_sdk
+else ifeq ($(FLUTTER_ENGINE_RUNTIME_MODE_PROFILE),y)
+HOST_FLUTTER_SDK_BIN_PROFILE_FLAGS = --track-widget-creation
+HOST_FLUTTER_SDK_BIN_SDK_PRODUCT = false
+HOST_FLUTTER_SDK_BIN_SDK_ROOT = $(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/common/flutter_patched_sdk
+HOST_FLUTTER_SDK_BIN_SDK_VM_PROFILE = true
 else
-HOST_FLUTTER_SDK_BIN_SDK_ROOT = \
-	$(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/common/flutter_patched_sdk_product
+HOST_FLUTTER_SDK_BIN_DEBUG_FLAGS =
+HOST_FLUTTER_SDK_BIN_PROFILE_FLAGS =
 HOST_FLUTTER_SDK_BIN_SDK_PRODUCT = true
+HOST_FLUTTER_SDK_BIN_SDK_ROOT = $(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/common/flutter_patched_sdk_product
+HOST_FLUTTER_SDK_BIN_SDK_VM_PROFILE = false
 endif
 
 # The Order matters.Taken from:
@@ -73,8 +80,10 @@ HOST_FLUTTER_SDK_BIN_DART_ARGS = \
 	--sdk-root $(HOST_FLUTTER_SDK_BIN_SDK_ROOT) \
 	--target=flutter \
 	--no-print-incremental-dependencies \
-	-Ddart.vm.profile=false \
+	-Ddart.vm.profile=$(HOST_FLUTTER_SDK_BIN_SDK_VM_PROFILE) \
 	-Ddart.vm.product=$(HOST_FLUTTER_SDK_BIN_SDK_PRODUCT) \
+	$(HOST_FLUTTER_SDK_BIN_DEBUG_FLAGS) \
+	$(HOST_FLUTTER_SDK_BIN_PROFILE_FLAGS) \
 	--aot \
 	--tfa \
 	--target-os linux \
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v3 08/11] package/flutter-sdk-bin: add dart arguments for different runtime modes

[Yann E. MORIN]

ADam, All,

On 2024-01-02 16:59 -0700, Adam Duskett spake thusly:
> Now that profile mode is an option for the flutter-engine package, the logic
> in package/flutter-sdk-bin/flutter-sdk-bin.mk is no longer sufficient.
> 
> Add an ifeq statement for FLUTTER_ENGINE_RUNTIME_MODE_PROFILE and set the
> following logic, borrowed from
> https://github.com/meta-flutter/meta-flutter/blob/kirkstone/conf/include/flutter-app.inc#L239
> 
> ```
> HOST_FLUTTER_SDK_BIN_PROFILE_FLAGS = --track-widget-creation
> HOST_FLUTTER_SDK_BIN_SDK_VM_PROFILE = true
> ```
> 
> The FLUTTER_ENGINE_RUNTIME_MODE_PROFILE also sets
> HOST_FLUTTER_SDK_BIN_SDK_PRODUCT to false, and the
> HOST_FLUTTER_SDK_BIN_SDK_ROOT to
> $(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/common/flutter_patched_sdk. Which is the
> same as Debug mode.
> 
> The -Ddart.vm.profile option is no longer hard coded to false and is set to
> the value of the HOST_FLUTTER_SDK_BIN_SDK_VM_PROFILE variable.
> 
> Finally, add the following new variables to HOST_FLUTTER_SDK_BIN_DART_ARGS:
>   - HOST_FLUTTER_SDK_BIN_DEBUG_FLAGS
>   - HOST_FLUTTER_SDK_BIN_PROFILE_FLAGS
> 
> Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
> ---
>  package/flutter-sdk-bin/flutter-sdk-bin.mk | 19 ++++++++++++++-----
>  1 file changed, 14 insertions(+), 5 deletions(-)
> 
> diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.mk b/package/flutter-sdk-bin/flutter-sdk-bin.mk
> index a28cf645f3..e7fd09cb56 100644
> --- a/package/flutter-sdk-bin/flutter-sdk-bin.mk
> +++ b/package/flutter-sdk-bin/flutter-sdk-bin.mk
> @@ -55,13 +55,20 @@ define HOST_FLUTTER_SDK_BIN_INSTALL_CMDS
>  endef
>  
>  ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y)
> -HOST_FLUTTER_SDK_BIN_SDK_ROOT = \
> -	$(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/common/flutter_patched_sdk
> +HOST_FLUTTER_SDK_BIN_DEBUG_FLAGS = --enable-asserts
>  HOST_FLUTTER_SDK_BIN_SDK_PRODUCT = false
> +HOST_FLUTTER_SDK_BIN_SDK_ROOT = $(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/common/flutter_patched_sdk
> +else ifeq ($(FLUTTER_ENGINE_RUNTIME_MODE_PROFILE),y)
> +HOST_FLUTTER_SDK_BIN_PROFILE_FLAGS = --track-widget-creation
> +HOST_FLUTTER_SDK_BIN_SDK_PRODUCT = false
> +HOST_FLUTTER_SDK_BIN_SDK_ROOT = $(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/common/flutter_patched_sdk
> +HOST_FLUTTER_SDK_BIN_SDK_VM_PROFILE = true
>  else
> -HOST_FLUTTER_SDK_BIN_SDK_ROOT = \
> -	$(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/common/flutter_patched_sdk_product
> +HOST_FLUTTER_SDK_BIN_DEBUG_FLAGS =
> +HOST_FLUTTER_SDK_BIN_PROFILE_FLAGS =
>  HOST_FLUTTER_SDK_BIN_SDK_PRODUCT = true
> +HOST_FLUTTER_SDK_BIN_SDK_ROOT = $(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/common/flutter_patched_sdk_product
> +HOST_FLUTTER_SDK_BIN_SDK_VM_PROFILE = false
>  endif

This if-elif-else block is not in the same order as the one to enable
profiling in flutter-engine. Here you have: debug, profiling, release,
while in flutter-engine the order is: profiling, debug, release.

Shouldn't the two match, i.e. should we swap the debug and profiling
blocks here?

If so, I can do so when applying.

(Also, the commit log is descriptive, not explanatory, but I can trimmed
it to the needed info when applying, too).

Regards,
Yann E. MORIN.

>  # The Order matters.Taken from:
> @@ -73,8 +80,10 @@ HOST_FLUTTER_SDK_BIN_DART_ARGS = \
>  	--sdk-root $(HOST_FLUTTER_SDK_BIN_SDK_ROOT) \
>  	--target=flutter \
>  	--no-print-incremental-dependencies \
> -	-Ddart.vm.profile=false \
> +	-Ddart.vm.profile=$(HOST_FLUTTER_SDK_BIN_SDK_VM_PROFILE) \
>  	-Ddart.vm.product=$(HOST_FLUTTER_SDK_BIN_SDK_PRODUCT) \
> +	$(HOST_FLUTTER_SDK_BIN_DEBUG_FLAGS) \
> +	$(HOST_FLUTTER_SDK_BIN_PROFILE_FLAGS) \
>  	--aot \
>  	--tfa \
>  	--target-os linux \
> -- 
> 2.43.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v3 08/11] package/flutter-sdk-bin: add dart arguments for different runtime modes

[Adam Duskett]

Yann;


On Thu, Jan 11, 2024 at 11:49 AM Yann E. MORIN <yann.morin.1998@free.fr> wrote:
>
> ADam, All,
>
> On 2024-01-02 16:59 -0700, Adam Duskett spake thusly:
> > Now that profile mode is an option for the flutter-engine package, the logic
> > in package/flutter-sdk-bin/flutter-sdk-bin.mk is no longer sufficient.
> >
> > Add an ifeq statement for FLUTTER_ENGINE_RUNTIME_MODE_PROFILE and set the
> > following logic, borrowed from
> > https://github.com/meta-flutter/meta-flutter/blob/kirkstone/conf/include/flutter-app.inc#L239
> >
> > ```
> > HOST_FLUTTER_SDK_BIN_PROFILE_FLAGS = --track-widget-creation
> > HOST_FLUTTER_SDK_BIN_SDK_VM_PROFILE = true
> > ```
> >
> > The FLUTTER_ENGINE_RUNTIME_MODE_PROFILE also sets
> > HOST_FLUTTER_SDK_BIN_SDK_PRODUCT to false, and the
> > HOST_FLUTTER_SDK_BIN_SDK_ROOT to
> > $(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/common/flutter_patched_sdk. Which is the
> > same as Debug mode.
> >
> > The -Ddart.vm.profile option is no longer hard coded to false and is set to
> > the value of the HOST_FLUTTER_SDK_BIN_SDK_VM_PROFILE variable.
> >
> > Finally, add the following new variables to HOST_FLUTTER_SDK_BIN_DART_ARGS:
> >   - HOST_FLUTTER_SDK_BIN_DEBUG_FLAGS
> >   - HOST_FLUTTER_SDK_BIN_PROFILE_FLAGS
> >
> > Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
> > ---
> >  package/flutter-sdk-bin/flutter-sdk-bin.mk | 19 ++++++++++++++-----
> >  1 file changed, 14 insertions(+), 5 deletions(-)
> >
> > diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.mk b/package/flutter-sdk-bin/flutter-sdk-bin.mk
> > index a28cf645f3..e7fd09cb56 100644
> > --- a/package/flutter-sdk-bin/flutter-sdk-bin.mk
> > +++ b/package/flutter-sdk-bin/flutter-sdk-bin.mk
> > @@ -55,13 +55,20 @@ define HOST_FLUTTER_SDK_BIN_INSTALL_CMDS
> >  endef
> >
> >  ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y)
> > -HOST_FLUTTER_SDK_BIN_SDK_ROOT = \
> > -     $(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/common/flutter_patched_sdk
> > +HOST_FLUTTER_SDK_BIN_DEBUG_FLAGS = --enable-asserts
> >  HOST_FLUTTER_SDK_BIN_SDK_PRODUCT = false
> > +HOST_FLUTTER_SDK_BIN_SDK_ROOT = $(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/common/flutter_patched_sdk
> > +else ifeq ($(FLUTTER_ENGINE_RUNTIME_MODE_PROFILE),y)
> > +HOST_FLUTTER_SDK_BIN_PROFILE_FLAGS = --track-widget-creation
> > +HOST_FLUTTER_SDK_BIN_SDK_PRODUCT = false
> > +HOST_FLUTTER_SDK_BIN_SDK_ROOT = $(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/common/flutter_patched_sdk
> > +HOST_FLUTTER_SDK_BIN_SDK_VM_PROFILE = true
> >  else
> > -HOST_FLUTTER_SDK_BIN_SDK_ROOT = \
> > -     $(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/common/flutter_patched_sdk_product
> > +HOST_FLUTTER_SDK_BIN_DEBUG_FLAGS =
> > +HOST_FLUTTER_SDK_BIN_PROFILE_FLAGS =
> >  HOST_FLUTTER_SDK_BIN_SDK_PRODUCT = true
> > +HOST_FLUTTER_SDK_BIN_SDK_ROOT = $(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/common/flutter_patched_sdk_product
> > +HOST_FLUTTER_SDK_BIN_SDK_VM_PROFILE = false
> >  endif
>
> This if-elif-else block is not in the same order as the one to enable
> profiling in flutter-engine. Here you have: debug, profiling, release,
> while in flutter-engine the order is: profiling, debug, release.
>
> Shouldn't the two match, i.e. should we swap the debug and profiling
> blocks here?
>
> If so, I can do so when applying.
>
> (Also, the commit log is descriptive, not explanatory, but I can trimmed
> it to the needed info when applying, too).
>
No worries if you re-arrange the if-elif-else block to match what is
in flutter-engine. The outcome is the same.
Regards,
Adam

> Regards,
> Yann E. MORIN.
>
> >  # The Order matters.Taken from:
> > @@ -73,8 +80,10 @@ HOST_FLUTTER_SDK_BIN_DART_ARGS = \
> >       --sdk-root $(HOST_FLUTTER_SDK_BIN_SDK_ROOT) \
> >       --target=flutter \
> >       --no-print-incremental-dependencies \
> > -     -Ddart.vm.profile=false \
> > +     -Ddart.vm.profile=$(HOST_FLUTTER_SDK_BIN_SDK_VM_PROFILE) \
> >       -Ddart.vm.product=$(HOST_FLUTTER_SDK_BIN_SDK_PRODUCT) \
> > +     $(HOST_FLUTTER_SDK_BIN_DEBUG_FLAGS) \
> > +     $(HOST_FLUTTER_SDK_BIN_PROFILE_FLAGS) \
> >       --aot \
> >       --tfa \
> >       --target-os linux \
> > --
> > 2.43.0
> >
> > _______________________________________________
> > buildroot mailing list
> > buildroot@buildroot.org
> > https://lists.buildroot.org/mailman/listinfo/buildroot
>
> --
> .-----------------.--------------------.------------------.--------------------.
> |  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
> | +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
> '------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v3 08/11] package/flutter-sdk-bin: add dart arguments for different runtime modes

[Yann E. MORIN]

Adam, All,

On 2024-01-11 12:40 -0700, Adam Duskett spake thusly:
> On Thu, Jan 11, 2024 at 11:49 AM Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> > On 2024-01-02 16:59 -0700, Adam Duskett spake thusly:
> > > Now that profile mode is an option for the flutter-engine package, the logic
> > > in package/flutter-sdk-bin/flutter-sdk-bin.mk is no longer sufficient.
[--SNIP--]
> > >  ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y)
> > > -HOST_FLUTTER_SDK_BIN_SDK_ROOT = \
> > > -     $(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/common/flutter_patched_sdk
> > > +HOST_FLUTTER_SDK_BIN_DEBUG_FLAGS = --enable-asserts
> > >  HOST_FLUTTER_SDK_BIN_SDK_PRODUCT = false
> > > +HOST_FLUTTER_SDK_BIN_SDK_ROOT = $(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/common/flutter_patched_sdk
> > > +else ifeq ($(FLUTTER_ENGINE_RUNTIME_MODE_PROFILE),y)
> > > +HOST_FLUTTER_SDK_BIN_PROFILE_FLAGS = --track-widget-creation
> > > +HOST_FLUTTER_SDK_BIN_SDK_PRODUCT = false
> > > +HOST_FLUTTER_SDK_BIN_SDK_ROOT = $(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/common/flutter_patched_sdk
> > > +HOST_FLUTTER_SDK_BIN_SDK_VM_PROFILE = true
> > >  else
> > > -HOST_FLUTTER_SDK_BIN_SDK_ROOT = \
> > > -     $(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/common/flutter_patched_sdk_product
> > > +HOST_FLUTTER_SDK_BIN_DEBUG_FLAGS =
> > > +HOST_FLUTTER_SDK_BIN_PROFILE_FLAGS =
> > >  HOST_FLUTTER_SDK_BIN_SDK_PRODUCT = true
> > > +HOST_FLUTTER_SDK_BIN_SDK_ROOT = $(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/common/flutter_patched_sdk_product
> > > +HOST_FLUTTER_SDK_BIN_SDK_VM_PROFILE = false
> > >  endif
> > This if-elif-else block is not in the same order as the one to enable
> > profiling in flutter-engine. Here you have: debug, profiling, release,
> > while in flutter-engine the order is: profiling, debug, release.
> >
> > Shouldn't the two match, i.e. should we swap the debug and profiling
> > blocks here?
> No worries if you re-arrange the if-elif-else block to match what is
> in flutter-engine. The outcome is the same.

As we discussed on IRC, the outcome is not the same. Indeed,
FLUTTER_ENGINE_RUNTIME_MODE_PROFILE is supposed to win over
BR2_ENABLE_RUNTIME_DEBUG, so that when both debug and profiling are
enabled, we do profile, not debug.

And as concluded on IRC, I'll swap when applying.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v3 08/11] package/flutter-sdk-bin: add dart arguments for different runtime modes

[Yann E. MORIN]

Adam, All,

On 2024-01-02 16:59 -0700, Adam Duskett spake thusly:
> Now that profile mode is an option for the flutter-engine package, the logic
> in package/flutter-sdk-bin/flutter-sdk-bin.mk is no longer sufficient.
> 
> Add an ifeq statement for FLUTTER_ENGINE_RUNTIME_MODE_PROFILE and set the
> following logic, borrowed from
> https://github.com/meta-flutter/meta-flutter/blob/kirkstone/conf/include/flutter-app.inc#L239

This file no longer has 239 lines today (as of commit 86ab854), as it
seems it was exploded into a few files at least. So I changed the URL
to just point to the directory, not to a specific file and line.

> ```
> HOST_FLUTTER_SDK_BIN_PROFILE_FLAGS = --track-widget-creation
> HOST_FLUTTER_SDK_BIN_SDK_VM_PROFILE = true
> ```
> 
> The FLUTTER_ENGINE_RUNTIME_MODE_PROFILE also sets
> HOST_FLUTTER_SDK_BIN_SDK_PRODUCT to false, and the
> HOST_FLUTTER_SDK_BIN_SDK_ROOT to
> $(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/common/flutter_patched_sdk. Which is the
> same as Debug mode.
> 
> The -Ddart.vm.profile option is no longer hard coded to false and is set to
> the value of the HOST_FLUTTER_SDK_BIN_SDK_VM_PROFILE variable.
> 
> Finally, add the following new variables to HOST_FLUTTER_SDK_BIN_DART_ARGS:
>   - HOST_FLUTTER_SDK_BIN_DEBUG_FLAGS
>   - HOST_FLUTTER_SDK_BIN_PROFILE_FLAGS

This commit log is too descriptive, when we need explanations. I've
reworded and elided parts of it.

> Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
> ---
>  package/flutter-sdk-bin/flutter-sdk-bin.mk | 19 ++++++++++++++-----
>  1 file changed, 14 insertions(+), 5 deletions(-)
> 
> diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.mk b/package/flutter-sdk-bin/flutter-sdk-bin.mk
> index a28cf645f3..e7fd09cb56 100644
> --- a/package/flutter-sdk-bin/flutter-sdk-bin.mk
> +++ b/package/flutter-sdk-bin/flutter-sdk-bin.mk
> @@ -55,13 +55,20 @@ define HOST_FLUTTER_SDK_BIN_INSTALL_CMDS
>  endef
>  
>  ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y)
> -HOST_FLUTTER_SDK_BIN_SDK_ROOT = \
> -	$(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/common/flutter_patched_sdk
> +HOST_FLUTTER_SDK_BIN_DEBUG_FLAGS = --enable-asserts
>  HOST_FLUTTER_SDK_BIN_SDK_PRODUCT = false
> +HOST_FLUTTER_SDK_BIN_SDK_ROOT = $(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/common/flutter_patched_sdk

The debug block was not defining _SDK_VM_PROFILE, which would have
passed a -Ddart.vm.profile=  (i.e. nothing right of the equal sign).

I've added an assignment to =false.

> +else ifeq ($(FLUTTER_ENGINE_RUNTIME_MODE_PROFILE),y)
> +HOST_FLUTTER_SDK_BIN_PROFILE_FLAGS = --track-widget-creation
> +HOST_FLUTTER_SDK_BIN_SDK_PRODUCT = false
> +HOST_FLUTTER_SDK_BIN_SDK_ROOT = $(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/common/flutter_patched_sdk
> +HOST_FLUTTER_SDK_BIN_SDK_VM_PROFILE = true
>  else
> -HOST_FLUTTER_SDK_BIN_SDK_ROOT = \
> -	$(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/common/flutter_patched_sdk_product
> +HOST_FLUTTER_SDK_BIN_DEBUG_FLAGS =
> +HOST_FLUTTER_SDK_BIN_PROFILE_FLAGS =

No need to set variables to an empty string; unset variables in make
evealuate to the empty string (and notice how you did not set
_DEBUG_FLAGS in the profile bock, or _PROFILE_FLAGS in the debug block
either). I droipped that when applying.

>  HOST_FLUTTER_SDK_BIN_SDK_PRODUCT = true
> +HOST_FLUTTER_SDK_BIN_SDK_ROOT = $(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/common/flutter_patched_sdk_product
> +HOST_FLUTTER_SDK_BIN_SDK_VM_PROFILE = false
>  endif

As discussed elsewhere in the thread, I've also swapped the debug and
profiel cases, so that profile wins onver debug.

Applied to master with the above fixes, thanks.

Regards,
Yann E. MORIN.

>  # The Order matters.Taken from:
> @@ -73,8 +80,10 @@ HOST_FLUTTER_SDK_BIN_DART_ARGS = \
>  	--sdk-root $(HOST_FLUTTER_SDK_BIN_SDK_ROOT) \
>  	--target=flutter \
>  	--no-print-incremental-dependencies \
> -	-Ddart.vm.profile=false \
> +	-Ddart.vm.profile=$(HOST_FLUTTER_SDK_BIN_SDK_VM_PROFILE) \
>  	-Ddart.vm.product=$(HOST_FLUTTER_SDK_BIN_SDK_PRODUCT) \
> +	$(HOST_FLUTTER_SDK_BIN_DEBUG_FLAGS) \
> +	$(HOST_FLUTTER_SDK_BIN_PROFILE_FLAGS) \
>  	--aot \
>  	--tfa \
>  	--target-os linux \
> -- 
> 2.43.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v3 09/11] package/flutter-gallery: add a configure step

[Adam Duskett]

To make the next patch easier to understand, add a configure step to the
flutter-gallery.mk file. The `$(HOST_FLUTTER_SDK_BIN_FLUTTER) build bundle`
command is placed in the configure step because it generates several files
needed for the flutter_gen_snapshot tool to generate the target .so file.

Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
 package/flutter-gallery/flutter-gallery.mk | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/package/flutter-gallery/flutter-gallery.mk b/package/flutter-gallery/flutter-gallery.mk
index 57a476b1ab..50ddd9ffba 100644
--- a/package/flutter-gallery/flutter-gallery.mk
+++ b/package/flutter-gallery/flutter-gallery.mk
@@ -14,12 +14,17 @@ FLUTTER_GALLERY_DEPENDENCIES = \
 
 FLUTTER_GALLERY_INSTALL_DIR = $(TARGET_DIR)/usr/share/flutter/gallery/$(FLUTTER_ENGINE_RUNTIME_MODE)
 
-define FLUTTER_GALLERY_BUILD_CMDS
+define FLUTTER_GALLERY_CONFIGURE_CMDS
 	cd $(@D) && \
 		FLUTTER_RUNTIME_MODES=$(FLUTTER_ENGINE_RUNTIME_MODE) \
 		$(HOST_FLUTTER_SDK_BIN_FLUTTER) clean && \
-		$(HOST_FLUTTER_SDK_BIN_FLUTTER) packages get && \
-		$(HOST_FLUTTER_SDK_BIN_FLUTTER) build bundle && \
+		$(HOST_FLUTTER_SDK_BIN_FLUTTER) pub get && \
+		$(HOST_FLUTTER_SDK_BIN_FLUTTER) build bundle
+endef
+
+define FLUTTER_GALLERY_BUILD_CMDS
+	cd $(@D) && \
+		FLUTTER_RUNTIME_MODES=$(FLUTTER_ENGINE_RUNTIME_MODE) \
 		$(HOST_FLUTTER_SDK_BIN_DART_BIN) package:gallery/main.dart && \
 		$(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \
 			--deterministic \
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v3 10/11] package/flutter-gallery: clean up install_target_cmds

[Adam Duskett]

Remove and create the kernel_blob.bin file in the flutter_assets directory:

  When Flutter compiles the source code, it creates the kernel_blob.bin file,
  a Dart Kernel Bytecode of the application.

  If kernel_blob.bin exists inside the flutter_assets directory, then the
  application source code can be extracted with nothing more than apktool.
  Not only is this a security risk, it's also redundant and a waste of space.

  Removing the kernel_blob.bin file generated for flutter-gallery saves 86M!
  Because this package is a reference package, and some applications may check
  if the kernel_blob.bin file exists, we also touch a blank kernel_blob.bin
  file.

Do not use relative symlinks:
  Users may not install their applications in the
  /usr/share/flutter/${package_name} directory. Because this is a reference
  application, using exact symlinks to icudtl.dat and libflutter_engine.so
  is preferable.

Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
 package/flutter-gallery/flutter-gallery.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/flutter-gallery/flutter-gallery.mk b/package/flutter-gallery/flutter-gallery.mk
index 50ddd9ffba..81a679f985 100644
--- a/package/flutter-gallery/flutter-gallery.mk
+++ b/package/flutter-gallery/flutter-gallery.mk
@@ -40,10 +40,12 @@ define FLUTTER_GALLERY_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0755 $(@D)/libapp.so \
 		$(FLUTTER_GALLERY_INSTALL_DIR)/lib/libapp.so
 
-	ln -sf ../../../$(FLUTTER_ENGINE_RUNTIME_MODE)/data/icudtl.dat \
+	ln -sf /usr/share/flutter/$(FLUTTER_ENGINE_RUNTIME_MODE)/data/icudtl.dat \
 	$(FLUTTER_GALLERY_INSTALL_DIR)/data/
 
-	ln -sf ../../../../../lib/libflutter_engine.so $(FLUTTER_GALLERY_INSTALL_DIR)/lib/
+	ln -sf /usr/lib/libflutter_engine.so $(FLUTTER_GALLERY_INSTALL_DIR)/lib/
+	$(RM) $(FLUTTER_GALLERY_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin
+	touch $(FLUTTER_GALLERY_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin
 endef
 
 $(eval $(generic-package))
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v3 11/11] package/flutter-sdk-bin/Config.in.host: add pub-cache location option

[Adam Duskett]

When running the command "flutter pub get," the plugins are stored in the
pub-cache directory along with their sha256sum hashes. The default location of
the pub-cache directory is current $(HOST_DIR)/share/flutter/sdk/.pub-cache,
which is not an acceptable choice by default because every plugin is
re-downloaded during every build of a flutter application either during a new
build or when building with the per-package-directory option enabled.
Furthermore, keeping the pub-cache in its current location prevents users from
committing the pub-cache directory to git for faster rebuilds of a
Buildroot-based system, as a user cannot store the pub-cache for later use.

To fix the above issue, add a new option to flutter-sdk-bin/Config.in.host,
BR2_PACKAGE_HOST_FLUTTER_SDK_BIN_PUB_CACHE_LOCATION and set the default to
$(DL_DIR)/br-flutter-pub-cache. While hard-coding the location is generally
preferable, a developer may already have a working pub-cache at a different
location. Setting this option to a string provides no downsides, and the
default location is now set to a sane default, providing an optimal solution
to the problem above.

Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
 package/flutter-sdk-bin/Config.in.host     | 11 +++++++++++
 package/flutter-sdk-bin/flutter-sdk-bin.mk |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/package/flutter-sdk-bin/Config.in.host b/package/flutter-sdk-bin/Config.in.host
index 181a2ee6e5..a1ac5835d9 100644
--- a/package/flutter-sdk-bin/Config.in.host
+++ b/package/flutter-sdk-bin/Config.in.host
@@ -13,3 +13,14 @@ config BR2_PACKAGE_HOST_FLUTTER_SDK_BIN
 	  free and open source.
 
 	  https://flutter.dev/
+
+if BR2_PACKAGE_HOST_FLUTTER_SDK_BIN_ARCH_SUPPORTS
+
+config BR2_PACKAGE_HOST_FLUTTER_SDK_BIN_PUB_CACHE_LOCATION
+	string "pub-cache location"
+	default "$(DL_DIR)/br-flutter-pub-cache"
+	help
+	  Directory to store cached packages used by Pub with
+	  Dart/Flutter.
+
+endif
diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.mk b/package/flutter-sdk-bin/flutter-sdk-bin.mk
index e7fd09cb56..5edd53df28 100644
--- a/package/flutter-sdk-bin/flutter-sdk-bin.mk
+++ b/package/flutter-sdk-bin/flutter-sdk-bin.mk
@@ -105,4 +105,4 @@ HOST_FLUTTER_SDK_BIN_DART_BIN = \
 $(eval $(host-generic-package))
 
 # For target packages to locate said pub-cache
-FLUTTER_SDK_BIN_PUB_CACHE = $(HOST_FLUTTER_SDK_BIN_SDK)/.pub-cache
+FLUTTER_SDK_BIN_PUB_CACHE = $(call qstrip,$(BR2_PACKAGE_HOST_FLUTTER_SDK_BIN_PUB_CACHE_LOCATION))
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v3 11/11] package/flutter-sdk-bin/Config.in.host: add pub-cache location option

[Yann E. MORIN]

Adam, All,

On 2024-01-02 16:59 -0700, Adam Duskett spake thusly:
> When running the command "flutter pub get," the plugins are stored in the
> pub-cache directory along with their sha256sum hashes. The default location of
> the pub-cache directory is current $(HOST_DIR)/share/flutter/sdk/.pub-cache,
> which is not an acceptable choice by default because every plugin is
> re-downloaded during every build of a flutter application either during a new
> build or when building with the per-package-directory option enabled.

This is a very good explanation of the problem, thanks! We indeed need
to find a better location; see below.

> Furthermore, keeping the pub-cache in its current location prevents users from
> committing the pub-cache directory to git for faster rebuilds of a
> Buildroot-based system, as a user cannot store the pub-cache for later use.

If the pub-cache is located in a sub-directory of BR2_DL_DIR, then they
will be able to keep that location between builds.

In case you did not know, you can export BR2_DL_DIR in the environment,
then Buildroot wil use that instead of $(TOPDIR)/dl/ and wil not remove
it when running "make clean" or "make distclean", effectively making the
directory pointed to by BR2_DL_DIR, an actual cache of downloaded files.

> To fix the above issue, add a new option to flutter-sdk-bin/Config.in.host,
> BR2_PACKAGE_HOST_FLUTTER_SDK_BIN_PUB_CACHE_LOCATION and set the default to
> $(DL_DIR)/br-flutter-pub-cache. While hard-coding the location is generally
> preferable, a developer may already have a working pub-cache at a different
> location. Setting this option to a string provides no downsides, and the
> default location is now set to a sane default, providing an optimal solution
> to the problem above.
> 
> Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
> ---
>  package/flutter-sdk-bin/Config.in.host     | 11 +++++++++++
>  package/flutter-sdk-bin/flutter-sdk-bin.mk |  2 +-
>  2 files changed, 12 insertions(+), 1 deletion(-)
> 
> diff --git a/package/flutter-sdk-bin/Config.in.host b/package/flutter-sdk-bin/Config.in.host
> index 181a2ee6e5..a1ac5835d9 100644
> --- a/package/flutter-sdk-bin/Config.in.host
> +++ b/package/flutter-sdk-bin/Config.in.host
> @@ -13,3 +13,14 @@ config BR2_PACKAGE_HOST_FLUTTER_SDK_BIN
>  	  free and open source.
>  
>  	  https://flutter.dev/
> +
> +if BR2_PACKAGE_HOST_FLUTTER_SDK_BIN_ARCH_SUPPORTS
> +
> +config BR2_PACKAGE_HOST_FLUTTER_SDK_BIN_PUB_CACHE_LOCATION
> +	string "pub-cache location"
> +	default "$(DL_DIR)/br-flutter-pub-cache"
> +	help
> +	  Directory to store cached packages used by Pub with
> +	  Dart/Flutter.
> +
> +endif
> diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.mk b/package/flutter-sdk-bin/flutter-sdk-bin.mk
> index e7fd09cb56..5edd53df28 100644
> --- a/package/flutter-sdk-bin/flutter-sdk-bin.mk
> +++ b/package/flutter-sdk-bin/flutter-sdk-bin.mk
> @@ -105,4 +105,4 @@ HOST_FLUTTER_SDK_BIN_DART_BIN = \
>  $(eval $(host-generic-package))
>  
>  # For target packages to locate said pub-cache
> -FLUTTER_SDK_BIN_PUB_CACHE = $(HOST_FLUTTER_SDK_BIN_SDK)/.pub-cache
> +FLUTTER_SDK_BIN_PUB_CACHE = $(call qstrip,$(BR2_PACKAGE_HOST_FLUTTER_SDK_BIN_PUB_CACHE_LOCATION))

So, as Arnout and I already replied when we reviewed the first iteration
of this patch, this should not be a configurable item; rather, it should
just be hard-coded to point to: $(BR2_DL_DIR)/br-flutter-pub-cache
(like we already have $(BR2_DL_DIR)/br-cargo-home for example, which
serves a very similar purpose).

Furthermore, as Arnout noticed, the current code for the package
host-flutter-sdk-bin will just promptly remove the currently hard-coded
pub-cache directory:

    package/flutter-sdk-bin/flutter-sdk-bin.mk
    44 # Remove the cache, as we will run precache after setting up flutter and dart
    45 # with the new config options.
    46 define HOST_FLUTTER_SDK_BIN_BUILD_CMDS
    47 »       mkdir -p $(HOST_FLUTTER_SDK_BIN_SDK)
    48 »       rm -rf $(HOST_FLUTTER_SDK_BIN_SDK)/.pub-cache
    49 »       cd $(@D) && \
    50 »       »       $(HOST_FLUTTER_SDK_BIN_ENV) $(@D)/bin/flutter precache;
    51 endef

The code above then becomes wrong, because the pub-cache is no longer
located in that hard-coded location, so instead of the hard-coded value,
it should be changed to use $(FLUTTER_SDK_BIN_PUB_CACHE).

So, making the pub-cache location configurable will only ensure that a
pre-filled cache, potentially shared with non-Buildroot tools), would be
removed when using Buildroot, which goes directly against the stated
goal for that patch.

I am sorry, but I am going to reject this patch, and suggest that the
pub-cache be placed in a sub-directory of BR2_DL_DIR, as the previous
reviews suggested, and as described and explained above.

Regards,
Yann E. MORIN.

> -- 
> 2.43.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot