all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Hartmut Goebel <h.goebel@crazy-compilers.com>
To: 38122@debbugs.gnu.org
Cc: Pierre Neidhardt <mail@ambrevar.xyz>
Subject: [bug#38122] [PATCH 005/197] gnu: Add dxvk.
Date: Fri,  8 Nov 2019 11:33:33 +0100	[thread overview]
Message-ID: <20191108103434.8390-6-h.goebel@crazy-compilers.com> (raw)
In-Reply-To: <20191108103434.8390-1-h.goebel@crazy-compilers.com>

From: Pierre Neidhardt <mail@ambrevar.xyz>

* gnu/packages/wine.scm (dxvk): New variable.
---
 gnu/packages/wine.scm | 84 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)

diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm
index e73432ba3a..e561d5c79e 100644
--- a/gnu/packages/wine.scm
+++ b/gnu/packages/wine.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
 ;;; Copyright © 2017 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -28,6 +29,7 @@
   #:use-module (guix git-download)
   #:use-module (guix utils)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system meson)
   #:use-module (guix build-system trivial)
   #:use-module (gnu packages)
   #:use-module (gnu packages admin)
@@ -50,6 +52,7 @@
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages kerberos)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages mingw)
   #:use-module (gnu packages openldap)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pulseaudio)
@@ -541,3 +544,84 @@ integrated into the main branch.")
     (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.4.4")
+    (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
+                "0zr8hqyig18q4wp96cmfrkrgxxbgxida6k8cv6qbbldni29qy20w"))))
+    (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)
+       ("wine" ,wine)))
+    (synopsis "Vulkan-based D3D11 and D3D10 implementation for Wine")
+    (description "A Vulkan-based translation layer for Direct3D 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"))))))
+             '())
+         (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"))))))))
+    (native-inputs
+     `(("glslang" ,glslang)
+       ("wine" ,(match (%current-system)
+                  ("x86_64-linux" wine64)
+                  (_ wine)))
+       ,@(match (%current-system)
+           ("x86_64-linux"
+            `(("dxvk32" ,dxvk32)))
+           (_ '()))))
+    (supported-systems '("i686-linux" "x86_64-linux"))))
-- 
2.21.0

  parent reply	other threads:[~2019-11-08 10:35 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-08 10:33 [bug#38122] [PATCH 0/1] qtwebkit: Uses sqlite-with-column-metadata Hartmut Goebel
2019-11-08 10:33 ` [bug#38122] [PATCH 001/197] gnu: Add emacs-eshell-prompt-extras Hartmut Goebel
2019-11-08 10:33   ` [bug#38122] [PATCH 1/1] gnu: qtwebkit: Uses sqlite-with-column-metadata Hartmut Goebel
2019-11-08 10:33   ` [bug#38122] [PATCH 002/197] gnu: Add emacs-eshell-did-you-mean Hartmut Goebel
2019-11-08 10:33   ` [bug#38122] [PATCH 003/197] gnu: Fix attribution Hartmut Goebel
2019-11-08 10:33   ` [bug#38122] [PATCH 004/197] gnu: make-nsis: Fix cross-compilation Hartmut Goebel
2019-11-08 10:33   ` Hartmut Goebel [this message]
2019-11-08 10:33   ` [bug#38122] [PATCH 006/197] gnu: Fix make-gcc-libc Hartmut Goebel
2019-11-08 10:33   ` [bug#38122] [PATCH 007/197] gnu: Add gitg Hartmut Goebel
2019-11-08 10:33   ` [bug#38122] [PATCH 008/197] gnu: Add python-keyutils Hartmut Goebel
2019-11-08 10:33   ` [bug#38122] [PATCH 009/197] gnu: Add udiskie Hartmut Goebel
2019-11-08 10:33   ` [bug#38122] [PATCH 010/197] services: ntp: Ensure no double quotes are output to config file Hartmut Goebel
2019-11-08 10:33   ` [bug#38122] [PATCH 011/197] gnu: pingus: Update source URI Hartmut Goebel
2019-11-08 10:33   ` [bug#38122] [PATCH 012/197] gnu: pingus: Adjust for GCC 7 Hartmut Goebel
2019-11-08 10:33   ` [bug#38122] [PATCH 013/197] gnu: Remove python2-feather-format Hartmut Goebel
2019-11-08 10:33   ` [bug#38122] [PATCH 014/197] gnu: u-boot: Remove redundant GCC input Hartmut Goebel
2019-11-08 10:33   ` [bug#38122] [PATCH 015/197] gnu: pocl: Update to 1.4 Hartmut Goebel
2019-11-08 10:33   ` [bug#38122] [PATCH 016/197] gnu: icecat: Update to 68.2.0-guix0-preview3 Hartmut Goebel
2019-11-08 10:33   ` [bug#38122] [PATCH 017/197] gnu: Chibi-Scheme: Update to 0.8 Hartmut Goebel
2019-11-08 10:33   ` [bug#38122] [PATCH 018/197] gnu: Chibi-Scheme: Do not use unstable tarball Hartmut Goebel
2019-11-08 10:33   ` [bug#38122] [PATCH 019/197] gnu: bitcoin-abc: Update to 0.20.4 Hartmut Goebel
2019-11-08 10:33   ` [bug#38122] [PATCH 020/197] services: ntp: Fix a crash when using legacy configuration Hartmut Goebel
2019-11-08 10:33   ` [bug#38122] [PATCH 021/197] gnu: musescore: Update to 3.3 Hartmut Goebel
2019-11-08 10:36 ` bug#38122: Faulty patchset Hartmut Goebel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191108103434.8390-6-h.goebel@crazy-compilers.com \
    --to=h.goebel@crazy-compilers.com \
    --cc=38122@debbugs.gnu.org \
    --cc=mail@ambrevar.xyz \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.