Skip to content

Commit

Permalink
zlib-ng: update to 2.2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
bgilbert authored and jpakkane committed Jan 3, 2025
1 parent 494c7a6 commit a5c47ff
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 18 deletions.
1 change: 1 addition & 0 deletions releases.json
Original file line number Diff line number Diff line change
Expand Up @@ -3965,6 +3965,7 @@
"zlib-ng"
],
"versions": [
"2.2.3-1",
"2.2.2-1"
]
},
Expand Down
14 changes: 6 additions & 8 deletions subprojects/packagefiles/zlib-ng/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -120,15 +120,12 @@ foreach attr: [
endforeach

foreach opt: [
['unaligned', 'Unaligned reads allowed', [], ['-DNO_UNALIGNED']],
['inflate-strict', 'Inflate strict distance checking', ['-DINFLATE_STRICT'], []],
['inflate-allow-invalid-dist', 'Zero fill for inflate invalid distances', ['-DINFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR'], []],
['inflate-strict', 'Inflate strict distance checking', ['-DINFLATE_STRICT']],
['inflate-allow-invalid-dist', 'Zero fill for inflate invalid distances', ['-DINFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR']],
]
enable = get_option(opt[0])
if enable
compile_args += opt[2]
else
compile_args += opt[3]
endif
summary(opt[1], enable, section: general_section, bool_yn: true)
endforeach
Expand Down Expand Up @@ -804,7 +801,7 @@ elif cpu_family in ['x86', 'x86_64']
if cc_id == 'msvc'
avx2flags = ['/arch:AVX2']
else
avx2flags = ['-mavx2']
avx2flags = ['-mavx2', '-mbmi2']
endif
want_avx2 = get_option('avx2').require(have_sse42)
have_avx2 = want_avx2.allowed() and cc.compiles(
Expand Down Expand Up @@ -834,7 +831,7 @@ elif cpu_family in ['x86', 'x86_64']
if cc_id == 'msvc'
avx512flags = ['/arch:AVX512']
else
avx512flags = ['-mavx512f', '-mavx512dq', '-mavx512bw', '-mavx512vl']
avx512flags = ['-mavx512f', '-mavx512dq', '-mavx512bw', '-mavx512vl', '-mbmi2']
# For CPUs that can benefit from AVX512, it seems GCC generates suboptimal
# instruction scheduling unless you specify a reasonable -mtune= target
foreach mtune: ['-mtune=cascadelake', '-mtune=skylake-avx512']
Expand All @@ -859,6 +856,7 @@ elif cpu_family in ['x86', 'x86_64']
arch_libs += static_library(
'avx512',
archdir / 'adler32_avx512.c',
archdir / 'chunkset_avx512.c',
c_args: compile_args + avx512flags,
link_args: link_args,
)
Expand All @@ -869,7 +867,7 @@ elif cpu_family in ['x86', 'x86_64']
if cc_id == 'msvc'
avx512vnniflags = ['/arch:AVX512']
else
avx512vnniflags = ['-mavx512f', '-mavx512dq', '-mavx512bw', '-mavx512vl', '-mavx512vnni']
avx512vnniflags = ['-mavx512f', '-mavx512dq', '-mavx512bw', '-mavx512vl', '-mavx512vnni', '-mbmi2']
# For CPUs that can benefit from AVX512, it seems GCC generates suboptimal
# instruction scheduling unless you specify a reasonable -mtune= target
foreach mtune: ['-mtune=cascadelake', '-mtune=skylake-avx512']
Expand Down
6 changes: 0 additions & 6 deletions subprojects/packagefiles/zlib-ng/meson_options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@ option(

# advanced options
# generic
option(
'unaligned',
description: 'Support unaligned reads on platforms that support it',
type: 'boolean',
value: true
)
option(
'inflate-strict',
description: 'Build with strict inflate distance checking',
Expand Down
8 changes: 4 additions & 4 deletions subprojects/zlib-ng.wrap
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[wrap-file]
directory = zlib-ng-2.2.2
source_url = https://github.com/zlib-ng/zlib-ng/archive/refs/tags/2.2.2.tar.gz
source_filename = zlib-ng-2.2.2.tar.gz
source_hash = fcb41dd59a3f17002aeb1bb21f04696c9b721404890bb945c5ab39d2cb69654c
directory = zlib-ng-2.2.3
source_url = https://github.com/zlib-ng/zlib-ng/archive/refs/tags/2.2.3.tar.gz
source_filename = zlib-ng-2.2.3.tar.gz
source_hash = f2fb245c35082fe9ea7a22b332730f63cf1d42f04d84fe48294207d033cba4dd
patch_directory = zlib-ng

[provide]
Expand Down

0 comments on commit a5c47ff

Please sign in to comment.