Skip to content

Commit 511d8fc

Browse files
kleisaukekleisauke
committed
Dependency version bumps
- Update aom to 3.1.2. - Update ImageMagick to 6.9.12-19. - Update Imath to 3.1.2. - Update OpenEXR to 3.1.0. - Update Poppler to 21.08.0. - Update Rust to 1.54.0. - Update highway to the latest git revision. - Update libjxl to the latest git revision.
1 parent 9ea5c2a commit 511d8fc

File tree

17 files changed

+193
-118
lines changed

17 files changed

+193
-118
lines changed

‎README.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
1717

1818
| Dependency | Version | Used under the terms of |
1919
|-----------------|-----------|--------------------------------------------------------------|
20-
| [aom] | 3.1.1 | BSD 2-Clause + [Alliance for Open Media Patent License 1.0] |
20+
| [aom] | 3.1.2 | BSD 2-Clause + [Alliance for Open Media Patent License 1.0] |
2121
| [cairo] | 1.17.4 | Mozilla Public License 2.0 |
2222
| [expat] | 2.4.1 | MIT Licence |
2323
| [fontconfig] | 2.13.94 | [fontconfig Licence] (BSD-like) |
@@ -92,20 +92,20 @@ Same as libvips-web + these extra dependencies:
9292
| [brotli] | 1.0.9 | MIT Licence |
9393
| [cfitsio] | 3.49 | BSD-like |
9494
| [fftw] | 3.3.9 | GPLv2 |
95-
| [highway] | [c7d83de] | Apache-2.0 License |
96-
| [imagemagick] | 6.9.12-17 | [ImageMagick License] (Apache-2.0-like) |
97-
| [imath] | 3.0.5 | BSD 3-Clause |
98-
| [libjxl] | [2db3204] | BSD 3-Clause |
95+
| [highway] | [36c56ab] | Apache-2.0 License |
96+
| [imagemagick] | 6.9.12-19 | [ImageMagick License] (Apache-2.0-like) |
97+
| [imath] | 3.1.2 | BSD 3-Clause |
98+
| [libjxl] | [50660ed] | BSD 3-Clause |
9999
| [matio] | 1.5.21 | BSD 2-Clause |
100100
| [nifticlib] | 2.0.0 | Public domain |
101-
| [openexr] | 3.0.5 | BSD 3-Clause |
101+
| [openexr] | 3.1.0 | BSD 3-Clause |
102102
| [openjpeg] | 2.4.0 | BSD 2-Clause |
103103
| [openslide] | 3.4.1 | LGPLv3 |
104-
| [poppler] | 21.07.0 | GPLv2 |
104+
| [poppler] | 21.08.0 | GPLv2 |
105105
| [sqlite] | 3.36.0 | Public domain |
106106

107-
[c7d83de]: https://github.com/google/highway/commit/c7d83dee21a55607a3032a751de57eb72eaa4987
108-
[2db3204]: https://github.com/libjxl/libjxl/commit/2db3204b23b96a169ae851faffdef2ae1c41b018
107+
[36c56ab]: https://github.com/google/highway/commit/36c56ab76ac3c7cf57635d23228706669e8e48b0
108+
[50660ed]: https://github.com/libjxl/libjxl/commit/50660ed82c9f66570b469bc4d1ab7172524e637a
109109

110110
[brotli]: https://github.com/google/brotli
111111
[cfitsio]: https://heasarc.gsfc.nasa.gov/fitsio/

‎build/aom.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ PKG := aom
22
$(PKG)_WEBSITE := https://aomedia.googlesource.com/aom/
33
$(PKG)_DESCR := AV1 Codec Library
44
$(PKG)_IGNORE :=
5-
$(PKG)_VERSION := 3.1.1
6-
$(PKG)_CHECKSUM := 7cd5e8e469268c37241df93fe61557ea0dc46980ca21b37e786e92a3d0729276
5+
$(PKG)_VERSION := 3.1.2
6+
$(PKG)_CHECKSUM := a295eb3779657fad7d34217091ee4c6257d02580a82012231afef72792330075
77
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
88
$(PKG)_FILE := libaom-$($(PKG)_VERSION).tar.gz
99
$(PKG)_URL := https://storage.googleapis.com/aom-releases/$($(PKG)_FILE)

‎build/highway.mk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ 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/c7d83dee21a55607a3032a751de57eb72eaa4987
6-
$(PKG)_VERSION := c7d83de
7-
$(PKG)_CHECKSUM := 98b95de53e9d032ffb03075dd87ae1babfbdac16f3002e794fdcc1b3dc33a6d4
5+
# https://github.com/google/highway/tarball/36c56ab76ac3c7cf57635d23228706669e8e48b0
6+
$(PKG)_VERSION := 36c56ab
7+
$(PKG)_CHECKSUM := afecc08a39ed43333aed3bf1caef6d1dbc0b71c53ad13e4ee88b314d9d081b62
88
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/highway-[0-9]*.patch)))
99
$(PKG)_GH_CONF := google/highway/branches/master
1010
$(PKG)_DEPS := cc

‎build/imath.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ PKG := imath
22
$(PKG)_WEBSITE := https://github.com/AcademySoftwareFoundation/Imath
33
$(PKG)_DESCR := A C++ and python library of 2D and 3D vector, matrix, and math operations for computer graphics.
44
$(PKG)_IGNORE :=
5-
$(PKG)_VERSION := 3.0.5
6-
$(PKG)_CHECKSUM := 38b94c840c6400959ccf647bc1631f96f3170cb081021d774813803e798208bd
5+
$(PKG)_VERSION := 3.1.2
6+
$(PKG)_CHECKSUM := f21350efdcc763e23bffd4ded9bbf822e630c15ece6b0697e2fcb42737c08c2d
77
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
88
$(PKG)_GH_CONF := AcademySoftwareFoundation/Imath/tags,v
99
$(PKG)_DEPS := cc

‎build/libimagequant.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ $(PKG)_WEBSITE := https://github.com/lovell/libimagequant
33
$(PKG)_DESCR := libimagequant v2.4.1 fork (BSD 2-Clause)
44
$(PKG)_IGNORE :=
55
$(PKG)_VERSION := 2.4.1
6-
$(PKG)_CHECKSUM := 76dca8e48366d7e16284071528d60c9275c85945e45e887f26ec0028668a144f
6+
$(PKG)_CHECKSUM := efbd9b830033f0ddb91a5764e1f063bdcf87a5c7be663755ce3bb4166f86ea4a
77
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
88
$(PKG)_GH_CONF := lovell/libimagequant/tags,v
99
$(PKG)_DEPS := cc

‎build/libjxl.mk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ 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/2db3204b23b96a169ae851faffdef2ae1c41b018
6-
$(PKG)_VERSION := 2db3204
7-
$(PKG)_CHECKSUM := 4159e8c558ec3afd974021bd2bb57e2a44539358d44f23ebaac317d105afc52f
5+
# https://github.com/libjxl/libjxl/tarball/50660ed82c9f66570b469bc4d1ab7172524e637a
6+
$(PKG)_VERSION := 50660ed
7+
$(PKG)_CHECKSUM := 6a3780534026093e68597106505abfcd461d95b2c2563dbce28ffc2341f095b7
88
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libjxl-[0-9]*.patch)))
99
$(PKG)_GH_CONF := libjxl/libjxl/branches/main
1010
$(PKG)_DEPS := cc brotli highway lcms libjpeg-turbo libpng

‎build/overrides.mk‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ matio_FILE := matio-$(matio_VERSION).tar.gz
4040
matio_URL := https://github.com/tbeu/matio/releases/download/v$(matio_VERSION)/$(matio_FILE)
4141

4242
# upstream version is 7, we want ImageMagick 6
43-
imagemagick_VERSION := 6.9.12-17
44-
imagemagick_CHECKSUM := 453c42cb1c837b3a125150743d3f6591d157e3ca753aee760a9b5f1c070c52ac
43+
imagemagick_VERSION := 6.9.12-19
44+
imagemagick_CHECKSUM := 2f184f1f5c3e19849347b2b4acb6dd074290903d36fa5924956ee06c85ddf783
4545
imagemagick_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/imagemagick-[0-9]*.patch)))
4646
imagemagick_GH_CONF := ImageMagick/ImageMagick6/tags
4747

@@ -98,8 +98,8 @@ cairo_URL := http://cairographics.org/snapshots/$(cairo_FILE)
9898
# upstream version is 2.2.0
9999
# cannot use GH_CONF:
100100
# openexr_GH_CONF := AcademySoftwareFoundation/openexr/tags
101-
openexr_VERSION := 3.0.5
102-
openexr_CHECKSUM := 7aa6645da70e9a0cce8215d25030cfd4f4b17b4abf1ceec314f7eae15674e8e4
101+
openexr_VERSION := 3.1.0
102+
openexr_CHECKSUM := 8c2ff765368a28e8210af741ddf91506cef40f1ed0f1a08b6b73bb3a7faf8d93
103103
openexr_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/openexr-[0-9]*.patch)))
104104
openexr_SUBDIR := openexr-$(openexr_VERSION)
105105
openexr_FILE := openexr-$(openexr_VERSION).tar.gz
@@ -138,9 +138,9 @@ fftw_SUBDIR := fftw-$(fftw_VERSION)
138138
fftw_FILE := fftw-$(fftw_VERSION).tar.gz
139139
fftw_URL := http://www.fftw.org/$(fftw_FILE)
140140

141-
# upstream version is 21.02.0
142-
poppler_VERSION := 21.07.0
143-
poppler_CHECKSUM := e26ab29f68065de4d6562f0a3e2b5435a83ca92be573b99a1c81998fa286a4d4
141+
# upstream version is 21.06.1
142+
poppler_VERSION := 21.08.0
143+
poppler_CHECKSUM := e9cf5dc5964bce4bb0264d1c4f8122706c910588b421cfc30abc97d6b23e602d
144144
poppler_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/poppler-[0-9]*.patch)))
145145
poppler_SUBDIR := poppler-$(poppler_VERSION)
146146
poppler_FILE := poppler-$(poppler_VERSION).tar.xz
@@ -700,7 +700,7 @@ define openexr_BUILD
700700
-DOPENEXR_INSTALL_PKG_CONFIG=ON \
701701
-DOPENEXR_ENABLE_THREADING=$(if $(WIN32_THREADS),OFF,ON) \
702702
-DOPENEXR_INSTALL_TOOLS=OFF \
703-
-DOPENEXR_BUILD_UTILS=OFF \
703+
-DOPENEXR_BUILD_TOOLS=OFF \
704704
-DBUILD_TESTING=OFF \
705705
'$(SOURCE_DIR)'
706706
$(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'

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

Lines changed: 6 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -69,22 +69,14 @@ index 1111111..2222222 100644
6969
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
7070
From: Kleis Auke Wolthuizen <[email protected]>
7171
Date: Sat, 6 Mar 2021 22:50:00 +0100
72-
Subject: [PATCH 3/7] Avoid using version script on llvm-mingw
72+
Subject: [PATCH 3/7] Ensure module-definition uses the correct library name on
73+
MinGW-w64
7374

7475

7576
diff --git a/build/cmake/exports.cmake b/build/cmake/exports.cmake
7677
index 1111111..2222222 100644
7778
--- a/build/cmake/exports.cmake
7879
+++ b/build/cmake/exports.cmake
79-
@@ -19,7 +19,7 @@ include("${AOM_ROOT}/build/cmake/exports_sources.cmake")
80-
function(setup_exports_target)
81-
if("${AOM_TARGET_SYSTEM}" STREQUAL "Darwin")
82-
set(symbol_file_ext "syms")
83-
- elseif("${AOM_TARGET_SYSTEM}" MATCHES "Windows\|MSYS" AND MSVC)
84-
+ elseif("${AOM_TARGET_SYSTEM}" MATCHES "Windows\|MSYS")
85-
set(symbol_file_ext "def")
86-
else()
87-
set(symbol_file_ext "ver")
8880
@@ -33,8 +33,7 @@ function(setup_exports_target)
8981
-DAOM_CONFIG_DIR="${AOM_CONFIG_DIR}"
9082
-DAOM_TARGET_SYSTEM=${AOM_TARGET_SYSTEM}
@@ -95,59 +87,28 @@ index 1111111..2222222 100644
9587
-DCONFIG_NAME=$<CONFIG>
9688
-DCONFIG_AV1_DECODER=${CONFIG_AV1_DECODER}
9789
-DCONFIG_AV1_ENCODER=${CONFIG_AV1_ENCODER}
98-
@@ -54,15 +53,8 @@ function(setup_exports_target)
99-
APPEND_STRING
100-
PROPERTY LINK_FLAGS "-exported_symbols_list ${aom_sym_file}")
101-
elseif(WIN32)
102-
- if(NOT MSVC)
103-
- set_property(TARGET aom
104-
- APPEND_STRING
105-
- PROPERTY LINK_FLAGS "-Wl,--version-script ${aom_sym_file}")
106-
- else()
107-
- set_property(TARGET aom
108-
- APPEND_STRING
109-
- PROPERTY LINK_FLAGS "/DEF:${aom_sym_file}")
110-
- endif()
111-
+ set_property(SOURCE "${aom_sym_file}" PROPERTY GENERATED 1)
112-
+ target_sources(aom PRIVATE "${aom_sym_file}")
113-
114-
# TODO(tomfinegan): Sort out the import lib situation and flags for MSVC.
115-
11690
diff --git a/build/cmake/generate_exports.cmake b/build/cmake/generate_exports.cmake
11791
index 1111111..2222222 100644
11892
--- a/build/cmake/generate_exports.cmake
11993
+++ b/build/cmake/generate_exports.cmake
120-
@@ -23,8 +23,8 @@ include("${AOM_ROOT}/build/cmake/exports_sources.cmake")
121-
94+
@@ -24,7 +24,7 @@ include("${AOM_ROOT}/build/cmake/exports_sources.cmake")
12295
if("${AOM_TARGET_SYSTEM}" STREQUAL "Darwin")
12396
set(symbol_prefix "_")
124-
-elseif("${AOM_TARGET_SYSTEM}" MATCHES "Windows\|MSYS" AND AOM_MSVC)
97+
elseif("${AOM_TARGET_SYSTEM}" MATCHES "Windows\|MSYS")
12598
- file(WRITE "${AOM_SYM_FILE}" "LIBRARY aom\n" "EXPORTS\n")
126-
+elseif("${AOM_TARGET_SYSTEM}" MATCHES "Windows\|MSYS")
12799
+ file(WRITE "${AOM_SYM_FILE}" "LIBRARY ${AOM_LIB_PREFIX}aom\n" "EXPORTS\n")
128100
else()
129101
set(symbol_suffix ";")
130102
endif()
131-
@@ -33,8 +33,8 @@ set(aom_sym_file "${AOM_SYM_FILE}")
132-
103+
@@ -34,7 +34,7 @@ set(aom_sym_file "${AOM_SYM_FILE}")
133104
if("${AOM_TARGET_SYSTEM}" STREQUAL "Darwin")
134105
file(REMOVE "${aom_sym_file}")
135-
-elseif("${AOM_TARGET_SYSTEM}" MATCHES "Windows\|MSYS" AND AOM_MSVC)
106+
elseif("${AOM_TARGET_SYSTEM}" MATCHES "Windows\|MSYS")
136107
- file(WRITE "${aom_sym_file}" "LIBRARY aom\n" "EXPORTS\n")
137-
+elseif("${AOM_TARGET_SYSTEM}" MATCHES "Windows\|MSYS")
138108
+ file(WRITE "${aom_sym_file}" "LIBRARY ${AOM_LIB_PREFIX}aom\n" "EXPORTS\n")
139109
else()
140110
file(WRITE "${aom_sym_file}" "{\nglobal:\n")
141111
endif()
142-
@@ -47,7 +47,7 @@ endforeach()
143-
144-
foreach(exported_symbol ${exported_symbols})
145-
string(STRIP "${exported_symbol}" exported_symbol)
146-
- if("${AOM_TARGET_SYSTEM}" MATCHES "Windows\|MSYS" AND AOM_MSVC)
147-
+ if("${AOM_TARGET_SYSTEM}" MATCHES "Windows\|MSYS")
148-
string(SUBSTRING ${exported_symbol} 0 4 export_type)
149-
string(COMPARE EQUAL "${export_type}" "data" is_data)
150-
if(is_data)
151112

152113
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
153114
From: Kleis Auke Wolthuizen <[email protected]>

‎build/patches/mxe-fixes.patch‎

Lines changed: 70 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
55
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
66
From: Kleis Auke Wolthuizen <[email protected]>
77
Date: Fri, 14 Feb 2020 15:20:00 +0100
8-
Subject: [PATCH 1/4] Add support for targeting ARM/ARM64
8+
Subject: [PATCH 1/6] Add support for targeting ARM/ARM64
99

1010
See: mxe/mxe#2330
1111

@@ -86,7 +86,7 @@ index 1111111..2222222 100644
8686
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
8787
From: Kleis Auke Wolthuizen <[email protected]>
8888
Date: Sat, 17 Jul 2021 15:00:00 +0200
89-
Subject: [PATCH 2/4] Improve meson wrapper
89+
Subject: [PATCH 2/6] Improve meson wrapper
9090

9191

9292
diff --git a/plugins/meson-wrapper/conf/mxe-crossfile.meson.in b/plugins/meson-wrapper/conf/mxe-crossfile.meson.in
@@ -149,10 +149,76 @@ index 1111111..2222222 100644
149149
-DINPUT='$(PWD)/plugins/meson-wrapper/conf/target-meson.in' \
150150
-DOUTPUT='$(PREFIX)/bin/$(TARGET)-meson'
151151

152+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
153+
From: Kleis Auke Wolthuizen <[email protected]>
154+
Date: Sun, 18 Jul 2021 11:30:00 +0200
155+
Subject: [PATCH 3/6] Ensure grep is non-recursive and done only on *.mk files
156+
157+
For example, this prevents all files under log/, usr/, pkg/, etc.
158+
from being grep'd when MXE_PLUGIN_DIRS is set to $PWD.
159+
160+
diff --git a/mxe.updates.mk b/mxe.updates.mk
161+
index 1111111..2222222 100644
162+
--- a/mxe.updates.mk
163+
+++ b/mxe.updates.mk
164+
@@ -24,9 +24,9 @@ define GET_LATEST_VERSION
165+
tail -1
166+
endef
167+
168+
-ALL_DIRS := $(MXE_PLUGIN_DIRS) $(shell find $(realpath $(TOP_DIR)/plugins) -type d)
169+
+ALL_DIRS := $(MXE_PLUGIN_DIRS) $(shell find $(realpath $(TOP_DIR)/plugins) -mindepth 1 -type d)
170+
GET_LATEST_VERSION_PKGS := $(sort \
171+
- $(basename $(notdir $(shell grep -l GET_LATEST_VERSION -r $(ALL_DIRS)))))
172+
+ $(basename $(notdir $(shell grep -s -l GET_LATEST_VERSION $(addsuffix /*.mk,$(ALL_DIRS))))))
173+
174+
.PHONY: check-get-latest-version
175+
check-get-latest-version:
176+
177+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
178+
From: Kleis Auke Wolthuizen <[email protected]>
179+
Date: Sun, 18 Jul 2021 12:00:00 +0200
180+
Subject: [PATCH 4/6] Use recursively expanded variables where possible
181+
182+
This should be safe in terms of performance, since these variables
183+
are evaluated only once.
184+
185+
diff --git a/mxe.patch.mk b/mxe.patch.mk
186+
index 1111111..2222222 100644
187+
--- a/mxe.patch.mk
188+
+++ b/mxe.patch.mk
189+
@@ -115,9 +115,9 @@ $(PREFIX)/installed/patch/%:
190+
@touch '$@'
191+
192+
193+
-PATCH_FORMAT_PATCHES := $(shell find $(MXE_PLUGIN_DIRS) plugins -name "*-$(PATCH_NAME).patch")
194+
-PATCH_FORMAT_PKGS := $(sort $(subst -$(PATCH_NAME),,$(basename $(notdir $(PATCH_FORMAT_PATCHES)))))
195+
-PATCH_FORMAT_DIRS := $(sort $(basename $(dir $(PATCH_FORMAT_PATCHES))))
196+
+PATCH_FORMAT_PATCHES = $(shell find $(MXE_PLUGIN_DIRS) plugins -name "*-$(PATCH_NAME).patch")
197+
+PATCH_FORMAT_PKGS = $(sort $(subst -$(PATCH_NAME),,$(basename $(notdir $(PATCH_FORMAT_PATCHES)))))
198+
+PATCH_FORMAT_DIRS = $(sort $(basename $(dir $(PATCH_FORMAT_PATCHES))))
199+
200+
.PHONY: refresh-patches
201+
refresh-patches:
202+
diff --git a/mxe.updates.mk b/mxe.updates.mk
203+
index 1111111..2222222 100644
204+
--- a/mxe.updates.mk
205+
+++ b/mxe.updates.mk
206+
@@ -24,8 +24,8 @@ define GET_LATEST_VERSION
207+
tail -1
208+
endef
209+
210+
-ALL_DIRS := $(MXE_PLUGIN_DIRS) $(shell find $(realpath $(TOP_DIR)/plugins) -mindepth 1 -type d)
211+
-GET_LATEST_VERSION_PKGS := $(sort \
212+
+ALL_DIRS = $(MXE_PLUGIN_DIRS) $(shell find $(realpath $(TOP_DIR)/plugins) -mindepth 1 -type d)
213+
+GET_LATEST_VERSION_PKGS = $(sort \
214+
$(basename $(notdir $(shell grep -s -l GET_LATEST_VERSION $(addsuffix /*.mk,$(ALL_DIRS))))))
215+
216+
.PHONY: check-get-latest-version
217+
152218
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
153219
From: Kleis Auke Wolthuizen <[email protected]>
154220
Date: Tue, 3 Mar 2020 15:00:00 +0100
155-
Subject: [PATCH 3/4] Update libffi test
221+
Subject: [PATCH 5/6] Update libffi test
156222

157223
See:
158224
http://www.chiark.greenend.org.uk/doc/libffi-dev/html/Simple-Example.html#Simple-Example
@@ -203,7 +269,7 @@ index 1111111..2222222 100644
203269
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
204270
From: Kleis Auke Wolthuizen <[email protected]>
205271
Date: Tue, 2 Mar 2021 13:00:00 +0100
206-
Subject: [PATCH 4/4] Allow networking when MXE_ENABLE_NETWORK is set
272+
Subject: [PATCH 6/6] Allow networking when MXE_ENABLE_NETWORK is set
207273

208274

209275
diff --git a/Makefile b/Makefile

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,28 @@ index 1111111..2222222 100644
172172
_fromYca->readPixels (scanLine1, scanLine2);
173173
}
174174
else
175+
diff --git a/src/lib/OpenEXRCore/unpack.c b/src/lib/OpenEXRCore/unpack.c
176+
index 1111111..2222222 100644
177+
--- a/src/lib/OpenEXRCore/unpack.c
178+
+++ b/src/lib/OpenEXRCore/unpack.c
179+
@@ -11,7 +11,7 @@
180+
#include <string.h>
181+
182+
#if defined(__x86_64__) || defined(_M_X64)
183+
-# ifndef _WIN32
184+
+# if !defined(_MSC_VER) || defined(__clang__)
185+
# include <cpuid.h>
186+
# endif
187+
#endif
188+
@@ -143,7 +143,7 @@ static void (*half_to_float_buffer) (float*, const uint16_t*, int) =
189+
static void
190+
choose_half_to_float_impl ()
191+
{
192+
-# ifdef _WIN32
193+
+# if defined(_MSC_VER) && !defined(__clang__)
194+
int regs[4];
195+
196+
__cpuid (regs, 0);
175197

176198
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
177199
From: Kleis Auke Wolthuizen <[email protected]>

0 commit comments

Comments
 (0)