From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45754) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fAVuM-0000MG-1c for guix-patches@gnu.org; Mon, 23 Apr 2018 03:29:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fAVuI-0003E1-Sw for guix-patches@gnu.org; Mon, 23 Apr 2018 03:29:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:56766) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fAVuI-0003Dx-N4 for guix-patches@gnu.org; Mon, 23 Apr 2018 03:29:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fAVuI-0005Rr-Dk for guix-patches@gnu.org; Mon, 23 Apr 2018 03:29:02 -0400 Subject: [bug#31244] [PATCH] ffmpeg 4.0 update patch series Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:45520) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fAVtr-0000Dp-IC for guix-patches@gnu.org; Mon, 23 Apr 2018 03:28:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fAVtl-00032H-2m for guix-patches@gnu.org; Mon, 23 Apr 2018 03:28:35 -0400 Received: from mx.kolabnow.com ([95.128.36.42]:3018) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fAVtk-00030c-BA for guix-patches@gnu.org; Mon, 23 Apr 2018 03:28:28 -0400 Received: from localhost (unknown [127.0.0.1]) by ext-mx-out003.mykolab.com (Postfix) with ESMTP id 5268A41E5D for ; Mon, 23 Apr 2018 09:28:24 +0200 (CEST) Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out003.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Vf6Jz_2ABBu8 for ; Mon, 23 Apr 2018 09:28:22 +0200 (CEST) Received: from int-mx001.mykolab.com (unknown [10.9.13.1]) by ext-mx-out003.mykolab.com (Postfix) with ESMTPS id 98FB541E59 for ; Mon, 23 Apr 2018 09:28:22 +0200 (CEST) Received: from ext-subm002.mykolab.com (unknown [10.9.6.2]) by int-mx001.mykolab.com (Postfix) with ESMTPS id 89276258 for ; Mon, 23 Apr 2018 09:28:22 +0200 (CEST) Date: Mon, 23 Apr 2018 09:28:12 +0200 From: Rutger Helling Message-ID: <20180423092812.1ddba41d@mykolab.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/RQuCbHecydGw_BY.63tngYx"; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 31244@debbugs.gnu.org --Sig_/RQuCbHecydGw_BY.63tngYx Content-Type: multipart/mixed; boundary="MP_/o5CN4NgSfNrlxKDfZ3hyoTP" --MP_/o5CN4NgSfNrlxKDfZ3hyoTP Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Hey Guix, this patch series updates ffmpeg to 4.0. Since I found that a few packages fail to build with ffmpeg 4.0 I've also added ffmpeg@3.4 for compatibility. Furthermore I've removed ffmpeg-git and changed mpv to build with ffmpeg 4.0 instead. --MP_/o5CN4NgSfNrlxKDfZ3hyoTP Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-gnu-ffmpeg-Update-to-4.0.patch =46rom f59c60004fc453aee4b58764337ea5c5064869c5 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 23 Apr 2018 08:07:10 +0200 Subject: [PATCH 1/8] gnu: ffmpeg: Update to 4.0. * gnu/packages/video.scm (ffmpeg): Update to 4.0. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e959accf6..2a88cd80b 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -597,14 +597,14 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264= , and VC-1/VMW3).") (define-public ffmpeg (package (name "ffmpeg") - (version "3.4.2") + (version "4.0") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "0h6prjn1ijkzzhkyj8mazp0wpx7m0n9ycadjxagf9czqirbyk4ib")))) + "0gx4ngnhi5glmxh38603qy5n6vq8bl1cr4sqd1xff95i82pmv57d")))) (build-system gnu-build-system) (inputs `(("fontconfig" ,fontconfig) --=20 2.17.0 --MP_/o5CN4NgSfNrlxKDfZ3hyoTP Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0002-gnu-Add-ffmpeg-3.4.patch =46rom 902ea7f4743bc5f1c882bc11a18cbb02e2451ae9 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 23 Apr 2018 08:09:15 +0200 Subject: [PATCH 2/8] gnu: Add ffmpeg@3.4. * gnu/packages/video.scm (ffmpeg@3.4): New variable. --- gnu/packages/video.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 2a88cd80b..4cb9da39a 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -770,6 +770,18 @@ convert and stream audio and video. It includes the l= ibavcodec audio/video codec library.") (license license:gpl2+))) =20 +(define-public ffmpeg-3.4 + (package + (inherit ffmpeg) + (version "3.4.2") + (source (origin + (method url-fetch) + (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" + version ".tar.xz")) + (sha256 + (base32 + "0h6prjn1ijkzzhkyj8mazp0wpx7m0n9ycadjxagf9czqirbyk4ib")))))) + (define-public ffmpeg-2.8 (package (inherit ffmpeg) --=20 2.17.0 --MP_/o5CN4NgSfNrlxKDfZ3hyoTP Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0003-gnu-Remove-ffmpeg-git.patch =46rom b3c8cf27518bbbc6bd8c1398e3e6bfab66c8b19f Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 23 Apr 2018 08:09:38 +0200 Subject: [PATCH 3/8] gnu: Remove ffmpeg-git. * gnu/packages/video.scm (ffmpeg-git): Remove variable. --- gnu/packages/video.scm | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 4cb9da39a..3812f3e73 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -802,25 +802,6 @@ audio/video codec library.") flag)) ,flags)))))) =20 -;; Annoyingly enough, the latest mpv release does not build with the stable -;; release of ffmpeg. Use a git commit until the situation is fixed. -(define-public ffmpeg-git - (let ((commit "3f887440677328c9cfed97ad81d14051ffa32aae") - (revision "1")) - (package - (inherit ffmpeg) - (name "ffmpeg-git") - (version (string-append "3.4-" revision "." (string-take commit 9))) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/FFmpeg/FFmpeg.git") - (commit commit))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "1b7n3g4m2rbvrwsgbfl8wl91z42g1ld42clwxs8qpl9ny5rwz6sq"))))= ))) - (define-public vlc (package (name "vlc") --=20 2.17.0 --MP_/o5CN4NgSfNrlxKDfZ3hyoTP Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0004-gnu-mpv-Build-with-ffmpeg-instead-of-ffmpeg-git.patch =46rom 7d0f7c38fbf6261b47a7878413275c4070c353ac Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 23 Apr 2018 08:10:07 +0200 Subject: [PATCH 4/8] gnu: mpv: Build with ffmpeg instead of ffmpeg-git. * gnu/packages/video.scm (mpv)[inputs]: Build with ffmpeg instead of ffmpeg= -git. --- gnu/packages/video.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 3812f3e73..1966d44df 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1025,7 +1025,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") (inputs `(("alsa-lib" ,alsa-lib) ("enca" ,enca) - ("ffmpeg" ,ffmpeg-git) + ("ffmpeg" ,ffmpeg) ("jack" ,jack-1) ("ladspa" ,ladspa) ("lcms" ,lcms) --=20 2.17.0 --MP_/o5CN4NgSfNrlxKDfZ3hyoTP Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0005-gnu-gst-libav-Build-with-ffmpeg-3.4.patch =46rom 76bb565c83a412e843c6ce8df50a8c39b09d3e1c Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 23 Apr 2018 08:11:18 +0200 Subject: [PATCH 5/8] gnu: gst-libav: Build with ffmpeg@3.4. * gnu/packages/gstreamer.scm (gst-libav)[inputs]: Build with ffmpeg@3.4 ins= tead of ffmpeg. --- gnu/packages/gstreamer.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 4f71859f2..f6545f232 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -410,7 +410,7 @@ distribution problems in some jurisdictions, e.g. due t= o patent threats.") ("python" ,python))) (inputs `(("gst-plugins-base" ,gst-plugins-base) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-3.4) ("orc" ,orc) ("zlib" ,zlib))) (home-page "https://gstreamer.freedesktop.org/") --=20 2.17.0 --MP_/o5CN4NgSfNrlxKDfZ3hyoTP Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0006-gnu-qtox-Build-with-ffmpeg-3.4.patch =46rom 620b5c4daa1a79df983b188e8e0318c8af7a0454 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 23 Apr 2018 08:17:37 +0200 Subject: [PATCH 6/8] gnu: qtox: Build with ffmpeg@3.4. * gnu/packages/messaging.scm (qtox)[inputs]: Build with ffmpeg@3.4 instead = of ffmpeg. --- gnu/packages/messaging.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 2b3284ba6..237a31523 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -913,7 +913,7 @@ instant messenger with audio and video chat capabilitie= s.") ,(list (string-append (assoc-ref inputs "qtsvg") "/lib/qt5/plugins/")))))))))) (inputs - `(("ffmpeg" ,ffmpeg) + `(("ffmpeg" ,ffmpeg-3.4) ("filteraudio" ,filteraudio) ("glib" ,glib) ("gtk+" ,gtk+-2) --=20 2.17.0 --MP_/o5CN4NgSfNrlxKDfZ3hyoTP Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0007-gnu-dolphin-emu-Build-with-ffmpeg-3.4.patch =46rom 4e43d26b34f7a0bdd2a0a8e91fc2085aaf0eed02 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 23 Apr 2018 08:51:07 +0200 Subject: [PATCH 7/8] gnu: dolphin-emu: Build with ffmpeg@3.4. * gnu/packages/emulators.scm (dolphin-emu)[inputs]: Build with ffmpeg@3.4 instead of ffmpeg. --- gnu/packages/emulators.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 79947059b..75b191c06 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -186,7 +186,7 @@ ("bluez" ,bluez) ("curl" ,curl) ("eudev" ,eudev) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-3.4) ("font-wqy-microhei" ,font-wqy-microhei) ("freetype" ,freetype) ("glew" ,glew) --=20 2.17.0 --MP_/o5CN4NgSfNrlxKDfZ3hyoTP Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0008-gnu-libextractor-Build-with-ffmpeg-3.4.patch =46rom 9c892c6f595b23c4e597bae217a79445955d51ed Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 23 Apr 2018 08:52:38 +0200 Subject: [PATCH 8/8] gnu: libextractor: Build with ffmpeg@3.4. * gnu/packages/gnunet.scm (libextractor)[inputs]: Build with ffmpeg@3.4 ins= tead of ffmpeg. --- gnu/packages/gnunet.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index b6062625c..880fb9f09 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -88,7 +88,7 @@ `(("exiv2" ,exiv2) ("bzip2" ,bzip2) ("flac" ,flac) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-3.4) ("file" ,file) ;libmagic, for the MIME plu= g-in ("glib" ,glib) ("gstreamer" ,gstreamer) --=20 2.17.0 --MP_/o5CN4NgSfNrlxKDfZ3hyoTP-- --Sig_/RQuCbHecydGw_BY.63tngYx Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEAVThuRzJ2e93ZI3n86cn20T8yjYFAlrdiw0ACgkQ86cn20T8 yjb4AwgAta30C1ZUmqTZkq9Lbk5Gig2yPiU13UIVF4MLDd4+tz4ukEBF8+UBlupN BOcxfVQImq4PY1HEneo6/9ryYSPicg5HiJWa7j2DSfPEEJfB+783EGDfNwLMC7T3 tGOd5GIU7Y2GVyquC6fYorxzyA8OieWGlAlVvHzVGfhliqby4ikx3Zdj1hRY2VBN LRvsYnb/tijTrQ2BVSZxoRd2vjyldLWUN8ce/EJiRvjy+/3LtQBXQRmz8G3//SeR 1webR96ZGJYfLRCnYRMi/rJL5iOXqofQGU/nmJWWn9t9dQif6xmJLG/dmuFY/55q n0X0CAbLt/0aKNmwo00s+5JYN3ILWw== =v78G -----END PGP SIGNATURE----- --Sig_/RQuCbHecydGw_BY.63tngYx--