amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
Maxim Cournoyer 2025-09-30 21:18:34 +09:00
parent fde896b7f3
commit c4ea9502f3
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gnu/packages/video.scm
View file

@ -1902,7 +1902,7 @@ audio/video codec library.")
(define-public ffmpeg-5 (define-public ffmpeg-5
(package (package
(inherit ffmpeg) (inherit ffmpeg-6)
(version "5.1.6") (version "5.1.6")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -1912,7 +1912,7 @@ audio/video codec library.")
(base32 (base32
"1g8116rp4fgq82br8lclb2dmw3fvyh2zkzhnngm7z97pg1i0dypl")))) "1g8116rp4fgq82br8lclb2dmw3fvyh2zkzhnngm7z97pg1i0dypl"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments ffmpeg) (substitute-keyword-arguments (package-arguments ffmpeg-6)
((#:modules modules %default-gnu-modules) ((#:modules modules %default-gnu-modules)
`((srfi srfi-1) ,@modules)) `((srfi srfi-1) ,@modules))
((#:phases phases) ((#:phases phases)
@ -1926,7 +1926,7 @@ audio/video codec library.")
phases)) phases))
((#:configure-flags flags ''()) ((#:configure-flags flags ''())
#~(fold delete #$flags '("--enable-libplacebo"))))) #~(fold delete #$flags '("--enable-libplacebo")))))
(inputs (modify-inputs (package-inputs ffmpeg) (inputs (modify-inputs (package-inputs ffmpeg-6)
(delete "libplacebo"))))) (delete "libplacebo")))))
(define-public ffmpeg-4 (define-public ffmpeg-4