Support optional rlottie

amirgon · amirgon · commit 39c2df66babc · 2021-11-02T23:27:53.000+02:00
Also fix git fetch on workflow. Related: https://github.blog/2021-09-01-improving-git-protocol-security-github/#no-more-unauthenticated-git
diff --git a/.github/workflows/unix_port.yml b/.github/workflows/unix_port.yml
@@ -28,8 +28,8 @@ jobs:
     - name: Checkout lv_bindings
       working-directory: ./lib/lv_bindings
       run: |
-        git fetch --force ${{ github.event.repository.git_url }} "+refs/heads/*:refs/remotes/origin/*"
-        git fetch --force ${{ github.event.repository.git_url }} "+refs/pull/*:refs/remotes/origin/pr/*"
+        git fetch --force ${{ github.event.repository.html_url }} "+refs/heads/*:refs/remotes/origin/*"
+        git fetch --force ${{ github.event.repository.html_url }} "+refs/pull/*:refs/remotes/origin/pr/*"
         git checkout ${{ github.sha }} || git checkout ${{ github.event.pull_request.head.sha }}
         git submodule update --init --recursive
     - name: Build mpy-cross
diff --git a/gen/gen_mpy.py b/gen/gen_mpy.py
@@ -507,7 +507,7 @@ class MissingConversionException(ValueError):
     'long int'                  : '(long int)mp_obj_get_int',
     'long long'                 : '(long long)mp_obj_get_ull',
     'long long int'             : '(long long int)mp_obj_get_ull',
-    'float'                     : 'mp_obj_get_float',
+    'float'                     : '(float)mp_obj_get_float',
 }
 
 lv_to_mp = {
diff --git a/lv_conf.h b/lv_conf.h
@@ -66,6 +66,10 @@
 #  define LV_MEM_CUSTOM_REALLOC   m_realloc
 #endif     /*LV_MEM_CUSTOM*/
 
+/*Number of the intermediate memory buffer used during rendering and other internal processing mechanisms.
+ *You will see an error log message if there wasn't enough buffers. */
+#define LV_MEM_BUF_MAX_NUM 16
+
 /*Use the standard `memcpy` and `memset` instead of LVGL's own functions. (Might or might not be faster).*/
 #define LV_MEMCPY_MEMSET_STD 0
 
@@ -156,7 +160,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
 /*Use exnternal renderer*/
 #define LV_USE_EXTERNAL_RENDERER 0
 
-/*Use SDL renderer API*/
+/*Use SDL renderer API. Requires LV_USE_EXTERNAL_RENDERER*/
 #define LV_USE_GPU_SDL 0
 #if LV_USE_GPU_SDL
 #  define LV_GPU_SDL_INCLUDE_PATH <SDL2/SDL.h>
@@ -570,6 +574,17 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
 # define LV_FREETYPE_CACHE_SIZE (16 * 1024)
 #endif
 
+/* Rlottie library, check if available */
+#if defined __has_include
+#  if __has_include (<rlottie_capi.h>)
+#    define LV_USE_RLOTTIE 1
+#  else
+#    define LV_USE_RLOTTIE 0
+#  endif
+#else
+#define LV_USE_RLOTTIE 0
+#endif
+
 /*-----------
  * Others
  *----------*/
diff --git a/lvgl b/lvgl
@@ -1 +1 @@
-Subproject commit 00e5597d6924df3f1425c83a1afd8e96b2bc18a2
+Subproject commit 83f9c309855ece6d32c6ddbc97c3a23090ab14e0

Original file line number	Diff line number	Diff line change
`@@ -507,7 +507,7 @@ class MissingConversionException(ValueError):`
`507`	`507`	`'long int' : '(long int)mp_obj_get_int',`
`508`	`508`	`'long long' : '(long long)mp_obj_get_ull',`
`509`	`509`	`'long long int' : '(long long int)mp_obj_get_ull',`
`510`		`- 'float' : 'mp_obj_get_float',`
	`510`	`+ 'float' : '(float)mp_obj_get_float',`
`511`	`511`	`}`
`512`	`512`
`513`	`513`	`lv_to_mp = {`