diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh index ed59a0c3c23..ded8cb9ae2e 100644 --- a/.gitlab-ci/container/build-deqp.sh +++ b/.gitlab-ci/container/build-deqp.sh @@ -42,10 +42,6 @@ vk_cts_commits_to_backport=( # shellcheck disable=SC2034 vk_cts_patch_files=( - # Change zlib URL because the one from zlib.net requires a human-verification - # Forward-port of b61f15f09adb6b7c9eefc7f7c44612c0c390abe5 into modern dEQP codebase - build-deqp_Change-zlib-URL-because-the-one-from-zlib.net-requir.patch - # Derivate subgroup fix # https://github.com/KhronosGroup/VK-GL-CTS/pull/442 build-deqp_Use-subgroups-helper-in-derivate-tests.patch @@ -65,9 +61,6 @@ gl_cts_commits_to_backport=( # shellcheck disable=SC2034 gl_cts_patch_files=( - # Change zlib URL because the one from zlib.net requires a human-verification - # Forward-port of b61f15f09adb6b7c9eefc7f7c44612c0c390abe5 into modern dEQP codebase - build-deqp_Change-zlib-URL-because-the-one-from-zlib.net-requir.patch ) if [ "${DEQP_TARGET}" = 'android' ]; then diff --git a/.gitlab-ci/container/patches/build-deqp_Change-zlib-URL-because-the-one-from-zlib.net-requir.patch b/.gitlab-ci/container/patches/build-deqp_Change-zlib-URL-because-the-one-from-zlib.net-requir.patch deleted file mode 100644 index 78f4106dc13..00000000000 --- a/.gitlab-ci/container/patches/build-deqp_Change-zlib-URL-because-the-one-from-zlib.net-requir.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5f0e537c89d9f3b356166c409303b38777f2e3de Mon Sep 17 00:00:00 2001 -From: Lorenzo Dal Col -Date: Thu, 18 Jan 2024 22:13:49 +0100 -Subject: [PATCH] Change zlib URL because the one from zlib.net requires a - human-verification - -VK-GL-CTS issue: 4895 - -This does not affect any test. - -Change-Id: I7002062f46f957dd865d66387dde3e53d3b2c5f0 -Signed-off-by: Eric Engestrom ---- - external/fetch_sources.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/external/fetch_sources.py b/external/fetch_sources.py -index 081aea023d5683698653..7b107d5026b3dbb246c2 100644 ---- a/external/fetch_sources.py -+++ b/external/fetch_sources.py -@@ -290,7 +290,7 @@ def postExtractLibpng (path): - - PACKAGES = [ - SourcePackage( -- "http://zlib.net/fossils/zlib-1.2.13.tar.gz", -+ "https://github.com/madler/zlib/releases/download/v1.2.13/zlib-1.2.13.tar.gz", - "b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30", - "zlib"), - SourcePackage( --- -Cheers, - Eric -