mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 13:10:33 +00:00
Code Issues Wiki Activity
23783 commits 312 branches 124 tags 6.5 GiB
Commit graph

42 commits

Author SHA1 Message Date
Eelco Dolstra 5bb548d2e4 Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-17 14:19:14 +01:00
Lluís Batlle i Rossell 982dd693b3 Adding ffmpeg 1.1 
Moving packages using 1.0 to using 1.1. Vlc built fine here.
 2013-01-14 00:41:01 +01:00
Jan Malakhovski 33ea74f9b6 ffmpeg: show vdpauSupport to the world 2013-01-05 23:33:50 +01:00
Lluís Batlle i Rossell a72f66aded ffmpeg 1.0: adding alsa support 2013-01-03 19:45:20 +01:00
Cillian de Róiste 471eb0ba53 ffmpeg: Add option to enable x11grab support. 
This is useful for making screencasts, or bug reporting.

Note: This is copied from aszlig's pull request: 05831d3a66
 2012-09-30 23:53:39 +02:00
Lluís Batlle i Rossell cb7e161361 ffmpeg: adding 1.0 back as an attribute apart. 2012-09-30 12:20:55 +02:00
Lluís Batlle i Rossell 3bc6675d70 Revert "ffmpeg: update to 1.0" 
This reverts commit 8ea11ec677.

It was breaking things, as said by Eelco said in nix-dev:
http://hydra.nixos.org/eval/742774
 2012-09-30 12:19:37 +02:00
Lluís Batlle i Rossell 8ea11ec677 ffmpeg: update to 1.0 2012-09-29 23:37:05 +02:00
Eelco Dolstra 63b257e0e1 Revert "ffmpeg: Update to latest version 0.11.1." 
This reverts commit c6a2a1f885.
 2012-07-24 11:43:31 -04:00
Eelco Dolstra bb8ac70291 Revert "ffmpeg: Add option to enable x11grab support." 
This reverts commit 05831d3a66.
 2012-07-24 11:43:30 -04:00
Eelco Dolstra 605f9bec52 Revert "ffmpeg: Add alsaLib to dependencies." 
This reverts commit d9f08cf6f2.
 2012-07-24 11:43:29 -04:00
Eelco Dolstra bf4c4d7a36 Revert "ffmpeg: Add optional Jack audio support." 
This reverts commit fe42f8add9.
 2012-07-24 11:43:24 -04:00
Cillian de Róiste fe42f8add9 ffmpeg: Add optional Jack audio support. 
The author of this commit is @cillianderoiste because he made the patch and I'm
just committing it.

This change adds support for Jack audio "while we're at it", see discussion at
pull request #54.
 2012-07-19 04:37:33 +02:00
aszlig d9f08cf6f2 ffmpeg: Add alsaLib to dependencies. 
As @cillianderoiste pointed out, it makes sense to have this in, not only to
record audio while grabbing the display. This is not optional in this case, as
it isn't a compile time option either. And on the other hand, having ffmpeg
running with OSS doesn't appear reasonable to me, as ffmpeg will fall back to
OSS if alsa isn't available anyway.
 2012-07-18 17:27:24 +02:00
aszlig 05831d3a66 ffmpeg: Add option to enable x11grab support. 
This is especially useful if you want to do screencasts and other sorts of
things like that.
 2012-07-18 14:33:26 +02:00
aszlig c6a2a1f885 ffmpeg: Update to latest version 0.11.1. 
This is needed in order to enable x11grab, as it isn't included in 0.10.
 2012-07-18 13:34:22 +02:00
Lluís Batlle i Rossell 96a0a68598 ffmpeg: build the ffserver 
Since the first expression of ffmpeg, it's disabled. I don't know why.
It does not require more dependencies.
 2012-07-06 12:10:06 +02:00
Lluís Batlle i Rossell 8427f56203 ffmpeg: adding libdc1394 support (default false) 2012-07-06 12:01:58 +02:00
Peter Simons 225ee0a26c ffmpeg: enable support for libvdpau acceleration 
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
 2012-07-02 16:53:53 +02:00
Lluís Batlle i Rossell d83e1b4b5d Updating libvorbis and libogg, and enabling by default libvorbis and libxvid on ffmpeg. 
I think there are little drawbacks on that, whlie there are benefits.


svn path=/nixpkgs/trunk/; revision=32145
 2012-02-08 19:54:16 +00:00
Lluís Batlle i Rossell d341b2537c Updating ffmpeg/x264/vpx 
svn path=/nixpkgs/trunk/; revision=31937
 2012-01-30 21:02:08 +00:00
Eelco Dolstra 444263db25 * ffmpeg updated to 0.8.1 (including security fixes). 
svn path=/nixpkgs/branches/kde-4.7/; revision=28109
 2011-08-01 12:01:09 +00:00
Eelco Dolstra 1b427fe052 * Sync with the trunc. 
* Fixed the hash in PulseAudio: I updated the name/version, but forgot
  to update the hash.  So secretly it was still building the old
  version.  Also, now that we've realised that the PulseAudio server
  and library don't need to be the same build, disable some
  dependencies by default (avahi and bluez).

svn path=/nixpkgs/branches/kde-4.7/; revision=28023
 2011-07-31 19:44:58 +00:00
Nicolas Pierron 0690f20ea8 ffmpeg: Add previous version to fix fuppes. 
svn path=/nixpkgs/trunk/; revision=27980
 2011-07-27 21:00:09 +00:00
Eelco Dolstra fca12d0cf6 * ffmpeg: Add zlib and bzip2 to the build inputs to enable a few more 
codecs.

svn path=/nixpkgs/branches/kde-4.7/; revision=27945
 2011-07-25 14:46:04 +00:00
Eelco Dolstra 2ef93dae71 * ffmpeg updated to 0.8. Disable libvorbis and libxvidcore support by 
default because ffmpeg (libavcodec) has native support for those
  formats.

svn path=/nixpkgs/branches/kde-4.7/; revision=27943
 2011-07-25 14:35:54 +00:00
Eelco Dolstra 03055c5300 * Updated ffmpeg, faac and xvidcore. 
* ffmpeg: enable support for faac (disabled by default because faac is
  non-free).
* faac: use an external mp4v2 because the internal one doesn't build.

svn path=/nixpkgs/trunk/; revision=27240
 2011-05-12 20:43:33 +00:00
Lluís Batlle i Rossell 3b0ea0e5d4 Updating ffmpeg and libvpx. 
svn path=/nixpkgs/trunk/; revision=26938
 2011-04-23 20:58:52 +00:00
Lluís Batlle i Rossell a88f348d5b Make mplayer build on the loongson2f 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23578
 2010-09-01 08:36:09 +00:00
Lluís Batlle i Rossell 924177da84 New VLC, ffmpeg, x264 and libvpx all-in-one-rebuild. VP8 support. 
svn path=/nixpkgs/trunk/; revision=22410
 2010-06-24 22:55:25 +00:00
Lluís Batlle i Rossell adc9f57c71 Adding lame to ffmpeg so it can encode mp3, and allow it also build its assembly 
routines adding yasm, and --enable-runtime-cpudetection, that I hope will end in
faster executions

svn path=/nixpkgs/trunk/; revision=21971
 2010-05-25 18:39:24 +00:00
Lluís Batlle i Rossell b3870f0148 Adding xvid, to ffmpeg and mplayer. 
svn path=/nixpkgs/trunk/; revision=21469
 2010-04-30 21:47:09 +00:00
Lluís Batlle i Rossell 7b6ce0f9df Updating x264, and adding x264 support to mplayer and ffmpeg. 
svn path=/nixpkgs/trunk/; revision=21451
 2010-04-30 08:33:47 +00:00
Armijn Hemel fdc760a3f6 add libtheora, speex, vorbis to ffmpeg 
svn path=/nixpkgs/trunk/; revision=21067
 2010-04-14 09:45:22 +00:00
Armijn Hemel 75fb2e32db update to 0.5.1 
svn path=/nixpkgs/trunk/; revision=21064
 2010-04-14 09:18:45 +00:00
Eelco Dolstra 9609437573 * ffmpeg needs --enable-shared. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=15254
 2009-04-22 19:20:27 +00:00
Eelco Dolstra 94d7d1fdbb * Got rid of all --disable-static flags; they're redundant now. 
* Also a bunch of style cleanups (tabs, with args, ...).

svn path=/nixpkgs/branches/stdenv-updates/; revision=15235
 2009-04-21 23:18:09 +00:00
Eelco Dolstra 1485c905f7 * ffmpeg: build with faad2 support. However, vlc still won't play 
mp4a audio.
* faad2: latest version.
* vlc: fix the hard-coded OSD font path name.  Dunno why they don't
  use fontconfig.

svn path=/nixpkgs/trunk/; revision=14501
 2009-03-10 22:45:27 +00:00
Eelco Dolstra 44ac9e249c * MPlayer: updated to the SVN version. 
* VLC: updated to 0.9.8a.  It now uses Qt for the GUI, which looks a
  lot better than the wxWidgets one.
* libdvdread, libdvdnav: updated to 4.1.3.
* ffmpeg: updated to 0.5 (a new release!).  Got rid of the SVN
  version, which shouldn't be necessary anymore.

svn path=/nixpkgs/trunk/; revision=14500
 2009-03-10 21:03:51 +00:00
Eelco Dolstra a0159dee8e * Reverted r6713, r6711, r4623, r3660, r2237. There rewrote fetchurl 
URLs to http://nix.cs.uu.nl/dist/tarballs.  With content-addressable
  mirror support (r9190, NIXPKGS-70) this is no longer necessary:
  fetchurl will try to download from that location automatically.  So
  we can keep the original URLs.

svn path=/nixpkgs/trunk/; revision=9192
 2007-08-24 12:32:36 +00:00
Eelco Dolstra 1442e8ec22 * Copy a bunch of files to nix.cs.uu.nl. 
svn path=/nixpkgs/trunk/; revision=6711
 2006-10-12 13:50:54 +00:00
Eelco Dolstra d97fa85adf * Some VLC-related updates. 
* Variability :-)  Provide both Autoconf 2.59 and 2.60 (the former
  being the default for now).

svn path=/nixpkgs/trunk/; revision=5539
 2006-06-29 12:41:25 +00:00