From unknown Mon Jun 23 07:52:07 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#31244] [PATCH] ffmpeg 4.0 update patch series Resent-From: Rutger Helling Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 23 Apr 2018 07:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 31244 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 31244@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.152446853320926 (code B ref -1); Mon, 23 Apr 2018 07:29:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 Apr 2018 07:28:53 +0000 Received: from localhost ([127.0.0.1]:36430 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fAVu4-0005RN-Vp for submit@debbugs.gnu.org; Mon, 23 Apr 2018 03:28:53 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54573) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fAVu2-0005R9-3r for submit@debbugs.gnu.org; Mon, 23 Apr 2018 03:28:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fAVtt-00034e-SP for submit@debbugs.gnu.org; Mon, 23 Apr 2018 03:28:41 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:52332) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fAVtt-00034V-Lb for submit@debbugs.gnu.org; Mon, 23 Apr 2018 03:28:37 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mykolab.com; h= content-type:content-type:mime-version:message-id:subject :subject:from:from:date:date:received:received:received; s= dkim20160331; t=1524468502; x=1526282903; bh=iL5RrFvG8a/DnB7QueR NL2hcwhr3+gqgzaEFFc5FvO4=; b=RFH3fwsHfwLcKZSw7lJV4wqK+2zclsHlbmA codE9bFNPJz10o3YdHCiYlgWWv7oTjEbq25ojkRJzPaoeld1Bq53evUc9E2QQyQk bldJdUgN2YhNUKwrQ69UnVmoZmmGvF7b2GOBrISjouyXk8jyhP6QldLem5bgfwfu idmBVM3xta7zyOROlh6GgU/lsQTMcLQoj4ktqxkSEDciJAR65epyabALyiI0FpFQ 9M34Q+xJMcfITW1+wnnHv2MvgL6zJJRyNycaGgjofIOK0bH5U6wn9ZZKamusiGrE +ZgDqzFb6s6aE1b9MyWSNnheb9mv4Z3zBV0nUWR1Bz6ed3mihv94xQ9pWW9IKlhf YhRtLLc1grUPSp6cXeuz8TTAV6wbe0gdtmFtSov+qYvniL+rsVa+nYPzVCetwTVZ zeuoSKj9NumoPB8cyr9kzkGy2Zk9U2EHzgwa+Nq40CiAQp7lvk9fLaMs7L6dwLV3 PlLEf073BgwBF9FArbMT8ikGdcEFhLvuArb3TNf8b+1amb76NHhcje8urIfrb/bs XM7mXc9hI5RVV7hTtMWG5JYhYNnRo4dvt1o4leMDQaujDFSEhHXSxnuh4hQExWKA 4XRzLDfSGeXG3q30fBGeHihki+QuBHPr/eDhjuJDHSZJiQiYHEVYK62POmpOOSLN 3RhLpmHk= X-Virus-Scanned: amavisd-new at mykolab.com 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" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.1 (-----) --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-- From unknown Mon Jun 23 07:52:07 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#31244] [PATCH] ffmpeg 4.0 update patch series Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 23 Apr 2018 13:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 31244 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Rutger Helling Cc: 31244@debbugs.gnu.org Received: via spool by 31244-submit@debbugs.gnu.org id=B31244.152448891417783 (code B ref 31244); Mon, 23 Apr 2018 13:09:02 +0000 Received: (at 31244) by debbugs.gnu.org; 23 Apr 2018 13:08:34 +0000 Received: from localhost ([127.0.0.1]:36607 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fAbCo-0004cd-7X for submit@debbugs.gnu.org; Mon, 23 Apr 2018 09:08:33 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:56532) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fAbCj-0004cM-Fp for 31244@debbugs.gnu.org; Mon, 23 Apr 2018 09:08:29 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id E06DE12042; Mon, 23 Apr 2018 15:08:24 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4EcXHFoWfaHf; Mon, 23 Apr 2018 15:08:24 +0200 (CEST) Received: from ribbon (unknown [193.50.110.139]) by hera.aquilenet.fr (Postfix) with ESMTPSA id F419C106BE; Mon, 23 Apr 2018 15:08:23 +0200 (CEST) From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <20180423092812.1ddba41d@mykolab.com> Date: Mon, 23 Apr 2018 15:08:23 +0200 In-Reply-To: <20180423092812.1ddba41d@mykolab.com> (Rutger Helling's message of "Mon, 23 Apr 2018 09:28:12 +0200") Message-ID: <87muxu135k.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Hello Rutger, Rutger Helling skribis: > 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. This all looks good to me, but I have one request: could you squash all the changes, except perhaps the one removing =E2=80=98ffmpeg-git=E2=80=99? The rationale is that each commit should leave the repo in a =E2=80=9Cgood= =E2=80=9D state, which would not be the case if we first install the patch that upgrades ffmpeg and only then apply the ffmpeg =E2=86=92 ffmpeg-3.4 changes. I hope that=E2=80=99s fine with you. Thanks for working on it! Ludo=E2=80=99. From unknown Mon Jun 23 07:52:07 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Rutger Helling Subject: bug#31244: closed (Re: [bug#31244] [PATCH] ffmpeg 4.0 update patch series) Message-ID: References: <20180423155401.0e5ef117@mykolab.com> <20180423092812.1ddba41d@mykolab.com> X-Gnu-PR-Message: they-closed 31244 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 31244@debbugs.gnu.org Date: Mon, 23 Apr 2018 13:55:01 +0000 Content-Type: multipart/mixed; boundary="----------=_1524491701-22577-1" This is a multi-part message in MIME format... ------------=_1524491701-22577-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #31244: [PATCH] ffmpeg 4.0 update patch series which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 31244@debbugs.gnu.org. --=20 31244: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D31244 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1524491701-22577-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 31244-done) by debbugs.gnu.org; 23 Apr 2018 13:54:23 +0000 Received: from localhost ([127.0.0.1]:36634 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fAbvD-0005rB-5f for submit@debbugs.gnu.org; Mon, 23 Apr 2018 09:54:23 -0400 Received: from mx.kolabnow.com ([95.128.36.42]:47222) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fAbvB-0005qy-CK for 31244-done@debbugs.gnu.org; Mon, 23 Apr 2018 09:54:22 -0400 Received: from localhost (unknown [127.0.0.1]) by ext-mx-out002.mykolab.com (Postfix) with ESMTP id 71D182AA4; Mon, 23 Apr 2018 15:54:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mykolab.com; h= content-type:content-type:mime-version:references:in-reply-to :message-id:subject:subject:from:from:date:date:received :received:received; s=dkim20160331; t=1524491654; x=1526306055; bh=DmxM5/atclS4dDD70RHU8vNawwDuxTptngIqJOgN/40=; b=ZMW3EVF9omBh AmoMOoG35t3qlGhCt6E7B+bLBQ/1stFJdgOJZrxyJLNX3dtLlPG8qLaXhdXNUpQe FqfB21aDGb9wtIUUPRxWZ9WiWOIt1FIzd+ZCs9DCVgQwDzWN0h5YGjU4Ra9+0gcX mFzjy9uGdQwWEVPnSWkNxOXao2UFvkpAA3iWktvkrKwwRoSrtbRrMqvnMZehjDof yn4LIRVm1tMoQzc0vsaIu4K3CARx+JMC6GGxsT1M6vuzm64GseFtavNVpG3/S968 occWwiudnWyte9U6nctsbs7Eo4GSy/J53fVFJ50ThUQTyohgubP2pivqS6IMX4rR V8JymfUsWmdqlyQlZ8NKwsqU+0FEJbf1015UaiHjI/O16Weg2DZM7y17sJO1+HNS rC9H/F6IL2bPllJ72mYb5R6smmz4/57nnEknUbARgEWL0qSCuD/pyHLOLDO286y4 h0KDiZHpPraL3TUgh67Hm2Nue5vqqxniE0PGE6/K7eYIqPWECP0BovuFesArp+av fZ7HMzoxFfPqlXeDYXhXhBQhOE3J78vm+QJVCwUhObmvYD0TqbUPH0ITJCjqslRP DrGw7vzSWFi0Clp6TiDg9u1GhXziqzp5qorc0Sdg6EP5FB7uOC+BH/0gCeUWvmEs +1GOneOSZdrtLjdvPbdezLjLKgnjtbk= X-Virus-Scanned: amavisd-new at mykolab.com X-Spam-Flag: NO X-Spam-Score: -2.899 X-Spam-Level: X-Spam-Status: No, score=-2.899 tagged_above=-10 required=4.5 tests=[ALL_TRUSTED=-1, BAYES_00=-1.9, FREEMAIL_FROM=0.001] autolearn=ham autolearn_force=no Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out002.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YgAvuZ5e0NLw; Mon, 23 Apr 2018 15:54:14 +0200 (CEST) Received: from int-mx003.mykolab.com (unknown [10.9.13.3]) by ext-mx-out002.mykolab.com (Postfix) with ESMTPS id 9239BCC4; Mon, 23 Apr 2018 15:54:14 +0200 (CEST) Received: from ext-subm001.mykolab.com (unknown [10.9.6.1]) by int-mx003.mykolab.com (Postfix) with ESMTPS id 6212FAD2; Mon, 23 Apr 2018 15:54:14 +0200 (CEST) Date: Mon, 23 Apr 2018 15:54:01 +0200 From: Rutger Helling To: ludo@gnu.org (Ludovic =?UTF-8?B?Q291cnTDqHM=?=) Subject: Re: [bug#31244] [PATCH] ffmpeg 4.0 update patch series Message-ID: <20180423155401.0e5ef117@mykolab.com> In-Reply-To: <87muxu135k.fsf@gnu.org> References: <20180423092812.1ddba41d@mykolab.com> <87muxu135k.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/Z4b+jhAQmC.6n8FjTsEIB.P"; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 31244-done Cc: 31244-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --Sig_/Z4b+jhAQmC.6n8FjTsEIB.P Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Thanks for the review and explanation! I've squashed the commits and pushed. On Mon, 23 Apr 2018 15:08:23 +0200 ludo@gnu.org (Ludovic Court=C3=A8s) wrote: > Hello Rutger, >=20 > Rutger Helling skribis: >=20 > > 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. =20 >=20 > This all looks good to me, but I have one request: could you squash > all the changes, except perhaps the one removing =E2=80=98ffmpeg-git=E2= =80=99? >=20 > The rationale is that each commit should leave the repo in a =E2=80=9Cgoo= d=E2=80=9D > state, which would not be the case if we first install the patch that > upgrades ffmpeg and only then apply the ffmpeg =E2=86=92 ffmpeg-3.4 chang= es. >=20 > I hope that=E2=80=99s fine with you. >=20 > Thanks for working on it! >=20 > Ludo=E2=80=99. --Sig_/Z4b+jhAQmC.6n8FjTsEIB.P Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEAVThuRzJ2e93ZI3n86cn20T8yjYFAlrd5XkACgkQ86cn20T8 yjZ0Rwf/eJwQ6r1WYhVRCyygSWNCZ79+ERN5bIvvpWnvzrlhmPjrTuIDzNlvkDUL kwk/UYVGgxWnFcVZ3QBUdxWGKisb9OGCWq0wxPaOLPFK/r++k/pILM2lohBoNwRZ +HeUJ07ah6PEuXo5yOeHpgIxlWWrd1l7V6LRte+xeuJfTA6CD4B3+T6lXs4p5D8e HZ2Ly53UYSwWsq3Jt8B74lKIEyUYlueEcf3ARk1mAunt6BcxhTLSlOMpKZwa/6Y1 o1YpXB4oWxkI6e/rzMSTQOPPMZHklRnV/yPcKTt7pbl+hVRSSen0NIA2apQv9+2P IMRYtf5ge+TFP2y0/pvv0gATmi7zMg== =m8FM -----END PGP SIGNATURE----- --Sig_/Z4b+jhAQmC.6n8FjTsEIB.P-- ------------=_1524491701-22577-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 23 Apr 2018 07:28:53 +0000 Received: from localhost ([127.0.0.1]:36430 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fAVu4-0005RN-Vp for submit@debbugs.gnu.org; Mon, 23 Apr 2018 03:28:53 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54573) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fAVu2-0005R9-3r for submit@debbugs.gnu.org; Mon, 23 Apr 2018 03:28:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fAVtt-00034e-SP for submit@debbugs.gnu.org; Mon, 23 Apr 2018 03:28:41 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:52332) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fAVtt-00034V-Lb for submit@debbugs.gnu.org; Mon, 23 Apr 2018 03:28:37 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mykolab.com; h= content-type:content-type:mime-version:message-id:subject :subject:from:from:date:date:received:received:received; s= dkim20160331; t=1524468502; x=1526282903; bh=iL5RrFvG8a/DnB7QueR NL2hcwhr3+gqgzaEFFc5FvO4=; b=RFH3fwsHfwLcKZSw7lJV4wqK+2zclsHlbmA codE9bFNPJz10o3YdHCiYlgWWv7oTjEbq25ojkRJzPaoeld1Bq53evUc9E2QQyQk bldJdUgN2YhNUKwrQ69UnVmoZmmGvF7b2GOBrISjouyXk8jyhP6QldLem5bgfwfu idmBVM3xta7zyOROlh6GgU/lsQTMcLQoj4ktqxkSEDciJAR65epyabALyiI0FpFQ 9M34Q+xJMcfITW1+wnnHv2MvgL6zJJRyNycaGgjofIOK0bH5U6wn9ZZKamusiGrE +ZgDqzFb6s6aE1b9MyWSNnheb9mv4Z3zBV0nUWR1Bz6ed3mihv94xQ9pWW9IKlhf YhRtLLc1grUPSp6cXeuz8TTAV6wbe0gdtmFtSov+qYvniL+rsVa+nYPzVCetwTVZ zeuoSKj9NumoPB8cyr9kzkGy2Zk9U2EHzgwa+Nq40CiAQp7lvk9fLaMs7L6dwLV3 PlLEf073BgwBF9FArbMT8ikGdcEFhLvuArb3TNf8b+1amb76NHhcje8urIfrb/bs XM7mXc9hI5RVV7hTtMWG5JYhYNnRo4dvt1o4leMDQaujDFSEhHXSxnuh4hQExWKA 4XRzLDfSGeXG3q30fBGeHihki+QuBHPr/eDhjuJDHSZJiQiYHEVYK62POmpOOSLN 3RhLpmHk= X-Virus-Scanned: amavisd-new at mykolab.com 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 To: guix-patches@gnu.org Subject: [PATCH] ffmpeg 4.0 update patch series 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" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.1 (-----) --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-- ------------=_1524491701-22577-1--