gnu/packages/python-xyz.scm

@@ -6088,7 +6088,7 @@ server.")
         (base32 "17z6rrvv3q1axy9r13c2hln2pazfn9n5bhkzrbjcjakgbfjl6mss"))))
     (build-system pyproject-build-system)
     (native-inputs
-     (list python-lxml-4.9
+     (list python-lxml
            python-pillow
            python-pytest
            python-setuptools))

gnu/packages/video.scm

@@ -74,7 +74,6 @@
 ;;; Copyright © 2025 Sharlatan Hellseher <sharlatanus@gmail.ccom>
 ;;; Copyright © 2025 VnPower <vnpower@loang.net>
 ;;; Copyright © 2025 Zhu Zihao <all_but_last@163.com>
-;;; Copyright © 2025 John Kehayias <john@guixotic.coop>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1911,22 +1910,16 @@ audio/video codec library.")
                (base32
                 "1g8116rp4fgq82br8lclb2dmw3fvyh2zkzhnngm7z97pg1i0dypl"))))
     (arguments
-     (substitute-keyword-arguments (package-arguments ffmpeg)
-       ((#:modules modules %default-gnu-modules)
-        `((srfi srfi-1) ,@modules))
-       ((#:phases phases)
      (if (target-x86-32?)
+         (substitute-keyword-arguments (package-arguments ffmpeg)
+           ((#:phases phases)
             #~(modify-phases #$phases
                 (replace 'bypass-openal-check
                   (lambda _
                     (substitute* "configure"
                       (("die \"ERROR: openal not found\"")
-                       "true")))))
+                       "true")))))))
-            phases))
+         (package-arguments ffmpeg)))))
-       ((#:configure-flags flags ''())
-        #~(fold delete #$flags '("--enable-libplacebo")))))
-    (inputs (modify-inputs (package-inputs ffmpeg)
-              (delete "libplacebo")))))
 
 (define-public ffmpeg-4
   (package
@@ -1939,13 +1932,16 @@ audio/video codec library.")
              (sha256
               (base32
                "01xb2vj4n52fv2y56n5ifirgzlg16qbgfg98f6ifbbhm6l6lwlgr"))))
-    (inputs (modify-inputs (package-inputs ffmpeg-5)
+    (inputs (modify-inputs (package-inputs ffmpeg)
               (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-libshaderc"))))))))
+                (fold delete #$flags '("--enable-libplacebo"
+                                       "--enable-libshaderc"))))))))
 
 (define-public ffmpeg-for-stepmania
   (hidden-package