me
/
guix
Archived
1
0
Fork 0
Code

gnu: wine-staging: Add faudio support. 

* gnu/packages/wine.scm (wine-staging)[inputs]: Add faudio.
[arguments]: Adjust patchinstall.sh to faudio.
* gnu/packages/wine.scm (wine64-staging)[arguments]: Adjust patchinstall.sh to
faudio.
master
Rutger Helling 2019-03-03 10:52:46 +01:00
parent ea3510f8a7
commit 0fa3d705d2
No known key found for this signature in database
GPG Key ID: F3A727DB44FCCA36
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gnu/packages/wine.scm
View File

@ -368,6 +368,7 @@ integrate Windows applications into your desktop.")
(base32 (base32
"1d0gbwc8ll4mfxilw9j4vdzqlnracr6y8iss27nfg1qh0q7vbf9x")))) "1d0gbwc8ll4mfxilw9j4vdzqlnracr6y8iss27nfg1qh0q7vbf9x"))))
(inputs `(("autoconf" ,autoconf) ; for autoreconf (inputs `(("autoconf" ,autoconf) ; for autoreconf
("faudio" ,faudio)
("ffmpeg" ,ffmpeg) ("ffmpeg" ,ffmpeg)
("gtk+" ,gtk+) ("gtk+" ,gtk+)
("libva" ,libva) ("libva" ,libva)
@ -406,7 +407,10 @@ integrate Windows applications into your desktop.")
(script (string-append (assoc-ref %build-inputs (script (string-append (assoc-ref %build-inputs
"wine-staging-patchset-data") "wine-staging-patchset-data")
"/share/wine-staging/patches/patchinstall.sh"))) "/share/wine-staging/patches/patchinstall.sh")))
(invoke script (string-append "DESTDIR=" ".") "--all") ;; Exclude specific patches that conflict with FAudio.
(invoke script (string-append "DESTDIR=" ".") "--all" "-W"
"xaudio2-revert" "-W" "xaudio2_CommitChanges" "-W"
"xaudio2_7-WMA_support" "-W" "xaudio2_7-CreateFX-FXEcho")
#t))) #t)))
(add-after 'configure 'patch-dlopen-paths (add-after 'configure 'patch-dlopen-paths
;; Hardcode dlopened sonames to absolute paths. ;; Hardcode dlopened sonames to absolute paths.
@ -482,7 +486,10 @@ integrated into the main branch.")
(script (string-append (assoc-ref %build-inputs (script (string-append (assoc-ref %build-inputs
"wine-staging-patchset-data") "wine-staging-patchset-data")
"/share/wine-staging/patches/patchinstall.sh"))) "/share/wine-staging/patches/patchinstall.sh")))
(invoke script (string-append "DESTDIR=" ".") "--all") ;; Exclude specific patches that conflict with FAudio.
(invoke script (string-append "DESTDIR=" ".") "--all" "-W"
"xaudio2-revert" "-W" "xaudio2_CommitChanges" "-W"
"xaudio2_7-WMA_support" "-W" "xaudio2_7-CreateFX-FXEcho")
#t))) #t)))
(add-after 'install 'copy-wine32-binaries (add-after 'install 'copy-wine32-binaries
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)