I saw that mplayer 1.2 came out recently. I wanted to make sure that the patch was good as is, and shouldn't be split. Since the last release, libdvdnav and libdvdcss are no longer packaged, so I added them to the inputs. Also, I found the config flag to use the shared ffmpeg library, so I added that in, and I took out the depreciated config flag that was there before.
mplayer 1.2 will build with just the flag removed, but it seemed to me that we didn't want to use the bundled ffmpeg so I tossed it and the two libdvds in. -- Efraim Flashner <efr...@flashner.co.il> אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted
From d4b74e0ea9755ab7b6c9c9b3108291fcc2b8e2ed Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efr...@flashner.co.il>
Date: Tue, 20 Oct 2015 16:50:22 +0300
Subject: [PATCH] gnu: mplayer: Update to 1.2.
* gnu/packages/video.scm (mplayer): Update to 1.2.
[inputs]: Add ffmpeg, libdvdcss, libdvdnav.
[arguments]: Disable bundled ffmeg.
---
gnu/packages/video.scm | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 013fef9..e3e67be 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2014, 2015 David Thompson <da...@gnu.org>
;;; Copyright © 2014, 2015 Mark H Weaver <m...@netris.org>
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayi...@gmail.com>
+;;; Copyright © 2015 Efraim Flashner <efr...@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -584,7 +585,7 @@ treaming protocols.")
(define-public mplayer
(package
(name "mplayer")
- (version "1.1.1")
+ (version "1.2")
(source (origin
(method url-fetch)
(uri (string-append
@@ -592,7 +593,7 @@ treaming protocols.")
version ".tar.xz"))
(sha256
(base32
- "0xlcg7rszrwmw29wqr0plsw5d1rq0hb7vjsq7bmmfsly2z1wg3yf"))))
+ "1dp2lbxyhgjr8sn91kf6xw3w6d7dsgq08v4dgrq20afz1bqzdrzz"))))
(build-system gnu-build-system)
;; FIXME: Add additional inputs once available.
(native-inputs
@@ -601,8 +602,11 @@ treaming protocols.")
`(("alsa-lib" ,alsa-lib)
("cdparanoia" ,cdparanoia)
("fontconfig" ,fontconfig)
+ ("ffmpeg", ffmpeg)
("freetype" ,freetype)
("lame" ,lame)
+ ("libdvdcss", libdvdcss)
+ ("libdvdnav", libdvdnav)
("libmpg123" ,mpg123) ; audio codec for MP3
;; ("giflib" ,giflib) ; uses QuantizeBuffer, requires version >= 5
("libjpeg" ,libjpeg)
@@ -639,7 +643,7 @@ treaming protocols.")
"./configure"
(string-append "--extra-cflags=-I"
libx11 "/include") ; to detect libx11
- "--disable-tremor-internal" ; forces external libvorbis
+ "--disable-ffmpeg_a" ; disables bundled ffmpeg
(string-append "--prefix=" out)
;; Enable runtime cpu detection where supported,
;; and choose a suitable target.
--
2.6.1
pgprtkrVxj0F6.pgp
Description: OpenPGP digital signature
