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

["Yann E. MORIN" <yann.morin.1998@free.fr>]

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