summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Enge <andreas@enge.fr>2015-04-17 20:54:47 +0200
committerAndreas Enge <andreas@enge.fr>2015-04-17 20:54:47 +0200
commit09dd019490e4a269b0a2d9512a07688f8ee657d3 (patch)
tree103d5e62999966715d75c4da777820535f32d446
parentdb5127d889d29895c9bb72337598001f7f8bdb53 (diff)
downloadguix-09dd019490e4a269b0a2d9512a07688f8ee657d3.tar.gz
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.
-rw-r--r--gnu/packages/video.scm15
1 files changed, 0 insertions, 15 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index e5e4743b2c..822d9021cb 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -334,9 +334,6 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).")
                 (("#! /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 @@ convert and stream audio and video.  It includes the libavcodec
 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")