Update static gifski

Author: jeroen

.github/workflows/R-CMD-check.yaml

@@ -17,6 +17,8 @@ jobs:
       matrix:
         config:
           - {os: windows-latest, r: '4.1'}
+          - {os: windows-latest, r: '4.2', FORCE_STATIC_GIFSKI: 'static''}
+          - {os: windows-latest, r: '4.2'}
           - {os: windows-latest, r: 'release'}
           - {os: windows-latest, r: 'release', FORCE_STATIC_GIFSKI: 'static'}
           - {os: macOS-latest, r: 'release'}

src/Makevars.win

@@ -1,15 +1,18 @@
-VERSION = 1.12.0
-RWINLIB = ../windows/gifski-winlibs
+RWINLIB = ../windows/libgifski
 PKG_CPPFLAGS = -I$(RWINLIB)/include
-GCC_VERSION = ${subst gcc,,${COMPILED_BY}}
-PKG_LIBS = -L$(RWINLIB)/lib$(GCC_VERSION)$(R_ARCH) \
+
+ifneq ($(R_COMPILED_BY),gcc 8.3.0)
+NTDLL=-lntdll
+endif
+
+PKG_LIBS = -L$(RWINLIB)/lib \
 	-L$(RWINLIB)/lib$(R_ARCH) \
-	-lgifski -lws2_32 -ladvapi32 -luserenv -ldbghelp -lbcrypt
+	-lgifski -lws2_32 -ladvapi32 -luserenv -ldbghelp -lbcrypt $(NTDLL)
 
 all: clean winlibs
 
 winlibs:
-	"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" "../tools/winlibs.R" $(VERSION)
+	"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" "../tools/winlibs.R"
 
 clean:
 	rm -f $(SHLIB) $(OBJECTS)

tools/winlibs.R

@@ -1,16 +1,18 @@
-# Build against gifski libs compiled with the Rtools
-VERSION <- commandArgs(TRUE)
-
-# Hack: latest gifski does not work on Windows Vista
-if(grepl('Windows (Vista|Server 2008)', osVersion)){
-  VERSION <- '1.4.3'
-}
-
-if(!file.exists(sprintf("../windows/gifski-%s/include/gifski.h", VERSION))){
-  if(getRversion() < "3.3.0") setInternet2()
-  download.file(sprintf("https://github.com/rwinlib/gifski/archive/v%s.zip", VERSION), "lib.zip", quiet = TRUE)
+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"
+  } 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"
+  }  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"
+  } else {
+    "https://github.com/r-windows/bundles/releases/download/gifski-1.12.2/gifski-1.12.0-msvcrt.tar.xz"
+  }
+  download.file(url, basename(url), quiet = TRUE)
   dir.create("../windows", showWarnings = FALSE)
-  unzip("lib.zip", exdir = "../windows")
-  unlink("lib.zip")
-  file.rename(sprintf("../windows/gifski-%s", VERSION), '../windows/gifski-winlibs')
+  untar(basename(url), exdir = "../windows", tar = 'internal')
+  unlink(basename(url))
+  setwd("../windows")
+  file.rename(list.files(), 'libgifski')
 }