Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Configurable FFmpeg expression, fdk-aac library, license fixes #1461

Merged
merged 3 commits into from
Jan 7, 2014

Conversation

ttuegel
Copy link
Member

@ttuegel ttuegel commented Jan 5, 2014

These commits do several things:

  • Add ffmpeg_configurable, a configurable expression for FFmpeg styled after vim_configurable. Otherwise, it's difficult to configure an FFmpeg expression for users who want the command line tool in their environment.
  • Add the fdk-aac library, a high-quality AAC codec implementation from Android.
  • Allow ffmpeg_2 and ffmpeg_configurable to use the fdk-aac library. This is disabled by default because:
  • FFmpeg is GPLv2+ unless fdk-aac or faac are enabled, in which case it is non-free and unredistributable.

@vcunat
Copy link
Member

vcunat commented Jan 7, 2014

It looks good, thanks!

vcunat added a commit that referenced this pull request Jan 7, 2014
add configurable FFmpeg expression, fdk-aac library, license fixes
@vcunat vcunat merged commit 54f73f7 into NixOS:master Jan 7, 2014
@vcunat
Copy link
Member

vcunat commented Jan 7, 2014

Actually, I planned to make a configurable ffmpeg/libav switch, so this will be a very nice base. Also for supporting multiple versions inside one expression. When I get to it... there are higher-priority issues right now (e.g. stdenv-updates).

@edolstra
Copy link
Member

edolstra commented Jan 7, 2014

Hm, we already have 5 variants of ffmpeg in Nixpkgs, do we really want another one? In particular, why do we need both ffmpeg/2.x.nix and ffmpeg/configurable.nix, given that they both build version 2.1.1?

@domenkozar
Copy link
Member

I'd say 2.x.nix should use configurable one.

@vcunat
Copy link
Member

vcunat commented Jan 7, 2014

I think all should use one configurable expression (a slight modification of this one, for example).

@vcunat
Copy link
Member

vcunat commented Jan 7, 2014

(So far the files only differed in hash and version AFAIK. And maybe some older versions aren't really needed anymore.)

@bluescreen303
Copy link
Contributor

I recently upgraded every (minor) version and checked each package in
nixpkgs to find the highest supported versions. All versions that are
around now are needed by at least 1 package.

@vcunat
Copy link
Member

vcunat commented Jan 7, 2014

@bluescreen303: even if considering updating the packages (that don't support newer versions)?

@ttuegel ttuegel deleted the ffmpeg branch January 7, 2014 15:41
@bluescreen303
Copy link
Contributor

I looked at this and upgraded some.
Especially for packages that depend on the older versions of ffmpeg
(0.6., 0.10.) this was without luck. I tried intermediate releases
(0.8, 0.11, 1.0, 1.1) too. There might be unofficial patches for some
packages and in many cases they might be simple to fix manually, but I
didn't look further than official releases.

@ttuegel ttuegel restored the ffmpeg branch January 9, 2014 14:04
@ttuegel ttuegel deleted the ffmpeg branch January 9, 2014 14:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants