GStreamer: gst-plugins-good 0.10.14, with PulseAudio support.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14976

pkgs/development/libraries/gstreamer/default.nix

@@ -12,9 +12,12 @@ rec {
       libvorbis freetype pango liboil gtk which gtkdoc;
   };
 
-  gstPluginsGoodFun = lib.sumArgs (selectVersion ./gst-plugins-good "0.10.11")
-    args { inherit gstPluginsBase; };
-  gstPluginsGood = gstPluginsGoodFun null;
+  gstPluginsGood = import ./gst-plugins-good {
+    inherit gstPluginsBase;
+    inherit (args) fetchurl stdenv pkgconfig aalib cairo flac hal
+      libjpeg zlib speex libpng libdv libcaca dbus libiec61883
+      libavc1394 ladspaH taglib gdbm pulseaudio;
+  };
 
   gstFfmpeg = import ./gst-ffmpeg {
     inherit fetchurl stdenv pkgconfig gstPluginsBase bzip2;

pkgs/development/libraries/gstreamer/gst-plugins-good/0.10.11.nix

@@ -1,21 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation rec {
-  name = "gst-plugins-good-" + version;
-
-  src = fetchurl {
-    url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.bz2";
-    sha256 = "1ccnyzn9n2a6xjxz5srydc8bm63mjz5cxbcwbigxzqw0a033ych5";
-  };
-
-  propagatedBuildInputs = [gstPluginsBase aalib cairo flac hal libjpeg
-    zlib speex libpng libdv libcaca dbus.libs libiec61883 libavc1394 ladspaH
-    taglib ];
-  buildInputs = [pkgconfig];
-
-  configureFlags = "--enable-shared --disable-static --enable-ladspa";
-
-  meta = {
-    homepage = http://gstreamer.freedesktop.org;
-  };
-}

pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix

@@ -1,23 +1,27 @@
-args: with args;
+{ fetchurl, stdenv, pkgconfig, gstPluginsBase, aalib, cairo
+, flac , hal, libjpeg, zlib, speex, libpng, libdv, libcaca, dbus
+, libiec61883, libavc1394, ladspaH, taglib, gdbm, pulseaudio }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-good-" + version;
+  name = "gst-plugins-good-0.10.14";
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.bz2";
-    sha256 = "0rid0gjj8nsk0r5yn4bz1xfsbp446r92wc6wp4099hilw6jxd74y";
+    sha256 = "12kq60zdqxkshpjr76iwzykzhjaq3g1rm81nz7b0x44rrc0ms80j";
   };
 
   propagatedBuildInputs = [gstPluginsBase aalib cairo flac hal libjpeg
     zlib speex libpng libdv libcaca dbus.libs libiec61883 libavc1394 ladspaH
-    taglib ];
+    taglib gdbm pulseaudio];
   buildInputs = [pkgconfig];
 
   configureFlags = "--enable-shared --disable-static --enable-ladspa";
 
-  patches = [ ./tag_defines.patch ];
-
   meta = {
     homepage = http://gstreamer.freedesktop.org;
+
+    description = "`Good' plug-ins for GStreamer";
+
+    license = "LGPLv2+";
   };
 }

pkgs/development/libraries/gstreamer/gst-plugins-good/tag_defines.patch

@@ -1,22 +0,0 @@
-diff -Nur gst-plugins-good0.10-0.10.6/ext/taglib/gstid3v2mux.cc gst-plugins-good0.10-0.10.6.new/ext/taglib/gstid3v2mux.cc
---- gst-plugins-good0.10-0.10.6/ext/taglib/gstid3v2mux.cc	2007-06-13 11:21:10.000000000 +0200
-+++ gst-plugins-good0.10-0.10.6.new/ext/taglib/gstid3v2mux.cc	2007-11-24 21:56:04.000000000 +0100
-@@ -532,6 +532,7 @@
-   GST_TAG_TITLE, add_text_tag, "TIT2"}, {
-   GST_TAG_ALBUM, add_text_tag, "TALB"}, {
-   GST_TAG_COPYRIGHT, add_text_tag, "TCOP"}, {
-+  GST_TAG_COMPOSER, add_text_tag, "TCOM"}, {
-   GST_TAG_GENRE, add_text_tag, "TCON"}, {
-   GST_TAG_COMMENT, add_comment_tag, ""}, {
-   GST_TAG_EXTENDED_COMMENT, add_comment_tag, ""}, {
-@@ -544,7 +545,9 @@
-   GST_TAG_MUSICBRAINZ_ALBUMARTISTID, add_musicbrainz_tag, "\002"}, {
-   GST_TAG_MUSICBRAINZ_TRMID, add_musicbrainz_tag, "\003"}, {
-   GST_TAG_MUSICBRAINZ_TRACKID, add_unique_file_id_tag, ""}, {
--  GST_TAG_MUSICBRAINZ_SORTNAME, add_text_tag, "TSOP"}, {
-+  GST_TAG_ARTIST_SORTNAME, add_text_tag, "TSOP"}, {
-+  GST_TAG_ALBUM_SORTNAME, add_text_tag, "TSOA"}, {
-+  GST_TAG_TITLE_SORTNAME, add_text_tag, "TSOT"}, {
-   GST_TAG_TRACK_NUMBER, add_count_or_num_tag, "TRCK"}, {
-   GST_TAG_TRACK_COUNT, add_count_or_num_tag, "TRCK"}, {
-   GST_TAG_ALBUM_VOLUME_NUMBER, add_count_or_num_tag, "TPOS"}, {

pkgs/top-level/all-packages.nix

@@ -3095,7 +3095,7 @@ let
     inherit lib selectVersion stdenv fetchurl perl bison pkgconfig libxml2
       python alsaLib cdparanoia libogg libvorbis libtheora freetype liboil
       libjpeg zlib speex libpng libdv aalib cairo libcaca flac hal libiec61883
-      dbus libavc1394 ladspaH taglib bzip2 which;
+      dbus libavc1394 ladspaH taglib pulseaudio gdbm bzip2 which;
     flex = flex2535;
     inherit (xorg) libX11 libXv libXext;
     inherit (gtkLibs) glib pango gtk;