ffmpeg patches

ffmpeg patches

[Taylan Ulrich Bayırlı/Kammer]

[-- Attachment #1: Type: text/plain, Size: 499 bytes --]

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.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: patch1 --]
[-- Type: text/x-diff, Size: 1146 bytes --]

From 3461bf25f24de9b2cedffb5bcdec4be631e772cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
 <taylanbayirli@gmail.com>
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


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: patch2 --]
[-- Type: text/x-diff, Size: 2359 bytes --]

From 4373dfde4c77fc7e0b7b3e60c478017471714856 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
 <taylanbayirli@gmail.com>
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

Re: ffmpeg patches

[Andreas Enge]

Hello,

On Wed, Feb 25, 2015 at 03:54:02PM +0100, Taylan Ulrich Bayırlı/Kammer wrote:
> - 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.

that sounds convincing to me.

> 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.

Frankly, I would just include this silently into the second patch, dropping
a comment that has obviously become useless does not warrant its own commit
(others may have different opinons).

Is there a patch number 3?

Andreas

Re: ffmpeg patches

[Taylan Ulrich Bayırlı/Kammer]

Andreas Enge <andreas@enge.fr> writes:

> Frankly, I would just include this silently into the second patch,
> dropping a comment that has obviously become useless does not warrant
> its own commit (others may have different opinons).

OK.  Will push it as one commit if nobody objects.

> Is there a patch number 3?

That's just the Audacity patch which I rebased on top all the others
because it's not done yet, and has been generated together with the
others because I just do 'git format-patch HEAD~X' every time.  (Might
want to refine my git work-flow some time.)

Taylan