Windows: update to libmagick 6.9.12-93

ropensci · Aug 6, 2023 · ba8ebea · ba8ebea
1 parent 84fd213
commit ba8ebea
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -17,6 +17,7 @@ jobs:
       matrix:
         config:
           - {os: macOS-latest,   r: 'release'}
+          - {os: windows-latest, r: '4.1'}
           - {os: windows-latest, r: 'release'}
           - {os: windows-2022,   r: 'devel'}
           - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: magick
 Type: Package
 Title: Advanced Graphics and Image-Processing in R
-Version: 2.7.4
+Version: 2.7.5
 Authors@R: person("Jeroen", "Ooms", role = c("aut", "cre"), email = "jeroen@berkeley.edu",
     comment = c(ORCID = "0000-0002-4035-0289"))
 Description: Bindings to 'ImageMagick': the most comprehensive open-source image

diff --git a/NEWS b/NEWS
@@ -1,3 +1,6 @@
+2.7.5
+  - Win/Mac: update to libmagick 6.9.12-93
+
 2.7.4
   - New function magick_set_seed()
   - Fix signature of as.raster.magick-image()

diff --git a/src/Makevars.ucrt b/src/Makevars.ucrt
diff --git a/src/Makevars.win b/src/Makevars.win
@@ -1,28 +1,35 @@
 # ImageMagick build target
 IM=6
+ifeq ($(R_COMPILED_BY),gcc 8.3.0)
 VERSION=6.9.12-3
+else
+VERSION=6.9.12-93
+NTDLL=-lntdll
+endif
+
 IMPATH = ../windows/imagemagick${IM}-${VERSION}
 LIBBUILD = ${subst gcc ,-,${R_COMPILED_BY}}${R_ARCH}
 
-PKG_CPPFLAGS = -I$(IMPATH)/include${LIBBUILD} \
+PKG_CPPFLAGS = \
 	-I$(IMPATH)/include-config${R_ARCH} \
 	-I$(IMPATH)/include/ImageMagick-${IM}
 
 PKG_CXXFLAGS = -DMAGICKCORE_HDRI_ENABLE=0 -DMAGICKCORE_QUANTUM_DEPTH=16 -D_LIB
 
 PKG_LIBS = \
 	-L$(IMPATH)/lib${LIBBUILD} \
-	-L$(IMPATH)/lib${R_ARCH}${CRT} \
+	-L$(IMPATH)/lib${R_ARCH} \
 	-lMagick++-${IM}.Q16 -lMagickWand-${IM}.Q16 -lMagickCore-${IM}.Q16 \
 	-lraw -lheif -lde265 -lx265 -laom \
-	-lfftw3 -llcms2 -ljpeg -ltiff -llzma -lbz2 \
 	-lrsvg-2 -lxml2 \
 	-lpangocairo-1.0 -lpango-1.0 -lpangowin32-1.0 \
 	-lcairo -lfreetype -lpixman-1 -lgdk_pixbuf-2.0 \
+	-lfftw3 -llcms2 -ljpeg -ltiff -llzma -lbz2 \
 	-lcairo-gobject -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 \
 	-lffi -lpcre -lpng16 -lintl -lz -liconv -lfribidi \
 	-lopenjp2 -lwebpmux -lwebp -lwebpdecoder -lwebpdemux \
-	-lusp10 -liphlpapi -lgdiplus -lgdi32 -lole32 -ldnsapi -lws2_32 -luserenv
+	-lusp10 -liphlpapi -lgdiplus -lgdi32 -lole32 -ldnsapi \
+	-lws2_32 -luserenv -lbcrypt -lurlmon ${NTDLL}
 
 all: clean winlibs