From d83e1b4b5d5984b553173a6c08c728a729ce5793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
<viric@vicerveza.homeunix.net>
Date: Wed, 8 Feb 2012 19:54:16 +0000
Subject: [PATCH] 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
---
pkgs/development/libraries/ffmpeg/default.nix | 4 ++--
pkgs/development/libraries/libogg/default.nix | 10 ++++++----
pkgs/development/libraries/libvorbis/default.nix | 9 +++++----
3 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index 38f12f779b65..3283302f1297 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -2,10 +2,10 @@
, mp3Support ? true, lame ? null
, speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null
-, vorbisSupport ? false, libvorbis ? null
+, vorbisSupport ? true, libvorbis ? null
, vpxSupport ? false, libvpx ? null
, x264Support ? true, x264 ? null
-, xvidSupport ? false, xvidcore ? null
+, xvidSupport ? true, xvidcore ? null
, faacSupport ? false, faac ? null
}:
diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix
index 0e44a4773c7a..e407b75c8bbe 100644
--- a/pkgs/development/libraries/libogg/default.nix
+++ b/pkgs/development/libraries/libogg/default.nix
@@ -1,13 +1,15 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, xz }:
stdenv.mkDerivation rec {
- name = "libogg-1.2.2";
+ name = "libogg-1.3.0";
src = fetchurl {
- url = "http://downloads.xiph.org/releases/ogg/${name}.tar.gz";
- sha256 = "1fngv23r8anbf2f2x7s2bh1isxnw287gbc7mhh9g1m96pis0a05b";
+ url = "http://downloads.xiph.org/releases/ogg/${name}.tar.xz";
+ sha256 = "0jy79ffkl34vycnwfsj4svqsdg1lwy2l1rr49y8r4d44kh12a5r3";
};
+ buildNativeInputs = [ xz ];
+
meta = {
homepage = http://xiph.org/ogg/;
};
diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix
index d5f91c182605..efb210d65762 100644
--- a/pkgs/development/libraries/libvorbis/default.nix
+++ b/pkgs/development/libraries/libvorbis/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchurl, libogg }:
+{ stdenv, fetchurl, libogg, xz }:
stdenv.mkDerivation rec {
- name = "libvorbis-1.3.2";
+ name = "libvorbis-1.3.3";
src = fetchurl {
- url = "http://downloads.xiph.org/releases/vorbis/${name}.tar.bz2";
- sha256 = "159khaa9j0pd4fm554m1igzmrhsa3qbh4n8avihfinwym05vc14z";
+ url = "http://downloads.xiph.org/releases/vorbis/${name}.tar.xz";
+ sha256 = "1gby6hapz9njx4l9g0pndyk4q83z5fgrgc30mfwfgx7bllspsk43";
};
+ buildNativeInputs = [ xz ];
propagatedBuildInputs = [ libogg ];
meta = {