me
/
guix
Archived
1
0
Fork 0
Code

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

* 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.
master
Marius Bakke 2022-11-18 10:34:21 +01:00 committed by Maxim Cournoyer
parent 47234c3960
commit e7334321a5
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
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

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

27
gnu/packages/video.scm
View File

@ -915,8 +915,8 @@ shared library and encoder and decoder command-line executables.")
(define-public libx264 (define-public libx264
;; There are no tags in the repository, so we take the version number from ;; There are no tags in the repository, so we take the version number from
;; the X264_BUILD variable defined in x264.h. ;; the X264_BUILD variable defined in x264.h.
(let ((version "161") (let ((version "164")
(commit "4c2aafd864dd201832ec2be0fef4484925146650") (commit "b093bbe7d9bc642c8f24067cbdcc73bb43562eab")
(revision "0")) (revision "0"))
(package (package
(name "libx264") (name "libx264")
@ -929,7 +929,7 @@ shared library and encoder and decoder command-line executables.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1i6v9h3xx9pi0zmlj3anwwjxqa63sbhy9crrif8dphipwfn9hyg5")))) "095pv8y6fqjg8mdvsfk12d0jqgyhip536a6vxhzm7qz8hfp96qhq"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
(list pkg-config nasm)) (list pkg-config nasm))
@ -979,27 +979,6 @@ H.264 (MPEG-4 AVC) video streams.")
"file://extras/cl.h" "file://extras/cl.h"
"See extras/cl.h in the distribution.")))))) "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 (define-public mkvtoolnix
(package (package
(name "mkvtoolnix") (name "mkvtoolnix")