From 09dd019490e4a269b0a2d9512a07688f8ee657d3 Mon Sep 17 00:00:00 2001
From: Andreas Enge <andreas@enge.fr>
Date: Fri, 17 Apr 2015 20:54:47 +0200
Subject: [PATCH] gnu: ffmpeg: Drop old version 2.2.
* gnu/packages/video.scm (ffmpeg-2.2): Remove variable.
(ffmpeg)[arguments]: Drop LDFLAGS environment variable needed only for
older versions.
---
gnu/packages/video.scm | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index e5e4743b2c5..822d9021cb2 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -334,9 +334,6 @@ (define-public ffmpeg
(("#! /bin/sh") (string-append "#!" (which "bash"))))
(setenv "SHELL" (which "bash"))
(setenv "CONFIG_SHELL" (which "bash"))
- ;; FIXME: only needed for ffmpeg-2.2.13, but easier to add
- ;; globally; drop as soon as ffmpeg-2.2.13 is dropped
- (setenv "LDFLAGS" "-ldl")
;; possible additional inputs:
;; --enable-avisynth enable reading of AviSynth script files [no]
;; --enable-frei0r enable frei0r video filtering
@@ -438,18 +435,6 @@ (define-public ffmpeg
audio/video codec library.")
(license license:gpl2+)))
-;; We need this older ffmpeg because vlc-2.1.5 doesn't work with ffmpeg-2.4.
-(define-public ffmpeg-2.2
- (package (inherit ffmpeg)
- (version "2.2.13")
- (source (origin
- (method url-fetch)
- (uri (string-append "http://www.ffmpeg.org/releases/ffmpeg-"
- version ".tar.bz2"))
- (sha256
- (base32
- "1vva8ffwxi3rg44byy09qlbiqrrd1h4rmsl5b1mbmvzvwl1lq1l0"))))))
-
(define-public vlc
(package
(name "vlc")
--
GitLab