From mboxrd@z Thu Jan 1 00:00:00 1970 From: taylanbayirli@gmail.com (Taylan Ulrich =?utf-8?Q?Bay=C4=B1rl=C4=B1?= =?utf-8?Q?=2FKammer?=) Subject: ffmpeg patches Date: Wed, 25 Feb 2015 15:54:02 +0100 Message-ID: <87fv9u6nzp.fsf@taylan.uni.cx> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:33850) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQdLk-0005fy-6F for guix-devel@gnu.org; Wed, 25 Feb 2015 09:54:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YQdLi-0007GO-Uf for guix-devel@gnu.org; Wed, 25 Feb 2015 09:54:08 -0500 Received: from mail-wg0-x22f.google.com ([2a00:1450:400c:c00::22f]:40169) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQdLi-0007GE-It for guix-devel@gnu.org; Wed, 25 Feb 2015 09:54:06 -0500 Received: by wghl18 with SMTP id l18so4136805wgh.7 for ; Wed, 25 Feb 2015 06:54:05 -0800 (PST) Received: from taylan.uni.cx (p200300514A2BB80C0213E8FFFEED36FB.dip0.t-ipconnect.de. [2003:51:4a2b:b80c:213:e8ff:feed:36fb]) by mx.google.com with ESMTPSA id fo9sm25443117wib.16.2015.02.25.06.54.04 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Feb 2015 06:54:04 -0800 (PST) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org --=-=-= Content-Type: text/plain These are fairly trivial but: - Please verify the commit message style. - The second adds a (gnu packages audio) import to (gnu packages video), which makes sense I think because video media usually contains audio, but in my Audacity patch I had added (gnu packages video) to (gnu packages audio) because Audacity uses FFmpeg, and that would be a circular import. I would say Audacity should go into its own module, and we will have to remember that we cannot import video from audio. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-gnu-ffmpeg-Fix-comment.patch Content-Description: patch1 >From 3461bf25f24de9b2cedffb5bcdec4be631e772cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?= Date: Mon, 23 Feb 2015 14:13:00 +0100 Subject: [PATCH 1/3] gnu: ffmpeg: Fix comment. * gnu/packages/video.scm (ffmpeg): Remove libmp3lame from the comments listing additional optional dependencies, because it's already been added on the meanwhile. --- gnu/packages/video.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 73f8558..0d7677f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -128,7 +128,6 @@ ;; --enable-libiec61883 enable iec61883 via libiec61883 [no] ;; --enable-libilbc enable iLBC de/encoding via libilbc [no] ;; --enable-libmodplug enable ModPlug via libmodplug [no] -;; --enable-libmp3lame enable MP3 encoding via libmp3lame [no] ;; --enable-libnut enable NUT (de)muxing via libnut, ;; native (de)muxer exists [no] ;; --enable-libopencore-amrnb enable AMR-NB de/encoding via libopencore-amrnb [no] -- 2.2.1 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0002-gnu-ffmpeg-Add-soxr-and-twolame-as-inputs.patch Content-Description: patch2 >From 4373dfde4c77fc7e0b7b3e60c478017471714856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?= Date: Mon, 23 Feb 2015 20:42:41 +0100 Subject: [PATCH 2/3] gnu: ffmpeg: Add soxr and twolame as inputs. * gnu/packages/video.scm (ffmpeg): Add soxr and twolame as inputs. --- gnu/packages/video.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 0d7677f..af3b5b4 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -28,6 +28,7 @@ #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages algebra) + #:use-module (gnu packages audio) #:use-module (gnu packages avahi) #:use-module (gnu packages cdrom) #:use-module (gnu packages compression) @@ -78,7 +79,9 @@ ("libvorbis" ,libvorbis) ("libvpx" ,libvpx) ("patchelf" ,patchelf) + ("soxr" ,soxr) ("speex" ,speex) + ("twolame" ,twolame) ("zlib", zlib))) (native-inputs `(("bc" ,bc) @@ -139,11 +142,9 @@ ;; --enable-librtmp enable RTMP[E] support via librtmp [no] ;; --enable-libschroedinger enable Dirac de/encoding via libschroedinger [no] ;; --enable-libshine enable fixed-point MP3 encoding via libshine [no] -;; --enable-libsoxr enable Include libsoxr resampling [no] ;; --enable-libssh enable SFTP protocol via libssh [no] ;; (libssh2 does not work) ;; --enable-libstagefright-h264 enable H.264 decoding via libstagefright [no] -;; --enable-libtwolame enable MP2 encoding via libtwolame [no] ;; --enable-libutvideo enable Ut Video encoding and decoding via libutvideo [no] ;; --enable-libv4l2 enable libv4l2/v4l-utils [no] ;; --enable-libvidstab enable video stabilization using vid.stab [no] @@ -169,8 +170,10 @@ "--enable-libfreetype" "--enable-libmp3lame" "--enable-libopus" + "--enable-libsoxr" "--enable-libspeex" "--enable-libtheora" + "--enable-libtwolame" "--enable-libvorbis" "--enable-libvpx" -- 2.2.1 --=-=-=--