diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 654d4ab932b..b0416bb861b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6088,7 +6088,7 @@ server.") (base32 "17z6rrvv3q1axy9r13c2hln2pazfn9n5bhkzrbjcjakgbfjl6mss")))) (build-system pyproject-build-system) (native-inputs - (list python-lxml + (list python-lxml-4.9 python-pillow python-pytest python-setuptools)) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index a94dcf1460f..f49c2a47c11 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -74,6 +74,7 @@ ;;; Copyright © 2025 Sharlatan Hellseher ;;; Copyright © 2025 VnPower ;;; Copyright © 2025 Zhu Zihao +;;; Copyright © 2025 John Kehayias ;;; ;;; This file is part of GNU Guix. ;;; @@ -1910,16 +1911,22 @@ audio/video codec library.") (base32 "1g8116rp4fgq82br8lclb2dmw3fvyh2zkzhnngm7z97pg1i0dypl")))) (arguments - (if (target-x86-32?) - (substitute-keyword-arguments (package-arguments ffmpeg) - ((#:phases phases) + (substitute-keyword-arguments (package-arguments ffmpeg) + ((#:modules modules %default-gnu-modules) + `((srfi srfi-1) ,@modules)) + ((#:phases phases) + (if (target-x86-32?) #~(modify-phases #$phases (replace 'bypass-openal-check (lambda _ (substitute* "configure" (("die \"ERROR: openal not found\"") - "true"))))))) - (package-arguments ffmpeg))))) + "true"))))) + phases)) + ((#:configure-flags flags ''()) + #~(fold delete #$flags '("--enable-libplacebo"))))) + (inputs (modify-inputs (package-inputs ffmpeg) + (delete "libplacebo"))))) (define-public ffmpeg-4 (package @@ -1932,16 +1939,13 @@ audio/video codec library.") (sha256 (base32 "01xb2vj4n52fv2y56n5ifirgzlg16qbgfg98f6ifbbhm6l6lwlgr")))) - (inputs (modify-inputs (package-inputs ffmpeg) + (inputs (modify-inputs (package-inputs ffmpeg-5) (replace "sdl2" sdl2-2.0))) (arguments (substitute-keyword-arguments (package-arguments ffmpeg-5) - ((#:modules modules %default-gnu-modules) - `((srfi srfi-1) ,@modules)) ((#:configure-flags flags ''()) #~(cons "--enable-avresample" - (fold delete #$flags '("--enable-libplacebo" - "--enable-libshaderc")))))))) + (fold delete #$flags '("--enable-libshaderc")))))))) (define-public ffmpeg-for-stepmania (hidden-package