From patchwork Sun Dec 24 15:35:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 58022 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C3D6227BBEA; Sun, 24 Dec 2023 15:36:07 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5B73227BBE2 for ; Sun, 24 Dec 2023 15:36:06 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rHQWF-0003jV-HI; Sun, 24 Dec 2023 10:35:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rHQWD-0003jI-1t for guix-patches@gnu.org; Sun, 24 Dec 2023 10:35:57 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rHQWC-00013L-Pf for guix-patches@gnu.org; Sun, 24 Dec 2023 10:35:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rHQWI-0003CY-8G for guix-patches@gnu.org; Sun, 24 Dec 2023 10:36:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68005] [PATCH] gnu: Remove dxvk. Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Dec 2023 15:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68005 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68005@debbugs.gnu.org Cc: Kaelyn Takata X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170343214012274 (code B ref -1); Sun, 24 Dec 2023 15:36:02 +0000 Received: (at submit) by debbugs.gnu.org; 24 Dec 2023 15:35:40 +0000 Received: from localhost ([127.0.0.1]:53360 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHQVw-0003Br-3q for submit@debbugs.gnu.org; Sun, 24 Dec 2023 10:35:40 -0500 Received: from lists.gnu.org ([2001:470:142::17]:35624) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHQVr-0003BW-5Y for submit@debbugs.gnu.org; Sun, 24 Dec 2023 10:35:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rHQVf-0003cR-IJ for guix-patches@gnu.org; Sun, 24 Dec 2023 10:35:23 -0500 Received: from mail-40133.protonmail.ch ([185.70.40.133]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rHQVc-0000M5-NR for guix-patches@gnu.org; Sun, 24 Dec 2023 10:35:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1703432114; x=1703691314; bh=tB61YdW8H0cGX7U0Gz+xr2VNr6zeXL2WH/IDIJMUjUY=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=GnMZNKwqBsmA2sKqU/HfWw64yLKySyAb1GF2Da9RQQ77af6s+/ceUK09f3t9ftIHl lpY+WjkEL4PdvYSjqSo/jTzLk8dmow3y7ymrqfLhU2L1DPqFJ7zU5/R2cVNjXW3qUA vLBs/qSq4kqLQuHMdmFFLYf4BEQ5KBSDc7a3uZFWE9pYTPof7nzCJ9bLRqUe9poeoc W01l1A03zdJ9+zh3Nq5kYggyt9XhT07vNRQAbGki+PVw4pa6ejImNPh7DastF98KWO i2ZFD6QWGD6QU4V1gg03Fne9jtDFONEZgTN7pZCsDMw+sHLSj24XQPNGU5+LvohvvT z1oAPpXPL+m+Q== Date: Sun, 24 Dec 2023 15:35:02 +0000 Message-ID: <1c689ee56afaafdc94806917952535e74b2a2ba8.1703432060.git.kaelyn.alexi@protonmail.com> Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.133; envelope-from=kaelyn.alexi@protonmail.com; helo=mail-40133.protonmail.ch X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Kaelyn Takata X-ACL-Warn: , Kaelyn Takata via Guix-patches X-Patchwork-Original-From: Kaelyn Takata via Guix-patches via From: Kaelyn Takata Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This package has been broken for some time, and upstream removed support for building with winelib in version 1.7 released in May 2020. * gnu/packages/wine.scm (dxvk): Delete variable. Change-Id: I393853aa6e0c9257907549f346a36a1fe37a61a0 --- gnu/packages/wine.scm | 84 ------------------------------------------- 1 file changed, 84 deletions(-) base-commit: 0d13d095420861022e68e87ceebd5e037e12a8b3 diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 400f0e7607..5cbed406aa 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -425,87 +425,3 @@ (define-public wine64-staging (synopsis "Implementation of the Windows API (staging branch, WoW64 version)") (supported-systems '("x86_64-linux" "aarch64-linux")))) - -(define dxvk32 - ;; This package provides 32-bit dxvk libraries on 64-bit systems. - (package - (name "dxvk32") - (version "1.5.5") - (home-page "https://github.com/doitsujin/dxvk/") - (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1inl0qswgvbp0fs76md86ilqf9mbshkpjm8ga81khn9zd6v3fvan")))) - (build-system meson-build-system) - (arguments - `(#:system "i686-linux" - #:configure-flags (list "--cross-file" - (string-append (assoc-ref %build-inputs "source") - "/build-wine32.txt")))) - (native-inputs - `(("glslang" ,glslang))) - (inputs - `(("wine" ,wine-staging))) - (synopsis "Vulkan-based D3D9, D3D10 and D3D11 implementation for Wine") - (description "A Vulkan-based translation layer for Direct3D 9/10/11 which -allows running complex 3D applications with high performance using Wine. - -Use @command{setup_dxvk} to install the required libraries to a Wine prefix.") - (supported-systems '("x86_64-linux")) - (license license:zlib))) - -(define-public dxvk - (package - (inherit dxvk32) - (name "dxvk") - (arguments - `(#:configure-flags (list "--cross-file" - (string-append (assoc-ref %build-inputs "source") - "/build-wine" - ,(match (%current-system) - ("x86_64-linux" "64") - (_ "32")) - ".txt")) - #:phases - (modify-phases %standard-phases - ,@(if (string=? (%current-system) "x86_64-linux") - `((add-after 'unpack 'install-32 - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (dxvk32 (assoc-ref inputs "dxvk32"))) - (mkdir-p (string-append out "/lib32")) - (copy-recursively (string-append dxvk32 "/lib") - (string-append out "/lib32")) - #t)))) - '()) - (add-after 'install 'install-setup - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin/setup_dxvk"))) - (mkdir-p (string-append out "/bin")) - (copy-file "../source/setup_dxvk.sh" - bin) - (chmod bin #o755) - (substitute* bin - (("wine=\"wine\"") - (string-append "wine=" (assoc-ref inputs "wine") "/bin/wine")) - (("x32") ,(match (%current-system) - ("x86_64-linux" "../lib32") - (_ "../lib"))) - (("x64") "../lib")))))))) - (inputs - `(("wine" ,(match (%current-system) - ;; ("x86_64-linux" wine64) - ("x86_64-linux" wine64-staging) - ;; ("x86_64-linux" mingw-w64-x86_64) - (_ wine))) - ,@(match (%current-system) - ("x86_64-linux" - `(("dxvk32" ,dxvk32))) - (_ '())))) - (supported-systems '("i686-linux" "x86_64-linux"))))