[bug#29016] [PATCH] gnu: video: Add ffmpeg@3.3. (fixes for ffmpeg 3.4)

[bug#29016] [PATCH] gnu: video: Add ffmpeg@3.3. (fixes for ffmpeg 3.4)

[Rutger Helling]

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

Hey Guix, 

I've noticed a few packages unfortunately break with ffmpeg 3.4. This
patch adds ffmpeg 3.3.4 back and changes the inputs of these broken
packages to ffmpeg@3.3.

[-- Attachment #1.2: Type: text/html, Size: 366 bytes --]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-video-Add-ffmpeg-3.3.patch --]
[-- Type: text/x-diff; name=0001-gnu-video-Add-ffmpeg-3.3.patch, Size: 2314 bytes --]

From 4fd9ed660a0afbd362e1bff6d87d8641c32472ff Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Thu, 26 Oct 2017 19:50:17 +0200
Subject: [PATCH] gnu: video: Add ffmpeg@3.3.

* gnu/packages/gstreamer.scm (gst-libav)[inputs]: Change ffmpeg to ffmpeg@3.3.
* gnu/packages/messaging.scm (qtox)[inputs]: Change ffmpeg to ffmpeg@3.3.
* gnu/packages/video.scm (ffmpeg@3.3): New variable.
---
 gnu/packages/gstreamer.scm |  2 +-
 gnu/packages/messaging.scm |  2 +-
 gnu/packages/video.scm     | 12 ++++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index c308dc9f3..c87465db0 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -409,7 +409,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.3)
        ("orc" ,orc)
        ("zlib" ,zlib)))
     (home-page "http://gstreamer.freedesktop.org/")
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index cd9c41fcc..72dbbcd1e 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -822,7 +822,7 @@ instant messenger with audio and video chat capabilities.")
                (("TIMESTAMP") "\"\""))
              #t)))))
     (inputs
-     `(("ffmpeg" ,ffmpeg)
+     `(("ffmpeg" ,ffmpeg-3.3)
        ("glib" ,glib)
        ("gtk+" ,gtk+-2)
        ("libsodium" ,libsodium)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index d73e21a31..5596c4839 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -751,6 +751,18 @@ convert and stream audio and video.  It includes the libavcodec
 audio/video codec library.")
     (license license:gpl2+)))
 
+(define-public ffmpeg-3.3
+  (package
+    (inherit ffmpeg)
+    (version "3.3.4")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "0mx9dvad3lkyhvsrblf280x2bz6dxajya1ylnspbdzldj0dpxfcq"))))))
+
 (define-public ffmpeg-2.8
   (package
     (inherit ffmpeg)
-- 
2.14.3

bug#29016: [PATCH] gnu: video: Add ffmpeg@3.3. (fixes for ffmpeg 3.4)

[Marius Bakke]

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

Rutger Helling <rhelling@mykolab.com> writes:

> Hey Guix, 
>
> I've noticed a few packages unfortunately break with ffmpeg 3.4. This
> patch adds ffmpeg 3.3.4 back and changes the inputs of these broken
> packages to ffmpeg@3.3.

Thanks!  I tweaked the commit message to reflect the actual variable
names and added a followup commit to update ffmpeg@3.3 to 3.3.5 which
was released today.

Currently qemu and other gst-libav dependents may end up with two
different versions of ffmpeg in their closure, which is not great.  But
these two packages only have 10 dependents, so I guess it's okay.

Pushed as b1c01503dfcb915c39af4a45716ebafafb806549.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]