mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
Compare commits
2 commits
d6d05a68b8
...
b17e20f60b
Author | SHA1 | Date | |
---|---|---|---|
|
b17e20f60b | ||
|
06c9fd8cf6 |
2 changed files with 15 additions and 11 deletions
|
@ -6088,7 +6088,7 @@ server.")
|
||||||
(base32 "17z6rrvv3q1axy9r13c2hln2pazfn9n5bhkzrbjcjakgbfjl6mss"))))
|
(base32 "17z6rrvv3q1axy9r13c2hln2pazfn9n5bhkzrbjcjakgbfjl6mss"))))
|
||||||
(build-system pyproject-build-system)
|
(build-system pyproject-build-system)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list python-lxml
|
(list python-lxml-4.9
|
||||||
python-pillow
|
python-pillow
|
||||||
python-pytest
|
python-pytest
|
||||||
python-setuptools))
|
python-setuptools))
|
||||||
|
|
|
@ -74,6 +74,7 @@
|
||||||
;;; Copyright © 2025 Sharlatan Hellseher <sharlatanus@gmail.ccom>
|
;;; Copyright © 2025 Sharlatan Hellseher <sharlatanus@gmail.ccom>
|
||||||
;;; Copyright © 2025 VnPower <vnpower@loang.net>
|
;;; Copyright © 2025 VnPower <vnpower@loang.net>
|
||||||
;;; Copyright © 2025 Zhu Zihao <all_but_last@163.com>
|
;;; Copyright © 2025 Zhu Zihao <all_but_last@163.com>
|
||||||
|
;;; Copyright © 2025 John Kehayias <john@guixotic.coop>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
@ -1910,16 +1911,22 @@ audio/video codec library.")
|
||||||
(base32
|
(base32
|
||||||
"1g8116rp4fgq82br8lclb2dmw3fvyh2zkzhnngm7z97pg1i0dypl"))))
|
"1g8116rp4fgq82br8lclb2dmw3fvyh2zkzhnngm7z97pg1i0dypl"))))
|
||||||
(arguments
|
(arguments
|
||||||
(if (target-x86-32?)
|
(substitute-keyword-arguments (package-arguments ffmpeg)
|
||||||
(substitute-keyword-arguments (package-arguments ffmpeg)
|
((#:modules modules %default-gnu-modules)
|
||||||
((#:phases phases)
|
`((srfi srfi-1) ,@modules))
|
||||||
|
((#:phases phases)
|
||||||
|
(if (target-x86-32?)
|
||||||
#~(modify-phases #$phases
|
#~(modify-phases #$phases
|
||||||
(replace 'bypass-openal-check
|
(replace 'bypass-openal-check
|
||||||
(lambda _
|
(lambda _
|
||||||
(substitute* "configure"
|
(substitute* "configure"
|
||||||
(("die \"ERROR: openal not found\"")
|
(("die \"ERROR: openal not found\"")
|
||||||
"true")))))))
|
"true")))))
|
||||||
(package-arguments ffmpeg)))))
|
phases))
|
||||||
|
((#:configure-flags flags ''())
|
||||||
|
#~(fold delete #$flags '("--enable-libplacebo")))))
|
||||||
|
(inputs (modify-inputs (package-inputs ffmpeg)
|
||||||
|
(delete "libplacebo")))))
|
||||||
|
|
||||||
(define-public ffmpeg-4
|
(define-public ffmpeg-4
|
||||||
(package
|
(package
|
||||||
|
@ -1932,16 +1939,13 @@ audio/video codec library.")
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"01xb2vj4n52fv2y56n5ifirgzlg16qbgfg98f6ifbbhm6l6lwlgr"))))
|
"01xb2vj4n52fv2y56n5ifirgzlg16qbgfg98f6ifbbhm6l6lwlgr"))))
|
||||||
(inputs (modify-inputs (package-inputs ffmpeg)
|
(inputs (modify-inputs (package-inputs ffmpeg-5)
|
||||||
(replace "sdl2" sdl2-2.0)))
|
(replace "sdl2" sdl2-2.0)))
|
||||||
(arguments
|
(arguments
|
||||||
(substitute-keyword-arguments (package-arguments ffmpeg-5)
|
(substitute-keyword-arguments (package-arguments ffmpeg-5)
|
||||||
((#:modules modules %default-gnu-modules)
|
|
||||||
`((srfi srfi-1) ,@modules))
|
|
||||||
((#:configure-flags flags ''())
|
((#:configure-flags flags ''())
|
||||||
#~(cons "--enable-avresample"
|
#~(cons "--enable-avresample"
|
||||||
(fold delete #$flags '("--enable-libplacebo"
|
(fold delete #$flags '("--enable-libshaderc"))))))))
|
||||||
"--enable-libshaderc"))))))))
|
|
||||||
|
|
||||||
(define-public ffmpeg-for-stepmania
|
(define-public ffmpeg-for-stepmania
|
||||||
(hidden-package
|
(hidden-package
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue