GNU bug report logs - #68005
[PATCH] gnu: Remove dxvk.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 68005 in the body.
You can then email your comments to 68005 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Kaelyn Takata <kaelyn.alexi <at> protonmail.com>
To: guix-patches <at> gnu.org
Cc: Kaelyn Takata <kaelyn.alexi <at> protonmail.com>
Subject: [PATCH] gnu: Remove dxvk.
Date: Sun, 24 Dec 2023 15:35:02 +0000

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(-)

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"))))

base-commit: 0d13d095420861022e68e87ceebd5e037e12a8b3
-- 
2.41.0

Message #10 received at 68005-done <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Kaelyn <kaelyn.alexi <at> protonmail.com>
Cc: 68005-done <at> debbugs.gnu.org, 66936-done <at> debbugs.gnu.org
Subject: Re: [PATCH] gnu: wine-staging: Update to 8.18.
Date: Sun, 31 Dec 2023 12:34:03 +0100

Am Samstag, dem 09.12.2023 um 18:11 +0000 schrieb Kaelyn:
> I'm sending a v2 of the patch rebased against current master, with
> bash removed from the wine-staging-patchset-data native-inputs and
> the commit message expanded with your suggestions (plus noting the
> bash removal).
I sadly didn't receive the v2, so I'm commenting here instead.

I've pushed both this and the removal of dxvk now.

Thanks

Message #13 received at 68005-done <at> debbugs.gnu.org (full text, mbox):

From: Kaelyn <kaelyn.alexi <at> protonmail.com>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: 68005-done <at> debbugs.gnu.org, 66936-done <at> debbugs.gnu.org
Subject: Re: [PATCH] gnu: wine-staging: Update to 8.18.
Date: Sun, 31 Dec 2023 16:47:00 +0000

Hi Liliana,

On Sunday, December 31st, 2023 at 3:34 AM, Liliana Marie Prikler <liliana.prikler <at> gmail.com> wrote:

> 
> Am Samstag, dem 09.12.2023 um 18:11 +0000 schrieb Kaelyn:
> 
> > I'm sending a v2 of the patch rebased against current master, with
> > bash removed from the wine-staging-patchset-data native-inputs and
> > the commit message expanded with your suggestions (plus noting the
> > bash removal).
> 
> I sadly didn't receive the v2, so I'm commenting here instead.
> 
> I've pushed both this and the removal of dxvk now.

Thank you for pushing these changes!

Cheers,
Kaelyn
> Thanks

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.