From 54ff0b7dd7e68fa50dbea7a2d335c98fc60057d4 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Thu, 23 Jan 2014 19:05:09 +0100 Subject: gnu: Rename (gnu packages oggvorbis) to (gnu packages xiph). * gnu/packages/oggvorbis.scm: Rename this ... * gnu/packages/xiph.scm: ... to this. Adjust module name accordingly. * gnu-system.am (GNU_SYSTEM_MODULES): Update. * gnu/packages/{gnunet.scm, libcanberra.scm, mp3.scm, pulseaudio.scm, sdl.scm, video.scm}: Use new module name. --- gnu/packages/video.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index b1d1270c05..8e4315a880 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -25,11 +25,11 @@ #:use-module (gnu packages compression) #:use-module (gnu packages elf) #:use-module (gnu packages fontutils) - #:use-module (gnu packages oggvorbis) #:use-module (gnu packages openssl) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages xiph) #:use-module (gnu packages yasm)) (define-public ffmpeg -- cgit v1.2.3 From e816b348786cb65e57bfca08de9a5d926a7d46c1 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 24 Jan 2014 22:22:42 +0100 Subject: gnu: ffmpeg: Add input opus. * gnu/packages/video.scm (ffmpeg): Add input opus. --- gnu/packages/video.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 8e4315a880..8d02825c51 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -47,6 +47,7 @@ (inputs `(("fontconfig" ,fontconfig) ("freetype" ,freetype) + ("opus" ,opus) ("libtheora" ,libtheora) ("libvorbis" ,libvorbis) ("patchelf" ,patchelf) @@ -107,7 +108,6 @@ ;; --enable-libopencore-amrwb enable AMR-WB decoding via libopencore-amrwb [no] ;; --enable-libopencv enable video filtering via libopencv [no] ;; --enable-libopenjpeg enable JPEG 2000 de/encoding via OpenJPEG [no] -;; --enable-libopus enable Opus decoding via libopus [no] ;; --enable-libpulse enable Pulseaudio input via libpulse [no] ;; --enable-libquvi enable quvi input via libquvi [no] ;; --enable-librtmp enable RTMP[E] support via librtmp [no] @@ -142,6 +142,7 @@ "--enable-fontconfig" ;; "--enable-gnutls" ; causes test failures "--enable-libfreetype" + "--enable-libopus" "--enable-libspeex" "--enable-libtheora" "--enable-libvorbis" -- cgit v1.2.3 From 93e48d19c7561d9dc487c7e4bc423a72b149685d Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 24 Jan 2014 22:40:44 +0100 Subject: gnu: ffmpeg: Update to 2.1.3. * gnu/packages/video.scm (ffmpeg): Update to 2.1.3. --- gnu/packages/video.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 8d02825c51..369f29f7ac 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Andreas Enge +;;; Copyright © 2013, 2014 Andreas Enge ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,14 +35,14 @@ (define-public ffmpeg (package (name "ffmpeg") - (version "2.1.1") + (version "2.1.3") (source (origin (method url-fetch) (uri (string-append "http://www.ffmpeg.org/releases/ffmpeg-" version ".tar.bz2")) (sha256 (base32 - "1qnspbpwa6cflsb6mkm84ay4nfx60ism6d7lgvnasidck9dmxydy")))) + "18qkdpka94rp44x17q7d2bvmw26spxf41c69nvzy31szsdzjwcqx")))) (build-system gnu-build-system) (inputs `(("fontconfig" ,fontconfig) -- cgit v1.2.3