From 929160b86d48d36fb911d28f8e53301482522502 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Jul 2011 19:07:36 +0000
Subject: [PATCH] * mpeg2dec -> libmpeg2, and updated to 0.5.1.

svn path=/nixpkgs/branches/kde-4.7/; revision=27949
---
 pkgs/development/libraries/libmpeg2/default.nix | 15 +++++++++++++++
 pkgs/development/libraries/mpeg2dec/default.nix | 17 -----------------
 pkgs/top-level/all-packages.nix                 |  4 +++-
 3 files changed, 18 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/libraries/libmpeg2/default.nix
 delete mode 100644 pkgs/development/libraries/mpeg2dec/default.nix

diff --git a/pkgs/development/libraries/libmpeg2/default.nix b/pkgs/development/libraries/libmpeg2/default.nix
new file mode 100644
index 000000000000..1d04eea89f6b
--- /dev/null
+++ b/pkgs/development/libraries/libmpeg2/default.nix
@@ -0,0 +1,15 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "libmpeg2-0.5.1";
+  
+  src = fetchurl {
+    url = "http://libmpeg2.sourceforge.net/files/${name}.tar.gz";
+    sha256 = "1m3i322n2fwgrvbs1yck7g5md1dbg22bhq5xdqmjpz5m7j4jxqny";
+  };
+
+  meta = {
+    homepage = http://libmpeg2.sourceforge.net/;
+    description = "A free library for decoding mpeg-2 and mpeg-1 video streams";
+  };
+}
diff --git a/pkgs/development/libraries/mpeg2dec/default.nix b/pkgs/development/libraries/mpeg2dec/default.nix
deleted file mode 100644
index 8b29deba56f9..000000000000
--- a/pkgs/development/libraries/mpeg2dec/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "mpeg2dec-0.4.1";
-  
-  src = fetchurl {
-    url = http://libmpeg2.sourceforge.net/files/mpeg2dec-0.4.1.tar.gz;
-    sha256 = "1vny7rg0p2rmic71hli2l2612i5yaw8vy0wsnm5nvhwfiw37cjn7";
-  };
-
-  configureFlags = "--enable-shared --disable-static";
-
-  meta = {
-    homepage = http://libmpeg2.sourceforge.net/;
-    description = "A free library for decoding mpeg-2 and mpeg-1 video streams";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 53beee22167d..584986f75fc4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3989,7 +3989,9 @@ let
     qt = qt4;
   };
 
-  mpeg2dec = callPackage ../development/libraries/mpeg2dec { };
+  libmpeg2 = callPackage ../development/libraries/libmpeg2 { };
+
+  mpeg2dec = libmpeg2;
 
   msilbc = callPackage ../development/libraries/msilbc { };