summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNguyễn Gia Phong <cnx@loang.net>2026-07-23 11:52:09 +0900
committerNguyễn Gia Phong <cnx@loang.net>2026-08-31 11:00:18 +0900
commit61e24245981e4cb362b85edc3e70f6e882f9cf65 (patch)
tree2b1c1e1a97e6b4740db6885b4b06e50b713376e8
parent8942ab236632ccf4861e00ffd732eaf7a7cf43ce (diff)
gnu: ffmpeg-4: Ungraft.
* gnu/packages/video.scm (ffmpeg-4): Update to 4.4.8. [replacement]: Unset. (ffmpeg-4.4.8): Delete variable. Merges: https://codeberg.org/guix/guix/pulls/10122 References: 2e0a4665a623 ("gnu: ffmpeg-4: Graft to 4.4.8.")
-rw-r--r--gnu/packages/video.scm17
1 files changed, 2 insertions, 15 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 6225378d2c1..117a0188171 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2043,33 +2043,20 @@ audio/video codec library.")
2043(define-public ffmpeg-4 2043(define-public ffmpeg-4
2044 (package 2044 (package
2045 (inherit ffmpeg-5) 2045 (inherit ffmpeg-5)
2046 (version "4.4.7") 2046 (version "4.4.8")
2047 (replacement ffmpeg-4.4.8)
2048 (source (origin 2047 (source (origin
2049 (method url-fetch) 2048 (method url-fetch)
2050 (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" 2049 (uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
2051 version ".tar.xz")) 2050 version ".tar.xz"))
2052 (sha256 2051 (sha256
2053 (base32 2052 (base32
2054 "0ajyaq93785vf9pk8fkzcnwnfki6fw6n2zbkms50l2h5mz8ddrrr")))) 2053 "1hrr3iz9nb6xs005amc30hw46ddwzxm2ffxywyp9wg98mv24hf67"))))
2055 (arguments 2054 (arguments
2056 (substitute-keyword-arguments arguments 2055 (substitute-keyword-arguments arguments
2057 ((#:configure-flags flags ''()) 2056 ((#:configure-flags flags ''())
2058 #~(cons "--enable-avresample" 2057 #~(cons "--enable-avresample"
2059 (fold delete #$flags '("--enable-libshaderc")))))))) 2058 (fold delete #$flags '("--enable-libshaderc"))))))))
2060 2059
2061(define-public ffmpeg-4.4.8
2062 (package
2063 (inherit ffmpeg-4)
2064 (version "4.4.8")
2065 (source
2066 (origin
2067 (method url-fetch)
2068 (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version
2069 ".tar.xz"))
2070 (sha256
2071 (base32 "1hrr3iz9nb6xs005amc30hw46ddwzxm2ffxywyp9wg98mv24hf67"))))))
2072
2073;;; Custom ffmpeg package used by Jami, which incorporates custom patches. 2060;;; Custom ffmpeg package used by Jami, which incorporates custom patches.
2074(define-public ffmpeg-jami 2061(define-public ffmpeg-jami
2075 (let ((ffmpeg ffmpeg-6)) 2062 (let ((ffmpeg ffmpeg-6))