me/guix
Archived
1
0
Fork 0
Code Activity

gnu: libx264: Update to 159-0.1771b55.

Browse source 
* gnu/packages/video.scm (libx264): Update to 159-0.1771b55.
[source]: Change to GIT-FETCH.
[version]: Use GIT-VERSION, and change from date-based identifier to the
version defined in x264.h.
This commit is contained in:
Marius Bakke 2020-02-01 15:39:05 +01:00
parent 82ca7b2a3a
commit c0fe2e1f03
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 52 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
gnu/packages/video.scm
View file

@ -23,7 +23,7 @@
;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net> ;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net>
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Roel Janssen <roel@gnu.org> ;;; Copyright © 2018 Roel Janssen <roel@gnu.org>
;;; Copyright © 2018, 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018, 2019 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2018, 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2018, 2019 Leo Famulari <leo@famulari.name> ;;; Copyright © 2018, 2019 Leo Famulari <leo@famulari.name>
;;; Copyright © 2018 Brendan Tildesley <mail@brendan.scot> ;;; Copyright © 2018 Brendan Tildesley <mail@brendan.scot>
@ -337,52 +337,59 @@ a shared library and encoder and decoder command-line executables.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public libx264 (define-public libx264
(package ;; There are no tags in the repository, so we take the version number from
(name "libx264") ;; the X264_BUILD variable defined in x264.h.
(version "20180810-2245") (let ((version "159")
(source (origin (commit "1771b556ee45207f8711744ccbd5d42a3949b14c")
(method url-fetch) (revision "0"))
(uri (string-append "https://download.videolan.org/pub/x264/snapshots/" (package
"x264-snapshot-" version "-stable.tar.bz2")) (name "libx264")
(sha256 (version (git-version version revision commit))
(base32 (source (origin
"0f25f39imas9pcqm7lnaa0shhjmf42hdx7jxzcnvxc7qsb7lh1bv")))) (method git-fetch)
(build-system gnu-build-system) (uri (git-reference
(native-inputs (url "https://code.videolan.org/videolan/x264.git")
`(("pkg-config" ,pkg-config) (commit commit)))
("nasm" ,nasm))) (file-name (git-file-name name version))
;; TODO: Add gpac input (sha256
(arguments (base32
`(#:tests? #f ;no check target "0kmi78gs5101d4df33il5bmjbns54nvdjsyn44xiw60lwsg11vwz"))))
#:configure-flags '("--enable-shared" (build-system gnu-build-system)
;; Don't build the command-line program. If we (native-inputs
;; want it later, we should do so in a different `(("pkg-config" ,pkg-config)
;; package to avoid a circular dependency (the x264 ("nasm" ,nasm)))
;; program depends on ffmpeg and ffmpeg depends on ;; TODO: Add gpac input
;; libx264). (arguments
"--disable-cli" `(#:tests? #f ;no check target
#:configure-flags '("--enable-shared"
;; Don't build the command-line program. If we
;; want it later, we should do so in a different
;; package to avoid a circular dependency (the x264
;; program depends on ffmpeg and ffmpeg depends on
;; libx264).
"--disable-cli"
;; On MIPS, we must pass "--disable-asm" or else ;; On MIPS, we must pass "--disable-asm" or else
;; configure fails after printing: "You specified a ;; configure fails after printing: "You specified a
;; pre-MSA CPU in your CFLAGS. If you really want ;; pre-MSA CPU in your CFLAGS. If you really want
;; to run on such a CPU, configure with ;; to run on such a CPU, configure with
;; --disable-asm." ;; --disable-asm."
,@(if (string-prefix? "mips" ,@(if (string-prefix? "mips"
(or (%current-target-system) (or (%current-target-system)
(%current-system))) (%current-system)))
'("--disable-asm") '("--disable-asm")
'())))) '()))))
(home-page "https://www.videolan.org/developers/x264.html") (home-page "https://www.videolan.org/developers/x264.html")
(synopsis "H.264 video coding library") (synopsis "H.264 video coding library")
(description "libx264 is an advanced encoding library for creating (description "libx264 is an advanced encoding library for creating
H.264 (MPEG-4 AVC) video streams.") H.264 (MPEG-4 AVC) video streams.")
(license (list license:gpl2+ ;most files (license (list license:gpl2+ ;most files
license:isc ;common/x86/x86inc.asm license:isc ;common/x86/x86inc.asm
license:lgpl2.1+ ;extras/getopt.c license:lgpl2.1+ ;extras/getopt.c
license:bsd-3 ;extras/inttypes.h license:bsd-3 ;extras/inttypes.h
(license:non-copyleft ;extras/cl*.h (license:non-copyleft ;extras/cl*.h
"file://extras/cl.h" "file://extras/cl.h"
"See extras/cl.h in the distribution."))))) "See extras/cl.h in the distribution."))))))
(define-public mkvtoolnix (define-public mkvtoolnix
(package (package