Skip to content

Commit 822430c

Browse files
committed
Update for 8.15.5
- Update GLib to 2.82.2.
1 parent ee4e40a commit 822430c

File tree

5 files changed

+17
-11
lines changed

5 files changed

+17
-11
lines changed

README.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
2424
| [fontconfig] | 2.15.0 | [fontconfig Licence] (BSD-like) |
2525
| [freetype] | 2.13.3 | [freetype Licence] (BSD-like) |
2626
| [fribidi] | 1.0.16 | LGPLv3 |
27-
| [glib] | 2.82.1 | LGPLv3 |
27+
| [glib] | 2.82.2 | LGPLv3 |
2828
| [harfbuzz] | 10.0.1 | MIT Licence |
2929
| [highway] | 1.2.0 | Apache-2.0 License, BSD 3-Clause |
3030
| [lcms] | 2.16 | MIT Licence |
@@ -37,7 +37,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
3737
| [librsvg] | 2.59.1 | LGPLv3 |
3838
| [libspng] | 0.7.4 | BSD 2-Clause |
3939
| [libtiff] | 4.7.0 | [libtiff License] (BSD-like) |
40-
| [libvips] | 8.15.5² | LGPLv3 |
40+
| [libvips] | 8.15.5 | LGPLv3 |
4141
| [libwebp] | 1.4.0 | New BSD License |
4242
| [libxml2] | 2.13.4 | MIT Licence |
4343
| [mozjpeg] | 4.1.5 | [zlib License, IJG License, BSD-3-Clause] |
@@ -47,8 +47,6 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
4747
| [zlib-ng] | 2.2.2 | [zlib-ng Licence] |
4848

4949
¹ [A fork](https://github.com/lovell/libimagequant) of the BSD 2-Clause licensed libimagequant v2.4.1 is used.
50-
² libvips is built from the [`v8.15.5-rc1`](https://github.com/libvips/libvips/tree/v8.15.5-rc1) tag, see:
51-
https://github.com/libvips/libvips/releases/tag/v8.15.5-rc1
5250

5351
[aom]: https://aomedia.googlesource.com/aom/
5452
[Alliance for Open Media Patent License 1.0]: https://aomedia.org/license/patent-license/

build/overrides.mk

+8
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,14 @@ pango_SUBDIR := pango-$(pango_VERSION)
5959
pango_FILE := pango-$(pango_VERSION).tar.xz
6060
pango_URL := https://download.gnome.org/sources/pango/$(call SHORT_PKG_VERSION,pango)/$(pango_FILE)
6161

62+
# upstream version is 2.82.1
63+
glib_VERSION := 2.82.2
64+
glib_CHECKSUM := ab45f5a323048b1659ee0fbda5cecd94b099ab3e4b9abf26ae06aeb3e781fd63
65+
glib_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/glib-[0-9]*.patch)))
66+
glib_SUBDIR := glib-$(glib_VERSION)
67+
glib_FILE := glib-$(glib_VERSION).tar.xz
68+
glib_URL := https://download.gnome.org/sources/glib/$(call SHORT_PKG_VERSION,glib)/$(glib_FILE)
69+
6270
# upstream version is 1.0.13
6371
# cannot use GH_CONF:
6472
# fribidi_GH_CONF := fribidi/fribidi/releases,v

build/variables.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
vips_package=vips
44
vips_version=8.15
55
vips_patch_version=5
6-
vips_pre_version=rc1
6+
#vips_pre_version=rc1
77

88
if [ -n "$GIT_COMMIT" ]; then
99
vips_version=$GIT_COMMIT

build/vips-all.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ $(PKG)_WEBSITE := https://libvips.github.io/libvips/
33
$(PKG)_DESCR := A fast image processing library with low memory needs.
44
$(PKG)_IGNORE :=
55
$(PKG)_VERSION := 8.15.5
6-
$(PKG)_CHECKSUM := 7c59d20996373482fe55ebf7999ba605e74540fadd647894b17fa35ebf2f50b7
6+
$(PKG)_CHECKSUM := 2046d2001e60955dc6a85b82afbd6cadc8c34e10ba2f6e5ea09f03fc69eb2603
77
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch)))
8-
$(PKG)_GH_CONF := libvips/libvips/releases,v,-rc1,,,-rc1.tar.xz
8+
$(PKG)_GH_CONF := libvips/libvips/releases,v,,,,.tar.xz
99
$(PKG)_SUBDIR := vips-$($(PKG)_VERSION)
10-
$(PKG)_FILE := vips-$($(PKG)_VERSION)-rc1.tar.xz
10+
$(PKG)_FILE := vips-$($(PKG)_VERSION).tar.xz
1111
$(PKG)_DEPS := cc meson-wrapper libwebp librsvg glib pango libarchive \
1212
libjpeg-turbo tiff lcms libexif libheif libpng \
1313
libspng libimagequant highway imagemagick matio openexr \

build/vips-web.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ $(PKG)_WEBSITE := https://libvips.github.io/libvips/
33
$(PKG)_DESCR := A fast image processing library with low memory needs.
44
$(PKG)_IGNORE :=
55
$(PKG)_VERSION := 8.15.5
6-
$(PKG)_CHECKSUM := 7c59d20996373482fe55ebf7999ba605e74540fadd647894b17fa35ebf2f50b7
6+
$(PKG)_CHECKSUM := 2046d2001e60955dc6a85b82afbd6cadc8c34e10ba2f6e5ea09f03fc69eb2603
77
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch)))
8-
$(PKG)_GH_CONF := libvips/libvips/releases,v,-rc1,,,-rc1.tar.xz
8+
$(PKG)_GH_CONF := libvips/libvips/releases,v,,,,.tar.xz
99
$(PKG)_SUBDIR := vips-$($(PKG)_VERSION)
10-
$(PKG)_FILE := vips-$($(PKG)_VERSION)-rc1.tar.xz
10+
$(PKG)_FILE := vips-$($(PKG)_VERSION).tar.xz
1111
$(PKG)_DEPS := cc meson-wrapper libwebp librsvg glib pango libarchive \
1212
libjpeg-turbo tiff lcms libexif libheif libpng \
1313
libspng libimagequant highway cgif

0 commit comments

Comments
 (0)