From 5cf3b92661cedc862038c289754df75e2290544c Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Sat, 28 Jan 2023 09:15:13 +0100 Subject: [PATCH] ci/dxvk: uprev to 2.1 Major uprev, requires VK 1.3 now. Acked-by: Martin Roukala Signed-off-by: David Heidelberg Part-of: --- .gitlab-ci/container/install-wine-dxvk.sh | 43 +++++++++++-------------------- .gitlab-ci/image-tags.yml | 6 ++--- 2 files changed, 18 insertions(+), 31 deletions(-) diff --git a/.gitlab-ci/container/install-wine-dxvk.sh b/.gitlab-ci/container/install-wine-dxvk.sh index a7ebb20..9bc53e8 100755 --- a/.gitlab-ci/container/install-wine-dxvk.sh +++ b/.gitlab-ci/container/install-wine-dxvk.sh @@ -1,40 +1,27 @@ -#!/bin/bash +#!/usr/bin/env bash set -e +overrideDll() { + if ! wine64 reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "$1" /d native /f; then + echo -e "Failed to add override for $1" + exit 1 + fi +} + dxvk_install_release() { - local DXVK_VERSION=${1:-"1.10.3"} + local DXVK_VERSION=${1:?} curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \ -O "https://github.com/doitsujin/dxvk/releases/download/v${DXVK_VERSION}/dxvk-${DXVK_VERSION}.tar.gz" tar xzpf dxvk-"${DXVK_VERSION}".tar.gz - # https://github.com/doitsujin/dxvk/issues/2921 - sed -i 's/wine="wine"/wine="wine32"/' "dxvk-${DXVK_VERSION}"/setup_dxvk.sh - "dxvk-${DXVK_VERSION}"/setup_dxvk.sh install + cp "dxvk-${DXVK_VERSION}"/x64/*.dll "$WINEPREFIX/drive_c/windows/system32/" + overrideDll d3d9 + overrideDll d3d10core + overrideDll d3d11 + overrideDll dxgi rm -rf "dxvk-${DXVK_VERSION}" rm dxvk-"${DXVK_VERSION}".tar.gz } -# Install from a Github PR number -dxvk_install_pr() { - local __prnum=$1 - - # NOTE: Clone all the ensite history of the repo so as not to think - # harder about cloning just enough for 'git describe' to work. 'git - # describe' is used by the dxvk build system to generate a - # dxvk_version Meson variable, which is nice-to-have. - git clone https://github.com/doitsujin/dxvk - pushd dxvk - git fetch origin pull/"$__prnum"/head:pr - git checkout pr - ./package-release.sh pr ../dxvk-build --no-package - popd - pushd ./dxvk-build/dxvk-pr - ./setup_dxvk.sh install - popd - rm -rf ./dxvk-build ./dxvk -} - -dxvk_install_release "1.10.1" -#dxvk_install_pr 2359 - +dxvk_install_release "2.1" diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 3f8f1a0..830fc46 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -16,12 +16,12 @@ variables: DEBIAN_X86_TEST_ANDROID_IMAGE_PATH: "debian/x86_test-android" DEBIAN_X86_TEST_ANDROID_TAG: "2023-04-12-deqp-egl" - DEBIAN_X86_TEST_GL_TAG: "2023-04-12-deqp-egl" - DEBIAN_X86_TEST_VK_TAG: "2023-04-12-deqp-egl" + DEBIAN_X86_TEST_GL_TAG: "2023-04-14-dxvk-2.1-1" + DEBIAN_X86_TEST_VK_TAG: "2023-04-14-dxvk-2.1-1" ALPINE_X86_BUILD_TAG: "2023-03-20-3.17-bump" FEDORA_X86_BUILD_TAG: "2023-03-13-procps-ng" - KERNEL_ROOTFS_TAG: "2023-04-12-deqp-egl" + KERNEL_ROOTFS_TAG: "2023-04-14-dxvk-2.1-1" WINDOWS_X64_VS_PATH: "windows/x64_vs" WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib" -- 2.7.4