Author: eelco
Date: Mon Jul 25 19:07:36 2011
New Revision: 27949
URL: https://svn.nixos.org/websvn/nix/?rev=27949&sc=1
Log:
* mpeg2dec -> libmpeg2, and updated to 0.5.1.
Added:
nixpkgs/branches/kde-4.7/pkgs/development/libraries/libmpeg2/
- copied from r27866,
nixpkgs/branches/kde-4.7/pkgs/development/libraries/mpeg2dec/
Deleted:
nixpkgs/branches/kde-4.7/pkgs/development/libraries/mpeg2dec/
Modified:
nixpkgs/branches/kde-4.7/pkgs/development/libraries/libmpeg2/default.nix
nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/kde-4.7/pkgs/development/libraries/libmpeg2/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/development/libraries/mpeg2dec/default.nix
Thu Jul 21 07:42:05 2011 (r27866)
+++ nixpkgs/branches/kde-4.7/pkgs/development/libraries/libmpeg2/default.nix
Mon Jul 25 19:07:36 2011 (r27949)
@@ -1,15 +1,13 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
-stdenv.mkDerivation {
- name = "mpeg2dec-0.4.1";
+stdenv.mkDerivation rec {
+ name = "libmpeg2-0.5.1";
src = fetchurl {
- url = http://libmpeg2.sourceforge.net/files/mpeg2dec-0.4.1.tar.gz;
- sha256 = "1vny7rg0p2rmic71hli2l2612i5yaw8vy0wsnm5nvhwfiw37cjn7";
+ url = "http://libmpeg2.sourceforge.net/files/${name}.tar.gz";;
+ sha256 = "1m3i322n2fwgrvbs1yck7g5md1dbg22bhq5xdqmjpz5m7j4jxqny";
};
- configureFlags = "--enable-shared --disable-static";
-
meta = {
homepage = http://libmpeg2.sourceforge.net/;
description = "A free library for decoding mpeg-2 and mpeg-1 video
streams";
Modified: nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix Mon Jul 25
17:24:49 2011 (r27948)
+++ nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix Mon Jul 25
19:07:36 2011 (r27949)
@@ -3989,7 +3989,9 @@
qt = qt4;
};
- mpeg2dec = callPackage ../development/libraries/mpeg2dec { };
+ libmpeg2 = callPackage ../development/libraries/libmpeg2 { };
+
+ mpeg2dec = libmpeg2;
msilbc = callPackage ../development/libraries/msilbc { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
