nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: mplayer: Update to 1.2. 

* gnu/packages/video.scm (mplayer): Update to 1.2.
  [inputs]: Add previously bundled ffmpeg, libdvdcss, libdvdnav.
  [arguments]: Disable bundled ffmeg.
This commit is contained in:
Efraim Flashner 2015-10-20 16:50:22 +03:00
parent 21b2ec4d3a
commit fd74cc3c72
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gnu/packages/video.scm
View File

@ -3,6 +3,7 @@
;;; Copyright © 2014, 2015 David Thompson <davet@gnu.org> ;;; Copyright © 2014, 2015 David Thompson <davet@gnu.org>
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -584,7 +585,7 @@ treaming protocols.")
(define-public mplayer (define-public mplayer
(package (package
(name "mplayer") (name "mplayer")
(version "1.1.1") (version "1.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -592,7 +593,7 @@ treaming protocols.")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0xlcg7rszrwmw29wqr0plsw5d1rq0hb7vjsq7bmmfsly2z1wg3yf")))) "1dp2lbxyhgjr8sn91kf6xw3w6d7dsgq08v4dgrq20afz1bqzdrzz"))))
(build-system gnu-build-system) (build-system gnu-build-system)
;; FIXME: Add additional inputs once available. ;; FIXME: Add additional inputs once available.
(native-inputs (native-inputs
@ -601,8 +602,11 @@ treaming protocols.")
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
("cdparanoia" ,cdparanoia) ("cdparanoia" ,cdparanoia)
("fontconfig" ,fontconfig) ("fontconfig" ,fontconfig)
("ffmpeg", ffmpeg)
("freetype" ,freetype) ("freetype" ,freetype)
("lame" ,lame) ("lame" ,lame)
("libdvdcss", libdvdcss)
("libdvdnav", libdvdnav)
("libmpg123" ,mpg123) ; audio codec for MP3 ("libmpg123" ,mpg123) ; audio codec for MP3
;; ("giflib" ,giflib) ; uses QuantizeBuffer, requires version >= 5 ;; ("giflib" ,giflib) ; uses QuantizeBuffer, requires version >= 5
("libjpeg" ,libjpeg) ("libjpeg" ,libjpeg)
@ -639,7 +643,7 @@ treaming protocols.")
"./configure" "./configure"
(string-append "--extra-cflags=-I" (string-append "--extra-cflags=-I"
libx11 "/include") ; to detect libx11 libx11 "/include") ; to detect libx11
"--disable-tremor-internal" ; forces external libvorbis "--disable-ffmpeg_a" ; disables bundled ffmpeg
(string-append "--prefix=" out) (string-append "--prefix=" out)
;; Enable runtime cpu detection where supported, ;; Enable runtime cpu detection where supported,
;; and choose a suitable target. ;; and choose a suitable target.