From 5deb0c670de30689b7019f00f7b67af84f6056d3 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Fri, 30 Nov 2018 09:48:16 +0200
Subject: gnu: blender: Use newer ffmpeg.

* gnu/packages/graphics.scm (blender)[source]: Add patch for newer
ffmpeg compatability.
[inputs]: Replace ffmpeg-2.8 with ffmpeg.
* gnu/packages/patches/blender-newer-ffmpeg.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
---
 gnu/packages/graphics.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/graphics.scm')

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index c3c1a4a580..6e184d3334 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -85,7 +85,8 @@
                                   "blender-" version ".tar.gz"))
               (sha256
                (base32
-                "1g4kcdqmf67srzhi3hkdnr4z1ph4h9sza1pahz38mrj998q4r52c"))))
+                "1g4kcdqmf67srzhi3hkdnr4z1ph4h9sza1pahz38mrj998q4r52c"))
+              (patches (search-patches "blender-newer-ffmpeg.patch"))))
     (build-system cmake-build-system)
     (arguments
       (let ((python-version (version-major+minor (package-version python))))
@@ -141,7 +142,7 @@
        ("libjpeg" ,libjpeg)
        ("libpng" ,libpng)
        ("libtiff" ,libtiff)
-       ("ffmpeg-2.8" ,ffmpeg-2.8) ;<https://lists.gnu.org/archive/html/guix-devel/2016-04/msg01019.html>
+       ("ffmpeg" ,ffmpeg)
        ("fftw" ,fftw)
        ("jack" ,jack-1)
        ("libsndfile" ,libsndfile)
-- 
cgit v1.2.3