Skip to content

Commit 82b91e7

Browse files
authored
Drop spng from dependencies (#84)
See: lovell/sharp-libvips#300
1 parent d5fc65e commit 82b91e7

File tree

8 files changed

+4
-28
lines changed

8 files changed

+4
-28
lines changed

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
3535
| [libimagequant] | 2.4.1[^1] | BSD 2-Clause |
3636
| [libpng] | 1.6.50 | [libpng License version 2] |
3737
| [librsvg] | 2.61.3 | LGPLv3 |
38-
| [libspng] | 0.7.4 | BSD 2-Clause |
3938
| [libtiff] | 4.7.1 | [libtiff License] (BSD-like) |
4039
| [libvips] | 8.18.0[^2] | LGPLv3 |
4140
| [libwebp] | 1.6.0 | New BSD License |
@@ -74,7 +73,6 @@ https://github.com/libvips/libvips/releases/tag/v8.18.0-alpha1
7473
[libpng]: https://github.com/pnggroup/libpng
7574
[libpng License version 2]: https://github.com/pnggroup/libpng/blob/master/LICENSE
7675
[librsvg]: https://gitlab.gnome.org/GNOME/librsvg
77-
[libspng]: https://github.com/randy408/libspng
7876
[libtiff]: https://gitlab.com/libtiff/libtiff
7977
[libtiff License]: https://gitlab.com/libtiff/libtiff/blob/master/LICENSE.md
8078
[libvips]: https://github.com/libvips/libvips

build/libspng.mk

Lines changed: 0 additions & 21 deletions
This file was deleted.

build/plugins/all-deps/overrides.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ vips_MESON_OPTS = \
1313
-Dheif-module=$(if $(IS_HEVC),enabled,disabled) \
1414
$(if $(findstring graphicsmagick,$(vips_all_DEPS)), -Dmagick-package=GraphicsMagick) \
1515
-Dpdfium=disabled \
16-
-Dquantizr=disabled
16+
-Dquantizr=disabled \
17+
-Dspng=disabled
1718

1819
# https://github.com/libvips/build-win64-mxe/issues/80
1920
tiff_CONFIGURE_OPTS = --enable-zstd

build/plugins/all-deps/vips-all.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ define $(PKG)_PRE_CONFIGURE
6060
$(if $(IS_INTL_DUMMY),printf ' "proxy-libintl": "$(proxy-libintl_VERSION)"$(comma)\n';) \
6161
printf ' "raw": "$(libraw_VERSION)",\n'; \
6262
printf ' "rsvg": "$(librsvg_VERSION)",\n'; \
63-
printf ' "spng": "$(libspng_VERSION)",\n'; \
6463
printf ' "sqlite": "$(sqlite_VERSION)",\n'; \
6564
printf ' "tiff": "$(tiff_VERSION)",\n'; \
6665
printf ' "vips": "$(vips_VERSION)",\n'; \

build/plugins/web-deps/overrides.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ vips_MESON_OPTS = \
1515
-Dpoppler=disabled \
1616
-Dquantizr=disabled \
1717
-Draw=disabled \
18+
-Dspng=disabled \
1819
-Dppm=false \
1920
-Danalyze=false \
2021
-Dradiance=false

build/plugins/web-deps/vips-web.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ define $(PKG)_PRE_CONFIGURE
4343
printf ' "png": "$(libpng_VERSION)",\n'; \
4444
$(if $(IS_INTL_DUMMY),printf ' "proxy-libintl": "$(proxy-libintl_VERSION)"$(comma)\n';) \
4545
printf ' "rsvg": "$(librsvg_VERSION)",\n'; \
46-
printf ' "spng": "$(libspng_VERSION)",\n'; \
4746
printf ' "tiff": "$(tiff_VERSION)",\n'; \
4847
printf ' "vips": "$(vips_VERSION)",\n'; \
4948
printf ' "webp": "$(libwebp_VERSION)",\n'; \

build/plugins/zlib-ng/overrides.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ libarchive_DEPS := $(subst zlib,zlib-ng,$(libarchive_DEPS))
1313
libexif_DEPS := $(subst zlib,zlib-ng,$(libexif_DEPS))
1414
libpng_DEPS := $(subst zlib,zlib-ng,$(libpng_DEPS))
1515
libraw_DEPS := $(subst zlib,zlib-ng,$(libraw_DEPS))
16-
libspng_DEPS := $(subst zlib,zlib-ng,$(libspng_DEPS))
1716
matio_DEPS := $(subst zlib,zlib-ng,$(matio_DEPS))
1817
nifticlib_DEPS := $(subst zlib,zlib-ng,$(nifticlib_DEPS))
1918
openexr_DEPS := $(subst zlib,zlib-ng,$(openexr_DEPS))

build/vips.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST
88
$(PKG)_GH_CONF := libvips/libvips/releases,v,,,,.tar.xz
99
$(PKG)_SUBDIR := $(PKG)-$(firstword $(subst -, ,$($(PKG)_VERSION)))
1010
$(PKG)_DEPS := cc meson-wrapper libwebp librsvg glib pango libarchive \
11-
libjpeg-turbo tiff lcms libexif libheif libspng \
11+
libjpeg-turbo tiff lcms libexif libheif \
1212
libimagequant highway cgif
1313

1414
define $(PKG)_BUILD

0 commit comments

Comments
 (0)