Skip to content

Commit a935810

Browse files
kleisaukekleisauke
committed
Update for 8.11.3
- Update GLib to 2.69.1. - Update libwebp to 1.2.1. - Update Pango to 1.48.8. - Update CFITSIO to 4.0.0. - Update highway to 0.14.0. - Update libjxl to 0.5. - Update OpenEXR to 3.1.1. - Update libjpeg-turbo to 2.1.1. - Update MinGW-w64 to the latest master version.
1 parent 511d8fc commit a935810

16 files changed

+210
-355
lines changed

‎README.md‎

Lines changed: 9 additions & 12 deletions
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
| [freetype] | 2.10.4 | [freetype Licence] (BSD-like) |
2525
| [fribidi] | 1.0.10 | LGPLv3 |
2626
| [gdk-pixbuf] | 2.42.6 | LGPLv3 |
27-
| [glib] | 2.69.0 | LGPLv3 |
27+
| [glib] | 2.69.1 | LGPLv3 |
2828
| [harfbuzz] | 2.8.2 | MIT Licence |
2929
| [lcms] | 2.12 | MIT Licence |
3030
| [libexif] | 0.6.22 | LGPLv3 |
@@ -36,12 +36,12 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
3636
| [librsvg] | 2.51.4 | LGPLv3 |
3737
| [libspng] | 0.6.3 | BSD 2-Clause |
3838
| [libtiff] | 4.3.0 | [libtiff License] (BSD-like) |
39-
| [libvips] | 8.11.2 | LGPLv3 |
40-
| [libwebp] | 1.2.0 | New BSD License |
39+
| [libvips] | 8.11.3 | LGPLv3 |
40+
| [libwebp] | 1.2.1 | New BSD License |
4141
| [libxml2] | 2.9.12 | MIT Licence |
4242
| [mozjpeg] | 4.0.3 | [zlib License, IJG License, BSD-3-Clause] |
4343
| [orc] | 0.4.32 | [orc License] (BSD-like) |
44-
| [pango] | 1.48.7 | LGPLv3 |
44+
| [pango] | 1.48.8 | LGPLv3 |
4545
| [pixman] | 0.40.0 | MIT Licence |
4646
| [zlib-ng] | 2.0.5 | [zlib-ng Licence] |
4747

@@ -90,23 +90,20 @@ Same as libvips-web + these extra dependencies:
9090
| Dependency | Version | Used under the terms of |
9191
|-----------------|-----------|--------------------------------------------------------------|
9292
| [brotli] | 1.0.9 | MIT Licence |
93-
| [cfitsio] | 3.49 | BSD-like |
93+
| [cfitsio] | 4.0.0 | BSD-like |
9494
| [fftw] | 3.3.9 | GPLv2 |
95-
| [highway] | [36c56ab] | Apache-2.0 License |
95+
| [highway] | 0.14.0 | Apache-2.0 License |
9696
| [imagemagick] | 6.9.12-19 | [ImageMagick License] (Apache-2.0-like) |
9797
| [imath] | 3.1.2 | BSD 3-Clause |
98-
| [libjxl] | [50660ed] | BSD 3-Clause |
98+
| [libjxl] | 0.5 | BSD 3-Clause |
9999
| [matio] | 1.5.21 | BSD 2-Clause |
100100
| [nifticlib] | 2.0.0 | Public domain |
101-
| [openexr] | 3.1.0 | BSD 3-Clause |
101+
| [openexr] | 3.1.1 | BSD 3-Clause |
102102
| [openjpeg] | 2.4.0 | BSD 2-Clause |
103103
| [openslide] | 3.4.1 | LGPLv3 |
104104
| [poppler] | 21.08.0 | GPLv2 |
105105
| [sqlite] | 3.36.0 | Public domain |
106106

107-
[36c56ab]: https://github.com/google/highway/commit/36c56ab76ac3c7cf57635d23228706669e8e48b0
108-
[50660ed]: https://github.com/libjxl/libjxl/commit/50660ed82c9f66570b469bc4d1ab7172524e637a
109-
110107
[brotli]: https://github.com/google/brotli
111108
[cfitsio]: https://heasarc.gsfc.nasa.gov/fitsio/
112109
[fftw]: https://github.com/FFTW/fftw3
@@ -137,7 +134,7 @@ In that case, the following version of libjpeg-turbo is built:
137134

138135
| Dependency | Version | Used under the terms of |
139136
|-----------------|-----------|--------------------------------------------------------------|
140-
| [libjpeg-turbo] | 2.1.0 | [zlib License, IJG License] |
137+
| [libjpeg-turbo] | 2.1.1 | [zlib License, IJG License] |
141138

142139
[libjpeg-turbo]: https://github.com/libjpeg-turbo/libjpeg-turbo
143140
[zlib License, IJG License]: https://github.com/libjpeg-turbo/libjpeg-turbo/blob/master/LICENSE.md

‎build/highway.mk‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ PKG := highway
22
$(PKG)_WEBSITE := https://github.com/google/highway
33
$(PKG)_DESCR := Performance-portable, length-agnostic SIMD with runtime dispatch
44
$(PKG)_IGNORE :=
5-
# https://github.com/google/highway/tarball/36c56ab76ac3c7cf57635d23228706669e8e48b0
6-
$(PKG)_VERSION := 36c56ab
7-
$(PKG)_CHECKSUM := afecc08a39ed43333aed3bf1caef6d1dbc0b71c53ad13e4ee88b314d9d081b62
5+
$(PKG)_VERSION := 0.14.0
6+
$(PKG)_CHECKSUM := 00ca110e15f634e81e931592ab7c902a58a006224dfcda70c05939c106890ca7
87
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/highway-[0-9]*.patch)))
9-
$(PKG)_GH_CONF := google/highway/branches/master
8+
$(PKG)_GH_CONF := google/highway/tags
109
$(PKG)_DEPS := cc
1110

1211
define $(PKG)_BUILD

‎build/libjxl.mk‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ PKG := libjxl
22
$(PKG)_WEBSITE := https://github.com/libjxl/libjxl
33
$(PKG)_DESCR := JPEG XL image format reference implementation
44
$(PKG)_IGNORE :=
5-
# https://github.com/libjxl/libjxl/tarball/50660ed82c9f66570b469bc4d1ab7172524e637a
6-
$(PKG)_VERSION := 50660ed
7-
$(PKG)_CHECKSUM := 6a3780534026093e68597106505abfcd461d95b2c2563dbce28ffc2341f095b7
5+
$(PKG)_VERSION := 0.5
6+
$(PKG)_CHECKSUM := 911cb4b50eb621131ca22382166f40d4914a4ff4453dd299ade1e3292f311f89
87
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libjxl-[0-9]*.patch)))
9-
$(PKG)_GH_CONF := libjxl/libjxl/branches/main
8+
$(PKG)_GH_CONF := libjxl/libjxl/tags,v
109
$(PKG)_DEPS := cc brotli highway lcms libjpeg-turbo libpng
1110

1211
define $(PKG)_BUILD

‎build/overrides.mk‎

Lines changed: 36 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ librsvg_FILE := librsvg-$(librsvg_VERSION).tar.xz
5454
librsvg_URL := https://download.gnome.org/sources/librsvg/$(call SHORT_PKG_VERSION,librsvg)/$(librsvg_FILE)
5555

5656
# upstream version is 1.37.4
57-
pango_VERSION := 1.48.7
58-
pango_CHECKSUM := 28a82f6a6cab60aa3b75a90f04197ead2d311fa8fe8b7bfdf8666e2781d506dc
57+
pango_VERSION := 1.48.8
58+
pango_CHECKSUM := 009d9d830ecbe11911d6637e48eec1c51390d3d12eb286035ef7c641f3c87410
5959
pango_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/pango-[0-9]*.patch)))
6060
pango_SUBDIR := pango-$(pango_VERSION)
6161
pango_FILE := pango-$(pango_VERSION).tar.xz
@@ -71,9 +71,17 @@ fribidi_SUBDIR := fribidi-$(fribidi_VERSION)
7171
fribidi_FILE := fribidi-$(fribidi_VERSION).tar.xz
7272
fribidi_URL := https://github.com/fribidi/fribidi/releases/download/v$(fribidi_VERSION)/$(fribidi_FILE)
7373

74+
# upstream version is 1.2.0
75+
libwebp_VERSION := 1.2.1
76+
libwebp_CHECKSUM := 808b98d2f5b84e9b27fdef6c5372dac769c3bda4502febbfa5031bd3c4d7d018
77+
libwebp_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libwebp-[0-9]*.patch)))
78+
libwebp_SUBDIR := libwebp-$(libwebp_VERSION)
79+
libwebp_FILE := libwebp-$(libwebp_VERSION).tar.gz
80+
libwebp_URL := http://downloads.webmproject.org/releases/webp/$(libwebp_FILE)
81+
7482
# upstream version is 2.50.2
75-
glib_VERSION := 2.69.0
76-
glib_CHECKSUM := 1cdb3fd8610f3c57b6622e5cd68e0a3210561d80b0eceb971eb51fb8b63dbfae
83+
glib_VERSION := 2.69.1
84+
glib_CHECKSUM := f92f34057a091fc8638d91f10cece842cb8618e9a1090b0ddb19cc15a21bf39c
7785
glib_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/glib-[0-9]*.patch)))
7886
glib_SUBDIR := glib-$(glib_VERSION)
7987
glib_FILE := glib-$(glib_VERSION).tar.xz
@@ -87,6 +95,15 @@ libgsf_SUBDIR := libgsf-$(libgsf_VERSION)
8795
libgsf_FILE := libgsf-$(libgsf_VERSION).tar.xz
8896
libgsf_URL := https://download.gnome.org/sources/libgsf/$(call SHORT_PKG_VERSION,libgsf)/$(libgsf_FILE)
8997

98+
# Override libjpeg-turbo patch with our own
99+
# upstream version is 2.1.0
100+
libjpeg-turbo_VERSION := 2.1.1
101+
libjpeg-turbo_CHECKSUM := b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510
102+
libjpeg-turbo_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libjpeg-turbo-[0-9]*.patch)))
103+
libjpeg-turbo_SUBDIR := libjpeg-turbo-$(libjpeg-turbo_VERSION)
104+
libjpeg-turbo_FILE := libjpeg-turbo-$(libjpeg-turbo_VERSION).tar.gz
105+
libjpeg-turbo_URL := https://$(SOURCEFORGE_MIRROR)/project/libjpeg-turbo/$(libjpeg-turbo_VERSION)/$(libjpeg-turbo_FILE)
106+
90107
# upstream version is 1.16.0
91108
cairo_VERSION := 1.17.4
92109
cairo_CHECKSUM := 74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705
@@ -98,16 +115,16 @@ cairo_URL := http://cairographics.org/snapshots/$(cairo_FILE)
98115
# upstream version is 2.2.0
99116
# cannot use GH_CONF:
100117
# openexr_GH_CONF := AcademySoftwareFoundation/openexr/tags
101-
openexr_VERSION := 3.1.0
102-
openexr_CHECKSUM := 8c2ff765368a28e8210af741ddf91506cef40f1ed0f1a08b6b73bb3a7faf8d93
118+
openexr_VERSION := 3.1.1
119+
openexr_CHECKSUM := 045254e201c0f87d1d1a4b2b5815c4ae54845af2e6ec0ab88e979b5fdb30a86e
103120
openexr_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/openexr-[0-9]*.patch)))
104121
openexr_SUBDIR := openexr-$(openexr_VERSION)
105122
openexr_FILE := openexr-$(openexr_VERSION).tar.gz
106123
openexr_URL := https://github.com/AcademySoftwareFoundation/openexr/archive/v$(openexr_VERSION).tar.gz
107124

108125
# upstream version is 3410
109-
cfitsio_VERSION := 3.49
110-
cfitsio_CHECKSUM := 5b65a20d5c53494ec8f638267fca4a629836b7ac8dd0ef0266834eab270ed4b3
126+
cfitsio_VERSION := 4.0.0
127+
cfitsio_CHECKSUM := b2a8efba0b9f86d3e1bd619f662a476ec18112b4f27cc441cc680a4e3777425e
111128
cfitsio_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/cfitsio-[0-9]*.patch)))
112129
cfitsio_SUBDIR := cfitsio-$(cfitsio_VERSION)
113130
cfitsio_FILE := cfitsio-$(cfitsio_VERSION).tar.gz
@@ -155,9 +172,18 @@ nasm_FILE := nasm-$(nasm_VERSION).tar.xz
155172
nasm_URL := https://www.nasm.us/pub/nasm/releasebuilds/$(nasm_VERSION)/$(nasm_FILE)
156173
nasm_URL_2 := https://sources.voidlinux.org/nasm-$(nasm_VERSION)/$(nasm_FILE)
157174

175+
# upstream version is 9.0.0
176+
# Update MinGW-w64 to 4613211
177+
# https://github.com/mirror/mingw-w64/tarball/4613211c6bfcb220dec9a116a76c5c9aff1939a3
178+
mingw-w64_VERSION := 4613211
179+
mingw-w64_CHECKSUM := 8062c83070a599b3480e1ee128438350d476e5f79d53a2130b6a9502aa9bb6aa
180+
mingw-w64_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/mingw-w64-[0-9]*.patch)))
181+
mingw-w64_SUBDIR := mirror-mingw-w64-$(mingw-w64_VERSION)
182+
mingw-w64_FILE := mirror-mingw-w64-$(mingw-w64_VERSION).tar.gz
183+
mingw-w64_URL := https://github.com/mirror/mingw-w64/tarball/$(mingw-w64_VERSION)/$(mingw-w64_FILE)
184+
158185
## Patches that we override with our own
159186

160-
libjpeg-turbo_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libjpeg-turbo-[0-9]*.patch)))
161187
tiff_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/tiff-[0-9]*.patch)))
162188
lcms_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/lcms-[0-9]*.patch)))
163189

@@ -710,7 +736,7 @@ endef
710736
define cfitsio_BUILD_SHARED
711737
cd '$(BUILD_DIR)' && $(TARGET)-cmake \
712738
-DBUILD_SHARED_LIBS=ON \
713-
-DUseCurl=OFF \
739+
-DUSE_CURL=OFF \
714740
'$(SOURCE_DIR)'
715741

716742
$(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'

‎build/patches/cfitsio-3-fixes.patch‎

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

‎build/patches/cfitsio-4-fixes.patch‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
This file is part of MXE. See LICENSE.md for licensing information.
2+
3+
Contains ad hoc patches for cross building.
4+
5+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
6+
From: Kleis Auke Wolthuizen <[email protected]>
7+
Date: Thu, 26 Dec 2019 20:00:00 +0100
8+
Subject: [PATCH 1/2] Don't install the library in lib/
9+
10+
11+
diff --git a/CMakeLists.txt b/CMakeLists.txt
12+
index 1111111..2222222 100644
13+
--- a/CMakeLists.txt
14+
+++ b/CMakeLists.txt
15+
@@ -275,7 +275,6 @@ IF (BZIP2_FOUND)
16+
ENDIF(BZIP2_FOUND)
17+
18+
SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION} SOVERSION ${${PROJECT_NAME}_MAJOR_VERSION})
19+
-install(TARGETS ${LIB_NAME} DESTINATION ${LIB_DESTINATION})
20+
install(TARGETS ${LIB_NAME}
21+
RUNTIME DESTINATION bin
22+
LIBRARY DESTINATION lib
23+
24+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
25+
From: Kleis Auke Wolthuizen <[email protected]>
26+
Date: Fri, 3 Jul 2020 19:00:00 +0200
27+
Subject: [PATCH 2/2] Fix .pc files
28+
29+
30+
diff --git a/cfitsio.pc.cmake b/cfitsio.pc.cmake
31+
index 1111111..2222222 100644
32+
--- a/cfitsio.pc.cmake
33+
+++ b/cfitsio.pc.cmake
34+
@@ -6,7 +6,8 @@ includedir=@INCLUDE_INSTALL_DIR@
35+
Name: cfitsio
36+
Description: FITS File Subroutine Library
37+
URL: https://heasarc.gsfc.nasa.gov/fitsio/
38+
-Version: @CFITSIO_MAJOR@.@CFITSIO_MINOR@.@CFITSIO_MICRO@
39+
-Libs: -L${libdir} @PKG_CONFIG_LIBS@
40+
+Version: @CFITSIO_VERSION@
41+
+Requires.private: zlib
42+
+Libs: -L${libdir} -lcfitsio
43+
Libs.private: -lm
44+
Cflags: -I${includedir}
45+
diff --git a/cfitsio.pc.in b/cfitsio.pc.in
46+
index 1111111..2222222 100644
47+
--- a/cfitsio.pc.in
48+
+++ b/cfitsio.pc.in
49+
@@ -7,6 +7,7 @@ Name: cfitsio
50+
Description: FITS File Subroutine Library
51+
URL: https://heasarc.gsfc.nasa.gov/fitsio/
52+
Version: @CFITSIO_MAJOR@.@CFITSIO_MINOR@.@CFITSIO_MICRO@
53+
+Requires.private: zlib
54+
Libs: -L${libdir} -lcfitsio
55+
Libs.private: -lm @LIBS@
56+
Cflags: -I${includedir}

‎build/patches/glib-2-fixes.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ diff --git a/gio/tests/meson.build b/gio/tests/meson.build
9595
index 1111111..2222222 100644
9696
--- a/gio/tests/meson.build
9797
+++ b/gio/tests/meson.build
98-
@@ -453,7 +453,7 @@ gdbus_example_objectmanager_sources = files(
98+
@@ -454,7 +454,7 @@ gdbus_example_objectmanager_sources = files(
9999
'gdbus-example-objectmanager-server.c',
100100
)
101101

@@ -104,7 +104,7 @@ index 1111111..2222222 100644
104104
test_extra_programs += {
105105
# These three are manual-run tests because they need a session bus but don't bring one up themselves
106106
# FIXME: these build but don't seem to work!
107-
@@ -567,7 +567,7 @@ if installed_tests_enabled
107+
@@ -568,7 +568,7 @@ if installed_tests_enabled
108108
endforeach
109109
endif
110110

‎build/patches/glib-2-without-gregex.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ diff --git a/gobject/gboxed.c b/gobject/gboxed.c
103103
index ae48df566..9f1ca04c8 100644
104104
--- a/gobject/gboxed.c
105105
+++ b/gobject/gboxed.c
106-
@@ -147,9 +147,6 @@ G_DEFINE_BOXED_TYPE (GByteArray, g_byte_array, g_byte_array_ref, g_byte_array_un
106+
@@ -148,9 +148,6 @@ G_DEFINE_BOXED_TYPE (GByteArray, g_byte_array, g_byte_array_ref, g_byte_array_un
107107
G_DEFINE_BOXED_TYPE (GBytes, g_bytes, g_bytes_ref, g_bytes_unref)
108108
G_DEFINE_BOXED_TYPE (GTree, g_tree, g_tree_ref, g_tree_unref)
109109

0 commit comments

Comments
 (0)