-

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10823

8 files changed, 132 insertions, 0 deletions

diff --git a/pkgs/development/libraries/gettext/0.17.nix b/pkgs/development/libraries/gettext/0.17.nix
new file mode 100644
index 00000000000..5fc60d9b8a6
--- /dev/null
+++ b/pkgs/development/libraries/gettext/0.17.nix
@@ -0,0 +1,9 @@
+args: with args;
+stdenv.mkDerivation rec {
+  name = "gettext-" + version;
+  src = fetchurl {
+    url = "mirror://gnu/gettext/${name}.tar.gz";
+    sha256 = "1fipjpaxxwifdw6cbr7mkxp1yvy643i38nhlh7124bqnisxki5i0";
+  };
+  configureFlags = "--disable-csharp --enable-shared --disable-static";
+}
diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix
new file mode 100644
index 00000000000..678fbdb137a
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/default.nix
@@ -0,0 +1,13 @@
+args: with args;
+rec {
+  gstreamerFun = lib.sumArgs (selectVersion ./gstreamer "0.10.17") args;
+  gstreamer = gstreamerFun null;
+
+  gstPluginsBaseFun = lib.sumArgs (selectVersion ./gst-plugins-base "0.10.17")
+    args { inherit gstreamer; };
+  gstPluginsBase = gstPluginsBaseFun null;
+
+  gstPluginsGoodFun = lib.sumArgs (selectVersion ./gst-plugins-good "0.10.6")
+    args { inherit gstPluginsBase; };
+  gstPluginsGood = gstPluginsGoodFun null;
+}
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/0.10.17.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/0.10.17.nix
new file mode 100644
index 00000000000..036134c82c1
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-base/0.10.17.nix
@@ -0,0 +1,24 @@
+args: with args;
+
+stdenv.mkDerivation rec {
+  name = "gst-plugins-base-" + version;
+
+  src = fetchurl {
+    url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.bz2";
+    sha256 = "03gpfhdaw7yz83y0wpq966b9dqpvw8v5kpixa1pp4mn7d5bgsb7q";
+  };
+
+  patchPhase = "sed -i 's@/bin/echo@echo@g' configure";
+
+  configureFlags = "--enable-shared --disable-static";
+
+# TODO : v4l, libvisual
+  propagatedBuildInputs = [gstreamer libX11 libXv libXext alsaLib cdparanoia
+    gnomevfs libogg libtheora libvorbis freetype pango liboil gtk];
+
+  buildInputs = [pkgconfig python];
+
+  meta = {
+    homepage = http://gstreamer.freedesktop.org;
+  };
+}
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/0.10.6.nix b/pkgs/development/libraries/gstreamer/gst-plugins-good/0.10.6.nix
new file mode 100644
index 00000000000..10485330772
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-good/0.10.6.nix
@@ -0,0 +1,23 @@
+args: with args;
+
+stdenv.mkDerivation rec {
+  name = "gst-plugins-good-" + version;
+
+  src = fetchurl {
+    url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.bz2";
+    sha256 = "0rid0gjj8nsk0r5yn4bz1xfsbp446r92wc6wp4099hilw6jxd74y";
+  };
+
+  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";
+
+  patches = [ ./tag_defines.patch ];
+
+  meta = {
+    homepage = http://gstreamer.freedesktop.org;
+  };
+}
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/tag_defines.patch b/pkgs/development/libraries/gstreamer/gst-plugins-good/tag_defines.patch
new file mode 100644
index 00000000000..0ece094229b
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-good/tag_defines.patch
@@ -0,0 +1,22 @@
+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"}, {
diff --git a/pkgs/development/libraries/gstreamer/gstreamer/0.10.17.nix b/pkgs/development/libraries/gstreamer/gstreamer/0.10.17.nix
new file mode 100644
index 00000000000..3508145c22c
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/gstreamer/0.10.17.nix
@@ -0,0 +1,20 @@
+args: with args;
+
+stdenv.mkDerivation rec {
+  name = "gstreamer-" + version;
+
+  src = fetchurl {
+    url = "${meta.homepage}/src/gstreamer/${name}.tar.bz2";
+    sha256 = "172nqf6l6mq4r1923bph53xd6h3svha3kkrvy5cald77jgf64a24";
+  };
+
+  buildInputs = [perl bison flex pkgconfig python];
+  propagatedBuildInputs = [glib libxml2];
+
+  configureFlags = "--enable-shared --disable-static --enable-failing-tests
+    --localstatedir=/var";
+
+  meta = {
+    homepage = http://gstreamer.freedesktop.org;
+  };
+}
diff --git a/pkgs/development/libraries/liboil/0.3.12.nix b/pkgs/development/libraries/liboil/0.3.12.nix
new file mode 100644
index 00000000000..5a04892d5be
--- /dev/null
+++ b/pkgs/development/libraries/liboil/0.3.12.nix
@@ -0,0 +1,20 @@
+args: with args;
+
+stdenv.mkDerivation rec {
+  name = "liboil-" + version;
+
+  src = fetchurl {
+    url = "${meta.homepage}/download/${name}.tar.gz";
+    sha256 = "0gdmly9sli1918pnb4ds1g38ipxikn651hdss86mp4qlfb8wvqlv";
+  };
+
+  configureFlags = "--enable-shared --disable-static";
+
+  buildInputs = [pkgconfig];
+
+  meta = {
+    homepage = http://liboil.freedesktop.org;
+    description = "Liboil is a library of simple functions that are optimized
+    for various CPUs.";
+  };
+}
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 49045546975..013094ef64b 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -7,6 +7,7 @@ stdenv.mkDerivation {
     md5 = "b6593abe1089d6aab1551c105c9300e3";
   };
   configureFlags="--with-shared --includedir=\${out}/include"+(if unicode then  " --enable-widec " else " ") +" --without-debug";
+  preBuild = ''sed -e "s@\([[:space:]]\)sh @\1''${SHELL} @" -i */Makefile Makefile'';
   postInstall= if unicode then "
     chmod -v 644 $out/lib/libncurses++w.a
     for lib in curses ncurses form panel menu; do