[bug#31244] [PATCH] ffmpeg 4.0 update patch series

[bug#31244] [PATCH] ffmpeg 4.0 update patch series

[Rutger Helling]

[-- Attachment #1.1: Type: text/plain, Size: 257 bytes --]

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.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-ffmpeg-Update-to-4.0.patch --]
[-- Type: text/x-patch, Size: 1194 bytes --]

From f59c60004fc453aee4b58764337ea5c5064869c5 Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
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)
-- 
2.17.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: 0002-gnu-Add-ffmpeg-3.4.patch --]
[-- Type: text/x-patch, Size: 1128 bytes --]

From 902ea7f4743bc5f1c882bc11a18cbb02e2451ae9 Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
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 libavcodec
 audio/video codec library.")
     (license license:gpl2+)))
 
+(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)
-- 
2.17.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.4: 0003-gnu-Remove-ffmpeg-git.patch --]
[-- Type: text/x-patch, Size: 1502 bytes --]

From b3c8cf27518bbbc6bd8c1398e3e6bfab66c8b19f Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
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))))))
 
-;; 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")
-- 
2.17.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.5: 0004-gnu-mpv-Build-with-ffmpeg-instead-of-ffmpeg-git.patch --]
[-- Type: text/x-patch, Size: 856 bytes --]

From 7d0f7c38fbf6261b47a7878413275c4070c353ac Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
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)
-- 
2.17.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.6: 0005-gnu-gst-libav-Build-with-ffmpeg-3.4.patch --]
[-- Type: text/x-patch, Size: 942 bytes --]

From 76bb565c83a412e843c6ce8df50a8c39b09d3e1c Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
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 instead
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 to 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/")
-- 
2.17.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.7: 0006-gnu-qtox-Build-with-ffmpeg-3.4.patch --]
[-- Type: text/x-patch, Size: 967 bytes --]

From 620b5c4daa1a79df983b188e8e0318c8af7a0454 Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
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 capabilities.")
                    ,(list (string-append (assoc-ref inputs "qtsvg")
                                          "/lib/qt5/plugins/"))))))))))
     (inputs
-     `(("ffmpeg" ,ffmpeg)
+     `(("ffmpeg" ,ffmpeg-3.4)
        ("filteraudio" ,filteraudio)
        ("glib" ,glib)
        ("gtk+" ,gtk+-2)
-- 
2.17.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.8: 0007-gnu-dolphin-emu-Build-with-ffmpeg-3.4.patch --]
[-- Type: text/x-patch, Size: 874 bytes --]

From 4e43d26b34f7a0bdd2a0a8e91fc2085aaf0eed02 Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
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)
-- 
2.17.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.9: 0008-gnu-libextractor-Build-with-ffmpeg-3.4.patch --]
[-- Type: text/x-patch, Size: 866 bytes --]

From 9c892c6f595b23c4e597bae217a79445955d51ed Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
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 instead
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 plug-in
       ("glib" ,glib)
       ("gstreamer" ,gstreamer)
-- 
2.17.0


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#31244] [PATCH] ffmpeg 4.0 update patch series

[Ludovic Courtès]

Hello Rutger,

Rutger Helling <rhelling@mykolab.com> 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 ‘ffmpeg-git’?

The rationale is that each commit should leave the repo in a “good”
state, which would not be the case if we first install the patch that
upgrades ffmpeg and only then apply the ffmpeg → ffmpeg-3.4 changes.

I hope that’s fine with you.

Thanks for working on it!

Ludo’.

bug#31244: [PATCH] ffmpeg 4.0 update patch series

[Rutger Helling]

[-- Attachment #1: Type: text/plain, Size: 963 bytes --]

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ès) wrote:

> Hello Rutger,
> 
> Rutger Helling <rhelling@mykolab.com> 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 ‘ffmpeg-git’?
> 
> The rationale is that each commit should leave the repo in a “good”
> state, which would not be the case if we first install the patch that
> upgrades ffmpeg and only then apply the ffmpeg → ffmpeg-3.4 changes.
> 
> I hope that’s fine with you.
> 
> Thanks for working on it!
> 
> Ludo’.


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]