Author: viric Date: 2010-06-24 22:55:25 +0000 (Thu, 24 Jun 2010) New Revision: 22410
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22410&view=rev Modified: nixpkgs/trunk/pkgs/applications/video/vlc/default.nix nixpkgs/trunk/pkgs/development/libraries/ffmpeg/default.nix nixpkgs/trunk/pkgs/development/libraries/libvpx/default.nix nixpkgs/trunk/pkgs/development/libraries/x264/default.nix nixpkgs/trunk/pkgs/top-level/all-packages.nix Log: New VLC, ffmpeg, x264 and libvpx all-in-one-rebuild. VP8 support. Changes: Modified: nixpkgs/trunk/pkgs/applications/video/vlc/default.nix =================================================================== --- nixpkgs/trunk/pkgs/applications/video/vlc/default.nix 2010-06-24 22:22:24 UTC (rev 22409) +++ nixpkgs/trunk/pkgs/applications/video/vlc/default.nix 2010-06-24 22:55:25 UTC (rev 22410) @@ -1,21 +1,21 @@ { stdenv, fetchurl, perl, xlibs, libdvdnav , zlib, a52dec, libmad, faad2, ffmpeg, alsa , pkgconfig, dbus, hal, fribidi, qt4, freefont_ttf -, libvorbis, libtheora, speex +, libvorbis, libtheora, speex, lua, libgcrypt }: stdenv.mkDerivation { - name = "vlc-1.0.6"; + name = "vlc-1.1.0"; src = fetchurl { - url = http://download.videolan.org/pub/videolan/vlc/1.0.6/vlc-1.0.6.tar.bz2; - sha256 = "0hhqbr0hwm07pimdy4rfmf3k3d6iz6icmrndirnp888hg8z968gm"; + url = http://download.videolan.org/pub/videolan/vlc/1.1.0/vlc-1.1.0.tar.bz2; + sha256 = "1j7icg7a2lr99kpc3sjjdp3z7128y6afnvxsafxlnih0qif2ryx9"; }; buildInputs = [ perl xlibs.xlibs xlibs.libXv zlib a52dec libmad faad2 ffmpeg alsa libdvdnav libdvdnav.libdvdread pkgconfig dbus hal fribidi qt4 - libvorbis libtheora speex + libvorbis libtheora speex lua libgcrypt ]; configureFlags = "--enable-alsa --disable-glx --disable-remoteosd --enable-faad --enable-theora --enable-vorbis --enable-speex"; Modified: nixpkgs/trunk/pkgs/development/libraries/ffmpeg/default.nix =================================================================== --- nixpkgs/trunk/pkgs/development/libraries/ffmpeg/default.nix 2010-06-24 22:22:24 UTC (rev 22409) +++ nixpkgs/trunk/pkgs/development/libraries/ffmpeg/default.nix 2010-06-24 22:55:25 UTC (rev 22410) @@ -1,11 +1,12 @@ -{stdenv, fetchurl, faad2, libtheora, speex, libvorbis, x264, pkgconfig, xvidcore, lame, yasm}: +{stdenv, fetchurl, faad2, libtheora, speex, libvorbis, x264, pkgconfig, xvidcore, lame, yasm +, libvpx}: stdenv.mkDerivation { - name = "ffmpeg-0.5.1"; + name = "ffmpeg-0.6"; src = fetchurl { - url = http://www.ffmpeg.org/releases/ffmpeg-0.5.1.tar.bz2; - sha256 = "0n68lihyy3jk4q7f22kv6nranfbafyl41hnzpa6cm0r0vf473gn2"; + url = http://www.ffmpeg.org/releases/ffmpeg-0.6.tar.bz2; + sha256 = "08419kg2i8j7x4mb3vm6a73fdszivj6lzh7lypxby30gfnkblc37"; }; # `--enable-gpl' (as well as the `postproc' and `swscale') mean that @@ -26,9 +27,10 @@ --enable-libxvid --enable-libmp3lame --enable-runtime-cpudetect + --enable-libvpx ''; - buildInputs = [faad2 libtheora speex libvorbis x264 pkgconfig xvidcore lame yasm]; + buildInputs = [faad2 libtheora speex libvorbis x264 pkgconfig xvidcore lame yasm libvpx]; meta = { homepage = http://www.ffmpeg.org/; Modified: nixpkgs/trunk/pkgs/development/libraries/libvpx/default.nix =================================================================== --- nixpkgs/trunk/pkgs/development/libraries/libvpx/default.nix 2010-06-24 22:22:24 UTC (rev 22409) +++ nixpkgs/trunk/pkgs/development/libraries/libvpx/default.nix 2010-06-24 22:55:25 UTC (rev 22410) @@ -1,11 +1,11 @@ -{stdenv, fetchurl, bash}: +{stdenv, fetchurl, bash, yasm}: stdenv.mkDerivation rec { - name = "libvpx-0.9.0"; + name = "libvpx-0.9.1"; src = fetchurl { - url = http://webm.googlecode.com/files/libvpx-0.9.0.tar.bz2; - sha256 = "1p5rl7r8zpw43n8i38wv73na8crkkakw16yx0v7n3ywwhp36l2d0"; + url = http://webm.googlecode.com/files/libvpx-0.9.1.tar.bz2; + sha256 = "0ngc8y12np2q6yhrrn6cbmlbzwbk10fnldj8d5dxxzvrw1iy9s64"; }; patchPhase = '' @@ -16,13 +16,15 @@ configurePhase = '' mkdir -p build cd build - ../configure --disable-install-srcs --disable-examples --enable-vp8 --enable-runtime-cpu-detect + ../configure --disable-install-srcs --disable-examples --enable-vp8 --enable-runtime-cpu-detect --enable-shared --enable-pic ''; installPhase = '' make quiet=false DIST_DIR=$out install ''; + buildInputs = [ yasm ]; + meta = { description = "VP8 video encoder"; homepage = http://code.google.com/p/webm; Modified: nixpkgs/trunk/pkgs/development/libraries/x264/default.nix =================================================================== --- nixpkgs/trunk/pkgs/development/libraries/x264/default.nix 2010-06-24 22:22:24 UTC (rev 22409) +++ nixpkgs/trunk/pkgs/development/libraries/x264/default.nix 2010-06-24 22:55:25 UTC (rev 22410) @@ -1,12 +1,12 @@ {stdenv, fetchurl, yasm}: stdenv.mkDerivation rec { - version = "snapshot-20100429-2245"; + version = "snapshot-20100624-2245"; name = "x264-${version}"; src = fetchurl { url = "ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-${version}.tar.bz2";; - sha256 = "16b24mc63zyp4h4fqyvgzbdclnhpay4l72yfqzwnzsnlby94zwcj"; + sha256 = "0hva3j7h99hl3l1p32a1j6p35s5aakkg3plp8xx1wk6qplxhkqsq"; }; patchPhase = '' Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix =================================================================== --- nixpkgs/trunk/pkgs/top-level/all-packages.nix 2010-06-24 22:22:24 UTC (rev 22409) +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix 2010-06-24 22:55:25 UTC (rev 22410) @@ -3790,7 +3790,7 @@ ffmpeg = import ../development/libraries/ffmpeg { inherit fetchurl stdenv faad2 libvorbis speex libtheora x264 pkgconfig xvidcore - lame yasm; + lame yasm libvpx; }; fftw = import ../development/libraries/fftw { @@ -4801,7 +4801,7 @@ }; libvpx = import ../development/libraries/libvpx { - inherit fetchurl stdenv bash; + inherit fetchurl stdenv bash yasm; }; libvterm = import ../development/libraries/libvterm { @@ -8831,9 +8831,10 @@ vlc = import ../applications/video/vlc { inherit fetchurl stdenv perl xlibs zlib a52dec libmad faad2 ffmpeg libdvdnav pkgconfig hal fribidi qt4 freefont_ttf - libvorbis libtheora speex; + libvorbis libtheora speex libgcrypt; dbus = dbus.libs; alsa = alsaLib; + lua = lua5; }; vnstat = import ../applications/networking/vnstat { _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
