From mboxrd@z Thu Jan 1 00:00:00 1970 From: Efraim Flashner Subject: Update MPlayer to 1.2 Date: Tue, 20 Oct 2015 16:56:55 +0300 Message-ID: <20151020165655.70f422ac@debian-netbook> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/MMCaRGeW/M7rLDdvBNS/7_E"; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:34699) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZoXQe-0001Bg-HY for guix-devel@gnu.org; Tue, 20 Oct 2015 09:58:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZoXQa-0001Nq-Ts for guix-devel@gnu.org; Tue, 20 Oct 2015 09:58:16 -0400 Received: from flashner.co.il ([178.62.234.194]:43273) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZoXQa-0001NW-JO for guix-devel@gnu.org; Tue, 20 Oct 2015 09:58:12 -0400 Received: from debian-netbook (unknown [213.151.53.59]) by flashner.co.il (Postfix) with ESMTPSA id 0D57A402AD for ; Tue, 20 Oct 2015 13:58:09 +0000 (UTC) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org --Sig_/MMCaRGeW/M7rLDdvBNS/7_E Content-Type: multipart/mixed; boundary="MP_/GiGSCxl7uImnwFn8hrl1P1G" --MP_/GiGSCxl7uImnwFn8hrl1P1G Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline I saw that mplayer 1.2 came out recently. I wanted to make sure that the pa= tch was good as is, and shouldn't be split. Since the last release, libdvdn= av and libdvdcss are no longer packaged, so I added them to the inputs. Als= o, I found the config flag to use the shared ffmpeg library, so I added tha= t 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 libdvd= s in. --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --MP_/GiGSCxl7uImnwFn8hrl1P1G Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-gnu-mplayer-Update-to-1.2.patch =46rom d4b74e0ea9755ab7b6c9c9b3108291fcc2b8e2ed Mon Sep 17 00:00:00 2001 From: Efraim Flashner 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 =C2=A9 2014, 2015 David Thompson ;;; Copyright =C2=A9 2014, 2015 Mark H Weaver ;;; Copyright =C2=A9 2015 Taylan Ulrich Bay=C4=B1rl=C4=B1/Kammer +;;; Copyright =C2=A9 2015 Efraim Flashner ;;; ;;; 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 >=3D 5 ("libjpeg" ,libjpeg) @@ -639,7 +643,7 @@ treaming protocols.") "./configure" (string-append "--extra-cflags=3D-I" libx11 "/include") ; to detect libx11 - "--disable-tremor-internal" ; forces external libvor= bis + "--disable-ffmpeg_a" ; disables bundled ffmpeg (string-append "--prefix=3D" out) ;; Enable runtime cpu detection where supported, ;; and choose a suitable target. --=20 2.6.1 --MP_/GiGSCxl7uImnwFn8hrl1P1G-- --Sig_/MMCaRGeW/M7rLDdvBNS/7_E Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCgAGBQJWJkgnAAoJEPTB05F+rO6TF+IP/3/abX3VgJh0+Rr8IPNRTurP D7NprkXNN8EUsMuRO3aR+5fmHLaqr8QU7k8vTQK6UiWqzur6PA1R8Y2CT6Ojk94W gXqOAbhNznE0EoO5J1GXhIcpPYMWpvqxbv3KWZx2fXHEVWAhTdMkWcyJiiM3cFlj cdCOyygDqkr1xsgPqlSnS790lBwHSm83jt627sLSSd2TbM5CtXkEEW1RyhD2UhNm VGTOP6dbXqquwMdqmTgNNS+ya/FWbSYj5e8CvoV5hSdFiJhAWLhnAZlo+SySoy3i ls6T55DRj/SGxebzEkr22QBjFpJ6dj8etVX8RA4QiX8tFy6tLwo7tNPHguykhlAX M8VG26TSoUGtBPOPk/nVACux2nQ2ycOXoF41NYyeEmEyLE0uNdRWmK/QAhlaruUH nd91gcse0ICREhS3q36YLlVHw81uLuK8d6KN6K4wpTlR1kl5VqGoz922cB1qArnc pIom7pHIWW2sHu9miXfXG7jaVxMM2tAKn8FbuiFwXfU2qxIB9e7uALNnPNYNq3O4 rh7hh4IGk/1lMPMR7MF709s59HAmmMgXCkpVZhQAuFwrYHBqR6Q6AIE5mShWM6w7 BPQfxlv4i5P8RtTfCkIHtX4YbyE2J6OfaHo3T6f4zbwA7GKRRN8Bc2zS0hQo4Az3 wcd7hEi6PEVOc/94oyW+ =Gpsm -----END PGP SIGNATURE----- --Sig_/MMCaRGeW/M7rLDdvBNS/7_E--