Skip to content

Commit 58142f3

Browse files
authored
Fix for vista (#21)
* Use old libs on Vista * Update NEWS
1 parent ef22ac3 commit 58142f3

File tree

3 files changed

+18
-1
lines changed

3 files changed

+18
-1
lines changed

NEWS

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
1.6.6-1
2+
- Fix build on legacy Windows Vista (i.e. the old winbuilder machine)
3+
4+
1.6.6
5+
- Update vendored gifski to upstream 1.6.6
6+
- Note gifski 1.6.6 requires at least Rust 1.56. On older systems we fall
7+
back on the previous gifski 1.4.3 version.
8+
- New rust also does not work on Windows Vista / 2008 anymore (i.e. the
9+
old cran winbuilder). So on this machine we also fall back on 1.4.3.
10+
111
1.4.3-1:
212
- Add libgifski ucrt64 binary
313

src/Makevars.win.static

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
VERSION = 1.6.6
2-
RWINLIB = ../windows/gifski-$(VERSION)
2+
RWINLIB = ../windows/gifski-winlibs
33
PKG_CPPFLAGS = -I$(RWINLIB)/include
44
PKG_LIBS = -L$(RWINLIB)/lib${R_ARCH}${CRT} \
55
-lgifski -lws2_32 -ladvapi32 -luserenv -ldbghelp -lbcrypt

tools/winlibs.R

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
# Build against gifski libs compiled with the Rtools
22
VERSION <- commandArgs(TRUE)
3+
4+
# Hack: latest gifski does not work on Windows Vista
5+
if(grepl('Windows (Vista|Server 2008)', osVersion)){
6+
VERSION <- '1.4.3'
7+
}
8+
39
if(!file.exists(sprintf("../windows/gifski-%s/include/gifski.h", VERSION))){
410
if(getRversion() < "3.3.0") setInternet2()
511
download.file(sprintf("https://github.com/rwinlib/gifski/archive/v%s.zip", VERSION), "lib.zip", quiet = TRUE)
612
dir.create("../windows", showWarnings = FALSE)
713
unzip("lib.zip", exdir = "../windows")
814
unlink("lib.zip")
15+
file.rename(sprintf("../windows/gifski-%s", VERSION), '../windows/gifski-winlibs')
916
}

0 commit comments

Comments
 (0)