From 06c9fd8cf6e21b9002f97693f6e3db2750302ef7 Mon Sep 17 00:00:00 2001
From: John Kehayias <john@guixotic.coop>
Date: Sun, 28 Sep 2025 13:07:02 -0400
Subject: [PATCH 1/2] gnu: ffmpeg-5: Fix build.

* gnu/packages/video.scm (ffmpeg-5)[arguments]: Add modules.
<#:configure-flags>: Remove "--enable-libplacebo".
[inputs]: Remove libplacebo.
(ffmpeg-4)[inputs]: Inherit from ffmpeg-5.
[arguments]: Remove modules.
<#:configure-flags>: Reduce as libplacebo flag is now removed via ffmpeg-5.

Change-Id: Ia13b297cb224abf8212e02a934f0f8fb04bce48e
---
 gnu/packages/video.scm | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

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 <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.
 ;;;
@@ -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

From b17e20f60bd2cf6e8e196916e7b1cad8b069f1ec Mon Sep 17 00:00:00 2001
From: John Kehayias <john@guixotic.coop>
Date: Sun, 28 Sep 2025 14:39:13 -0400
Subject: [PATCH 2/2] gnu: python-openpyxl: Fix tests.

* gnu/packages/python-xyz.scm (python-openpyxl)[native-inputs]: Replace
python-lxml with python-lxml-4.9.

Change-Id: I59374faaf1dea054ac3f109fcdca53fe7aaa96a9
---
 gnu/packages/python-xyz.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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))