Skip to content

Commit a5c47ff

Browse files
bgilbertjpakkane
authored andcommitted
zlib-ng: update to 2.2.3
1 parent 494c7a6 commit a5c47ff

File tree

4 files changed

+11
-18
lines changed

4 files changed

+11
-18
lines changed

Diff for: releases.json

+1
Original file line numberDiff line numberDiff line change
@@ -3965,6 +3965,7 @@
39653965
"zlib-ng"
39663966
],
39673967
"versions": [
3968+
"2.2.3-1",
39683969
"2.2.2-1"
39693970
]
39703971
},

Diff for: subprojects/packagefiles/zlib-ng/meson.build

+6-8
Original file line numberDiff line numberDiff line change
@@ -120,15 +120,12 @@ foreach attr: [
120120
endforeach
121121

122122
foreach opt: [
123-
['unaligned', 'Unaligned reads allowed', [], ['-DNO_UNALIGNED']],
124-
['inflate-strict', 'Inflate strict distance checking', ['-DINFLATE_STRICT'], []],
125-
['inflate-allow-invalid-dist', 'Zero fill for inflate invalid distances', ['-DINFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR'], []],
123+
['inflate-strict', 'Inflate strict distance checking', ['-DINFLATE_STRICT']],
124+
['inflate-allow-invalid-dist', 'Zero fill for inflate invalid distances', ['-DINFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR']],
126125
]
127126
enable = get_option(opt[0])
128127
if enable
129128
compile_args += opt[2]
130-
else
131-
compile_args += opt[3]
132129
endif
133130
summary(opt[1], enable, section: general_section, bool_yn: true)
134131
endforeach
@@ -804,7 +801,7 @@ elif cpu_family in ['x86', 'x86_64']
804801
if cc_id == 'msvc'
805802
avx2flags = ['/arch:AVX2']
806803
else
807-
avx2flags = ['-mavx2']
804+
avx2flags = ['-mavx2', '-mbmi2']
808805
endif
809806
want_avx2 = get_option('avx2').require(have_sse42)
810807
have_avx2 = want_avx2.allowed() and cc.compiles(
@@ -834,7 +831,7 @@ elif cpu_family in ['x86', 'x86_64']
834831
if cc_id == 'msvc'
835832
avx512flags = ['/arch:AVX512']
836833
else
837-
avx512flags = ['-mavx512f', '-mavx512dq', '-mavx512bw', '-mavx512vl']
834+
avx512flags = ['-mavx512f', '-mavx512dq', '-mavx512bw', '-mavx512vl', '-mbmi2']
838835
# For CPUs that can benefit from AVX512, it seems GCC generates suboptimal
839836
# instruction scheduling unless you specify a reasonable -mtune= target
840837
foreach mtune: ['-mtune=cascadelake', '-mtune=skylake-avx512']
@@ -859,6 +856,7 @@ elif cpu_family in ['x86', 'x86_64']
859856
arch_libs += static_library(
860857
'avx512',
861858
archdir / 'adler32_avx512.c',
859+
archdir / 'chunkset_avx512.c',
862860
c_args: compile_args + avx512flags,
863861
link_args: link_args,
864862
)
@@ -869,7 +867,7 @@ elif cpu_family in ['x86', 'x86_64']
869867
if cc_id == 'msvc'
870868
avx512vnniflags = ['/arch:AVX512']
871869
else
872-
avx512vnniflags = ['-mavx512f', '-mavx512dq', '-mavx512bw', '-mavx512vl', '-mavx512vnni']
870+
avx512vnniflags = ['-mavx512f', '-mavx512dq', '-mavx512bw', '-mavx512vl', '-mavx512vnni', '-mbmi2']
873871
# For CPUs that can benefit from AVX512, it seems GCC generates suboptimal
874872
# instruction scheduling unless you specify a reasonable -mtune= target
875873
foreach mtune: ['-mtune=cascadelake', '-mtune=skylake-avx512']

Diff for: subprojects/packagefiles/zlib-ng/meson_options.txt

-6
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@ option(
1919

2020
# advanced options
2121
# generic
22-
option(
23-
'unaligned',
24-
description: 'Support unaligned reads on platforms that support it',
25-
type: 'boolean',
26-
value: true
27-
)
2822
option(
2923
'inflate-strict',
3024
description: 'Build with strict inflate distance checking',

Diff for: subprojects/zlib-ng.wrap

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[wrap-file]
2-
directory = zlib-ng-2.2.2
3-
source_url = https://github.com/zlib-ng/zlib-ng/archive/refs/tags/2.2.2.tar.gz
4-
source_filename = zlib-ng-2.2.2.tar.gz
5-
source_hash = fcb41dd59a3f17002aeb1bb21f04696c9b721404890bb945c5ab39d2cb69654c
2+
directory = zlib-ng-2.2.3
3+
source_url = https://github.com/zlib-ng/zlib-ng/archive/refs/tags/2.2.3.tar.gz
4+
source_filename = zlib-ng-2.2.3.tar.gz
5+
source_hash = f2fb245c35082fe9ea7a22b332730f63cf1d42f04d84fe48294207d033cba4dd
66
patch_directory = zlib-ng
77

88
[provide]

0 commit comments

Comments
 (0)