guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

04/14: gnu: ffmpeg@4: Build against SDL2 2.0 so 'ffplay' gets built.


From: guix-commits
Subject: 04/14: gnu: ffmpeg@4: Build against SDL2 2.0 so 'ffplay' gets built.
Date: Sun, 2 Oct 2022 18:11:33 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 782c7455e1ea3785e8c7e9b300d55c9ebb441a35
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sun Oct 2 23:15:55 2022 +0200

    gnu: ffmpeg@4: Build against SDL2 2.0 so 'ffplay' gets built.
    
    Fixes <https://issues.guix.gnu.org/58090>.
    Reported by Zhu Zihao <all_but_last@163.com>.
    
    * gnu/packages/sdl.scm (sdl2-2.0): New variable.
    * gnu/packages/video.scm (ffmpeg-4)[inputs]: New field.
---
 gnu/packages/sdl.scm   | 14 ++++++++++++++
 gnu/packages/video.scm |  2 ++
 2 files changed, 16 insertions(+)

diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index 2523889a8d..2a10ff3962 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -155,6 +155,20 @@ joystick, and graphics hardware.")
                wayland-protocols)))
     (license license:bsd-3)))
 
+(define-public sdl2-2.0
+  (package
+    (inherit sdl2)
+    (name "sdl2")
+    (version "2.0.14")
+    (source (origin
+              (method url-fetch)
+              (uri
+               (string-append "https://libsdl.org/release/SDL2-";
+                              version ".tar.gz"))
+              (sha256
+               (base32
+                "1g1jahknv5r4yhh1xq5sf0md20ybdw1zh1i15lry26sq39bmn8fq"))))))
+
 (define-public libmikmod
   (package
     (name "libmikmod")
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 6a14a85b74..5568c5be8b 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1772,6 +1772,8 @@ audio/video codec library.")
              (sha256
               (base32
                "14xadxm1yaamp216nq09xwasxg5g133v86dbb33mdg5di1zrlhdg"))))
+    (inputs (modify-inputs (package-inputs ffmpeg-5)
+              (replace "sdl2" sdl2-2.0)))
     (arguments
      (substitute-keyword-arguments (package-arguments ffmpeg-5)
        ((#:configure-flags flags ''())



reply via email to

[Prev in Thread] Current Thread [Next in Thread]