diff options
| author | Tony Theodore <tonyt@logyst.com> | 2019-05-08 22:10:19 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2019-09-07 04:10:16 (GMT) |
| commit | f12630ab8bb81c88e322869dbcf7dceb6a565d61 (patch) | |
| tree | 546c43d05e9fab9a3e5e1d2fec19fb82d24854d6 /src/imagemagick.mk | |
| parent | 180304a89f464b2f8fd621cd23edf87c80e5338c (diff) | |
| download | mxe-f12630ab8bb81c88e322869dbcf7dceb6a565d61.zip mxe-f12630ab8bb81c88e322869dbcf7dceb6a565d61.tar.gz mxe-f12630ab8bb81c88e322869dbcf7dceb6a565d61.tar.bz2 | |
imagemagick: switch to GH_CONF and update 6.9.0-0 --> 7.0.8-44
closes #2335
Diffstat (limited to 'src/imagemagick.mk')
| -rw-r--r-- | src/imagemagick.mk | 32 |
1 files changed, 9 insertions, 23 deletions
diff --git a/src/imagemagick.mk b/src/imagemagick.mk index a2284be..11a1bb9 100644 --- a/src/imagemagick.mk +++ b/src/imagemagick.mk @@ -4,36 +4,22 @@ PKG := imagemagick $(PKG)_WEBSITE := https://www.imagemagick.org/ $(PKG)_DESCR := ImageMagick $(PKG)_IGNORE := -$(PKG)_VERSION := 6.9.0-0 -$(PKG)_CHECKSUM := 12331c904c691cb128865fdc97e5f8a2654576f9b032e274b74dd7617aa1b9b6 -$(PKG)_SUBDIR := ImageMagick-$($(PKG)_VERSION) -$(PKG)_FILE := ImageMagick-$($(PKG)_VERSION).tar.xz -$(PKG)_URL := https://www.imagemagick.org/download/releases/$($(PKG)_FILE) -$(PKG)_URL_2 := https://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/$($(PKG)_FILE) +$(PKG)_VERSION := 7.0.8-44 +$(PKG)_CHECKSUM := 4938a131236d4caa43143f2c77de069a83cde3cbfbcb552eaa3b22745d2dc6ee +$(PKG)_GH_CONF := ImageMagick/ImageMagick/tags $(PKG)_DEPS := cc bzip2 ffmpeg fftw freetype jasper jpeg lcms \ - liblqr-1 libltdl libpng openexr pthreads tiff - -define $(PKG)_UPDATE - $(WGET) -q -O- 'https://www.imagemagick.org/' | \ - $(SED) -n 's,.*<p>The current release is ImageMagick \([0-9][0-9.-]*\).*,\1,p' | \ - head -1 -endef + liblqr-1 libltdl libpng openexr pthreads tiff zlib define $(PKG)_BUILD - cd '$(1)' && ./configure \ + cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \ $(MXE_CONFIGURE_OPTS) \ --with-x=no \ - --without-zlib \ --disable-largefile \ - --without-threads \ --with-freetype='$(PREFIX)/$(TARGET)/bin/freetype-config' - $(SED) -i 's/#define MAGICKCORE_HAVE_PTHREAD 1//g' '$(1)/magick/magick-baseconfig.h' - $(SED) -i 's/#define MAGICKCORE_ZLIB_DELEGATE 1//g' '$(1)/magick/magick-config.h' - $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= - $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' bin_PROGRAMS= + $(MAKE) -C '$(BUILD_DIR)' -j 1 install bin_PROGRAMS= - '$(1)'/libtool --mode=link --tag=CXX \ - '$(TARGET)-g++' -Wall -Wextra -std=gnu++0x \ + '$(TARGET)-g++' -Wall -Wextra -std=gnu++0x \ '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-imagemagick.exe' \ - `'$(TARGET)-pkg-config' ImageMagick++ --cflags --libs` + `'$(TARGET)-pkg-config' Magick++ --cflags --libs` endef |