bug#68005: closed ([PATCH] gnu: Remove dxvk.)

[GNU bug Tracking System]

Your message dated Sun, 31 Dec 2023 12:34:03 +0100
with message-id <e96d15c19a7163c3b9ede6674bc0750913eac5df.camel@gmail.com>
and subject line Re: [PATCH] gnu: wine-staging: Update to 8.18.
has caused the debbugs.gnu.org bug report #68005,
regarding [PATCH] gnu: Remove dxvk.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
68005: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=68005
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> 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
>
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: [PATCH] gnu: wine-staging: Update to 8.18.
>
>
>
>
> Date: 
>
> Sun, 31 Dec 2023 12:34:03 +0100
>
>
>
>
> User-agent: 
>
> Evolution 3.46.4 
>
>
>
>
> 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
>
>
>
> --- End Message ---