~ruther/guix-local: gnu: ffmpeg-5: Restore inheritance from ffmpeg-6.

c4ea9502f3d0839bdbee0084298ddeb9dc63ec87 — Maxim Cournoyer 5 months ago fde896b

gnu: ffmpeg-5: Restore inheritance from ffmpeg-6.

This was inadvertently changed in the ffmpeg 8 update, probably as wrongly
resolved conflict.

* gnu/packages/video.scm (ffmpeg-5): Inherit from ffmpeg-6.  Adjust other
references to ffmpeg-6.

Fixes: #3141

Change-Id: I075b238fe93ba93de093d178b3b518fee1fa5711

patch browse .tar.gz

1 files changed, 3 insertions(+), 3 deletions(-)

M gnu/packages/video.scm

M gnu/packages/video.scm => gnu/packages/video.scm +3 -3

@@ 1902,7 1902,7 @@ audio/video codec library.")
 
 (define-public ffmpeg-5
   (package
-    (inherit ffmpeg)
+    (inherit ffmpeg-6)
     (version "5.1.6")
     (source (origin
               (method url-fetch)


@@ 1912,7 1912,7 @@ audio/video codec library.")
                (base32
                 "1g8116rp4fgq82br8lclb2dmw3fvyh2zkzhnngm7z97pg1i0dypl"))))
     (arguments
-     (substitute-keyword-arguments (package-arguments ffmpeg)
+     (substitute-keyword-arguments (package-arguments ffmpeg-6)
        ((#:modules modules %default-gnu-modules)
         `((srfi srfi-1) ,@modules))
        ((#:phases phases)


@@ 1926,7 1926,7 @@ audio/video codec library.")
             phases))
        ((#:configure-flags flags ''())
         #~(fold delete #$flags '("--enable-libplacebo")))))
-    (inputs (modify-inputs (package-inputs ffmpeg)
+    (inputs (modify-inputs (package-inputs ffmpeg-6)
               (delete "libplacebo")))))
 
 (define-public ffmpeg-4