Unbreak Viewperf by reverting "util: use crc32_z instead of crc32 and bump zlib dep to 1.2.9"

It breaks apps shipping their own copy of zlib, such as Viewperf.
If we use crc32_z, Viewperf is unable to start because it's an undefined
symbol.

This reverts commit 010272b62e.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28233>
This commit is contained in:
Marek Olšák
2024-03-17 17:54:32 -04:00
committed by Marge Bot
parent 97084199bb
commit 4ed3418a43
2 changed files with 14 additions and 9 deletions

View File

@@ -1541,7 +1541,8 @@ else
dep_clock = cc.find_library('rt')
endif
dep_zlib = dependency('zlib', version : '>= 1.2.9',
# IMPORTANT: We can't upgrade Zlib beyond 1.2.5 because it would break Viewperf.
dep_zlib = dependency('zlib', version : '>= 1.2.3',
allow_fallback: true,
required : get_option('zlib'))
if dep_zlib.found()