ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-23 02:59:17 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: libx264: Update to 164-0.b093bbe.

Browse source 
* gnu/packages/video.scm (libx264): Update to 164-0.b093bbe.
(libx264-next): Remove variable.
* gnu/packages/jami.scm (ffmpeg-jami)[inputs]: Don't use LIBX264-NEXT.
This commit is contained in:
Marius Bakke 2022-11-18 10:34:21 +01:00
parent 79cfd21411
commit 915360ee9c
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
2 changed files with 4 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gnu/packages/jami.scm
View file

@ -424,8 +424,7 @@ (define-public ffmpeg-jami
"mov ismv")
(("fate-lavf-mov_rtphint:.*") ""))))))))
(inputs (modify-inputs (package-inputs ffmpeg-5)
(replace "libvpx" libvpx-next)
(replace "libx264" libx264-next)))))
(replace "libvpx" libvpx-next)))))
(define-public libjami
(package

27
gnu/packages/video.scm
View file

@ -912,8 +912,8 @@ (define-public libmpeg2
(define-public libx264
;; There are no tags in the repository, so we take the version number from
;; the X264_BUILD variable defined in x264.h.
(let ((version "161")
(commit "4c2aafd864dd201832ec2be0fef4484925146650")
(let ((version "164")
(commit "b093bbe7d9bc642c8f24067cbdcc73bb43562eab")
(revision "0"))
(package
(name "libx264")
@ -926,7 +926,7 @@ (define-public libx264
(file-name (git-file-name name version))
(sha256
(base32
"1i6v9h3xx9pi0zmlj3anwwjxqa63sbhy9crrif8dphipwfn9hyg5"))))
"095pv8y6fqjg8mdvsfk12d0jqgyhip536a6vxhzm7qz8hfp96qhq"))))
(build-system gnu-build-system)
(native-inputs
(list pkg-config nasm))
@ -976,27 +976,6 @@ (define-public libx264
"file://extras/cl.h"
"See extras/cl.h in the distribution."))))))
;;; TODO: Merge into libx264 on staging.
(define-public libx264-next
;; There are no tags in the repository, so we take the version number from
;; the X264_BUILD variable defined in x264.h.
(let ((version "164")
(commit "b093bbe7d9bc642c8f24067cbdcc73bb43562eab")
(revision "0"))
(package
(inherit libx264)
(name "libx264")
(version (git-version version revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://code.videolan.org/videolan/x264.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"095pv8y6fqjg8mdvsfk12d0jqgyhip536a6vxhzm7qz8hfp96qhq")))))))
(define-public mkvtoolnix
(package
(name "mkvtoolnix")