Windows: update static libs to gifski 1.32.0

r-rust · Oct 4, 2024 · 2d8074b · 2d8074b
1 parent 9f887f9
commit 2d8074b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -17,7 +17,9 @@ jobs:
       matrix:
         config:
           - {os: windows-latest, r: '4.1'}
+          - {os: windows-latest, r: '4.1', FORCE_STATIC_GIFSKI: 'static'}
           - {os: windows-latest, r: '4.2', FORCE_STATIC_GIFSKI: 'static'}
+          - {os: windows-latest, r: '4.3', FORCE_STATIC_GIFSKI: 'static'}
           - {os: windows-latest, r: 'release'}
           - {os: windows-latest, r: 'release', FORCE_STATIC_GIFSKI: 'static'}
           - {os: macOS-13, r: 'release'}

diff --git a/src/myrustlib/gifski.h b/src/myrustlib/gifski.h
@@ -162,6 +162,8 @@ GifskiError gifski_set_extra_effort(gifski *handle, bool extra);
  *
  * The first frame should have PTS=0. If the first frame has PTS > 0, it'll be used as a delay after the last frame.
  *
+ * This function may block and wait until the frame is processed. Make sure to call `gifski_set_write_callback` or `gifski_set_file_output` first to avoid a deadlock.
+ *
  * Returns 0 (`GIFSKI_OK`) on success, and non-0 `GIFSKI_*` constant on error.
  */
 GifskiError gifski_add_frame_png_file(gifski *handle,
@@ -177,6 +179,8 @@ GifskiError gifski_add_frame_png_file(gifski *handle,
  *
  * `frame_number` orders frames (consecutive numbers starting from 0).
  * You can add frames in any order, and they will be sorted by their `frame_number`.
+ * However, out-of-order frames are buffered in RAM, and will cause high memory usage
+ * if there are gaps in the frame numbers.
  *
  * Presentation timestamp (PTS) is time in seconds, since start of the file, when this frame is to be displayed.
  * For a 20fps video it could be `frame_number/20.0`. First frame must have PTS=0.
@@ -186,6 +190,8 @@ GifskiError gifski_add_frame_png_file(gifski *handle,
  *
  * Colors are in sRGB, uncorrelated RGBA, with alpha byte last.
  *
+ * This function may block and wait until the frame is processed. Make sure to call `gifski_set_write_callback` or `gifski_set_file_output` first to avoid a deadlock.
+ *
  * Returns 0 (`GIFSKI_OK`) on success, and non-0 `GIFSKI_*` constant on error.
  */
 GifskiError gifski_add_frame_rgba(gifski *handle,

diff --git a/tools/winlibs.R b/tools/winlibs.R
@@ -1,11 +1,11 @@
 if(!file.exists("../windows/libgifski/lib")){
   unlink("../windows", recursive = TRUE)
   url <- if(grepl("aarch", R.version$platform)){
-    "https://github.com/r-windows/bundles/releases/download/gifski-1.12.2/gifski-1.12.2-clang-aarch64.tar.xz"
+    "https://github.com/r-windows/bundles/releases/download/gifski-1.32.0/gifski-1.32.0-clang-aarch64.tar.xz"
   } else if(grepl("clang", Sys.getenv('R_COMPILED_BY'))){
-    "https://github.com/r-windows/bundles/releases/download/gifski-1.12.2/gifski-1.12.2-clang-x86_64.tar.xz"
+    "https://github.com/r-windows/bundles/releases/download/gifski-1.32.0/gifski-1.32.0-clang-x86_64.tar.xz"
   }  else if(getRversion() >= "4.2") {
-    "https://github.com/r-windows/bundles/releases/download/gifski-1.12.2/gifski-1.12.2-ucrt-x86_64.tar.xz"
+    "https://github.com/r-windows/bundles/releases/download/gifski-1.32.0/gifski-1.32.0-ucrt-x86_64.tar.xz"
   } else {
     "https://github.com/r-windows/bundles/releases/download/gifski-1.12.2/gifski-1.12.0-msvcrt.tar.xz"
   }