Windows: upgrade to gifski 1.6.6

Author: jeroen

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

@@ -10,13 +10,15 @@ jobs:
   R-CMD-check:
     runs-on: ${{ matrix.config.os }}
 
-    name: ${{ matrix.config.os }} (${{ matrix.config.r }})
+    name: ${{ matrix.config.os }} (${{ matrix.config.r }}${{ matrix.config.static }})
 
     strategy:
       fail-fast: false
       matrix:
         config:
-          - {os: windows-latest, r: '3.6'}
+          - {os: windows-latest, r: '3.6', static: '-rwinlib'}
+          - {os: windows-latest, r: '4.1', static: '-rwinlib'}
+          - {os: windows-latest, r: 'next', static: '-rwinlib'}
           - {os: windows-latest, r: '4.1'}
           - {os: windows-latest, r: 'next'}
           - {os: macOS-latest, r: 'release'}
@@ -47,7 +49,10 @@ jobs:
         run: |
           rustup target add i686-pc-windows-gnu
           rustup target add x86_64-pc-windows-gnu
-          Copy-Item src\Makevars.win.rust src\Makevars.win
+
+      - name: Use precompiled libgifski
+        if: runner.os == 'Windows' && matrix.config.static
+        run: Copy-Item src\Makevars.win.static src\Makevars.win
 
       - uses: r-lib/actions/setup-r@v2
         with:

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: gifski
 Type: Package
 Title: Highest Quality GIF Encoder
-Version: 1.4.3-1
+Version: 1.6.6
 Authors@R: c(
     person("Jeroen", "Ooms", ,"jeroen@berkeley.edu", role = c("aut", "cre"),
       comment = c(ORCID = "0000-0002-4035-0289")),

src/Makevars.win

@@ -1,13 +1,25 @@
-VERSION = 1.4.3
-RWINLIB = ../windows/gifski-$(VERSION)
-PKG_CPPFLAGS = -I$(RWINLIB)/include
-PKG_LIBS = -L$(RWINLIB)/lib${R_ARCH}${CRT} \
-	-lgifski -lws2_32 -ladvapi32 -luserenv -ldbghelp -lbcrypt
+TARGET = $(subst 64,x86_64,$(subst 32,i686,$(WIN)))-pc-windows-gnu
+LIBDIR = myrustlib/target/$(TARGET)/release
+STATLIB = $(LIBDIR)/libmyrustlib.a
+PKG_LIBS = -L$(LIBDIR) -lmyrustlib -lws2_32 -ladvapi32 -luserenv -ldbghelp -lbcrypt
 
-all: clean winlibs
+# These can also be set in ~/.cargo/config
+#export CARGO_TARGET_I686_PC_WINDOWS_GNU_LINKER=C:\\rtools40\\mingw$(WIN)\\bin\\gcc
+#export CC=$(CC)
+#export AR=$(AR)
 
-winlibs:
-	"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" "../tools/winlibs.R" $(VERSION)
+# This bypasses the exception stuff
+#export CARGO_TARGET_I686_PC_WINDOWS_GNU_RUSTFLAGS=-C panic=abort
+ifeq ($(R_COMPILED_BY),gcc 8.3.0)
+GCCPATH=$(subst C:\,/c/,$(RTOOLS40_HOME))/mingw$(WIN)/bin
+endif
+
+all: clean
+
+$(SHLIB): $(STATLIB)
+
+$(STATLIB):
+	PATH="$(GCCPATH):$(PATH)" cargo build --target=$(TARGET) --release --manifest-path=myrustlib/Cargo.toml
 
 clean:
-	rm -f $(SHLIB) $(OBJECTS)
+	rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) myrustlib/target

src/Makevars.win.rust

@@ -0,0 +1,13 @@
+VERSION = 1.6.6
+RWINLIB = ../windows/gifski-$(VERSION)
+PKG_CPPFLAGS = -I$(RWINLIB)/include
+PKG_LIBS = -L$(RWINLIB)/lib${R_ARCH}${CRT} \
+	-lgifski -lws2_32 -ladvapi32 -luserenv -ldbghelp -lbcrypt
+
+all: clean winlibs
+
+winlibs:
+	"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" "../tools/winlibs.R" $(VERSION)
+
+clean:
+	rm -f $(SHLIB) $(OBJECTS)