Author: viric
Date: Sat Apr 23 21:58:30 2011
New Revision: 26943
URL: https://svn.nixos.org/websvn/nix/?rev=26943&sc=1
Log:
Updating some xiph.org libraries, and making some cross-compile.
Modified:
nixpkgs/trunk/pkgs/applications/audio/vorbis-tools/default.nix
nixpkgs/trunk/pkgs/development/libraries/libao/default.nix
nixpkgs/trunk/pkgs/development/libraries/libogg/default.nix
nixpkgs/trunk/pkgs/development/libraries/libtheora/default.nix
nixpkgs/trunk/pkgs/development/libraries/libvorbis/default.nix
nixpkgs/trunk/pkgs/development/libraries/tremor/default.nix
Modified: nixpkgs/trunk/pkgs/applications/audio/vorbis-tools/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/audio/vorbis-tools/default.nix Sat Apr
23 21:15:11 2011 (r26942)
+++ nixpkgs/trunk/pkgs/applications/audio/vorbis-tools/default.nix Sat Apr
23 21:58:30 2011 (r26943)
@@ -2,18 +2,14 @@
, speex, flac}:
stdenv.mkDerivation {
- name = "vorbis-tools-1.1.1";
+ name = "vorbis-tools-1.4.0";
src = fetchurl {
- url = http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.1.1.tar.gz;
- sha256 =
"617b4aa69e600c215b34fa3fd5764bc1d9d205d9d7d9fe7812bde7ec956fcaad";
+ url = http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.4.0.tar.gz;
+ sha256 = "1g12bnh5ah08v529y72kfdz5lhvy75iaz7f9jskyby23m9dkk2d3";
};
- # FIXME: Vorbis-tools expects `libOggFLAC', but this library was
- # merged with `libFLAC' as of FLAC 1.1.3.
buildInputs = [ libogg libvorbis libao pkgconfig curl speex glibc flac ];
- patches = [ ./ogg123-curlopt-mute.patch ];
-
meta = {
longDescription = ''
A set of command-line tools to manipulate Ogg Vorbis audio
Modified: nixpkgs/trunk/pkgs/development/libraries/libao/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/libao/default.nix Sat Apr 23
21:15:11 2011 (r26942)
+++ nixpkgs/trunk/pkgs/development/libraries/libao/default.nix Sat Apr 23
21:58:30 2011 (r26943)
@@ -2,10 +2,10 @@
, usePulseAudio }:
stdenv.mkDerivation {
- name = "libao-0.8.8";
+ name = "libao-1.1.0";
src = fetchurl {
- url = http://downloads.xiph.org/releases/ao/libao-0.8.8.tar.gz;
- sha256 =
"e52e05af6b10f42d2ee9845df1a581bf2b352060eabf7946aee0a600c3878954";
+ url = http://downloads.xiph.org/releases/ao/libao-1.1.0.tar.gz;
+ sha256 = "1m0v2y6bhr4iwsgdkc7b3y0qgpvpv1ifbxsy8n8ahsvjn6wmppi9";
};
buildInputs = [ pkgconfig alsaLib ] ++ (if usePulseAudio then [ pulseaudio ]
Modified: nixpkgs/trunk/pkgs/development/libraries/libogg/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/libogg/default.nix Sat Apr 23
21:15:11 2011 (r26942)
+++ nixpkgs/trunk/pkgs/development/libraries/libogg/default.nix Sat Apr 23
21:58:30 2011 (r26943)
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "libogg-1.2.0";
+ name = "libogg-1.2.2";
src = fetchurl {
url = "http://downloads.xiph.org/releases/ogg/${name}.tar.gz";;
- sha256 = "0sgbb7n8zwmycj2iid3h0hrxqg7ql9z34lg51bl99kca4cz9h3gk";
+ sha256 = "1fngv23r8anbf2f2x7s2bh1isxnw287gbc7mhh9g1m96pis0a05b";
};
meta = {
Modified: nixpkgs/trunk/pkgs/development/libraries/libtheora/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/libtheora/default.nix Sat Apr
23 21:15:11 2011 (r26942)
+++ nixpkgs/trunk/pkgs/development/libraries/libtheora/default.nix Sat Apr
23 21:58:30 2011 (r26943)
@@ -1,10 +1,16 @@
-{stdenv, fetchurl, libogg, libvorbis}:
+{stdenv, fetchurl, libogg, libvorbis, tremor}:
stdenv.mkDerivation {
- name = "libtheora-1.0";
+ name = "libtheora-1.1.1";
src = fetchurl {
- url = http://downloads.xiph.org/releases/theora/libtheora-1.0.tar.gz;
- sha256 = "0j5hv0pfsiwa2qq5d647py4g7ixnax1v47xc3aj5sa9v2iknib6m";
+ url = http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.gz;
+ sha256 = "0swiaj8987n995rc7hw0asvpwhhzpjiws8kr3s6r44bqqib2k5a0";
};
+
propagatedBuildInputs = [libogg libvorbis];
+
+ crossAttrs = {
+ propagatedBuildInputs = [libogg.hostDrv tremor.hostDrv];
+ configureFlags = "--disable-examples";
+ };
}
Modified: nixpkgs/trunk/pkgs/development/libraries/libvorbis/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/libvorbis/default.nix Sat Apr
23 21:15:11 2011 (r26942)
+++ nixpkgs/trunk/pkgs/development/libraries/libvorbis/default.nix Sat Apr
23 21:58:30 2011 (r26943)
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libogg }:
stdenv.mkDerivation rec {
- name = "libvorbis-1.3.1";
+ name = "libvorbis-1.3.2";
src = fetchurl {
url = "http://downloads.xiph.org/releases/vorbis/${name}.tar.bz2";;
- sha256 = "1q6gah9g6w5gxjq95x1x81a4w76p3caivq1bw4hxs0z9rx05qj22";
+ sha256 = "159khaa9j0pd4fm554m1igzmrhsa3qbh4n8avihfinwym05vc14z";
};
propagatedBuildInputs = [ libogg ];
Modified: nixpkgs/trunk/pkgs/development/libraries/tremor/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/tremor/default.nix Sat Apr 23
21:15:11 2011 (r26942)
+++ nixpkgs/trunk/pkgs/development/libraries/tremor/default.nix Sat Apr 23
21:58:30 2011 (r26943)
@@ -9,10 +9,13 @@
sha256 =
"161411cbefa1527da7a8fc087e78d8e21d19143d3a6eb42fb281e5026aad7568";
};
- buildInputs = [ autoconf automake libtool pkgconfig ];
+ buildNativeInputs = [ autoconf automake libtool pkgconfig ];
propagatedBuildInputs = [ libogg ];
- preConfigure = "autoreconf -vfi";
+ preConfigure = ''
+ autoreconf -vfi
+ sed -i /XIPH_PATH_OGG/d configure
+ '';
meta = {
homepage = http://xiph.org/tremor/;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
