From 7aa7f85bb5002bf73d0ce806da047f636af8bf84 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Wed, 19 Nov 2008 21:46:01 +0000
Subject: [PATCH] gstreamer update (needed by gstPython) dropping dep gnomevfs
 (see code commment)

svn path=/nixpkgs/trunk/; revision=13344
---
 .../libraries/gstreamer/default.nix           |  6 ++---
 .../gstreamer/gst-plugins-base/0.10.21.nix    | 24 +++++++++++++++++++
 .../gstreamer/gst-plugins-good/0.10.11.nix    | 21 ++++++++++++++++
 .../libraries/gstreamer/gstreamer/0.10.21.nix | 20 ++++++++++++++++
 pkgs/top-level/all-packages.nix               | 12 ++++++----
 5 files changed, 75 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/development/libraries/gstreamer/gst-plugins-base/0.10.21.nix
 create mode 100644 pkgs/development/libraries/gstreamer/gst-plugins-good/0.10.11.nix
 create mode 100644 pkgs/development/libraries/gstreamer/gstreamer/0.10.21.nix

diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix
index 1a9bed08f28d..f304cfe9fa15 100644
--- a/pkgs/development/libraries/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/default.nix
@@ -1,13 +1,13 @@
 args: with args;
 rec {
-  gstreamerFun = lib.sumArgs (selectVersion ./gstreamer "0.10.17") args;
+  gstreamerFun = lib.sumArgs (selectVersion ./gstreamer "0.10.21") args;
   gstreamer = gstreamerFun null;
 
-  gstPluginsBaseFun = lib.sumArgs (selectVersion ./gst-plugins-base "0.10.17")
+  gstPluginsBaseFun = lib.sumArgs (selectVersion ./gst-plugins-base "0.10.21")
     args { inherit gstreamer; };
   gstPluginsBase = gstPluginsBaseFun null;
 
-  gstPluginsGoodFun = lib.sumArgs (selectVersion ./gst-plugins-good "0.10.6")
+  gstPluginsGoodFun = lib.sumArgs (selectVersion ./gst-plugins-good "0.10.11")
     args { inherit gstPluginsBase; };
   gstPluginsGood = gstPluginsGoodFun null;
 
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/0.10.21.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/0.10.21.nix
new file mode 100644
index 000000000000..5777a571320d
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-base/0.10.21.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 = "14vyshhxpdpfd06jyw1fgcfxb6nh0bg7n2aqd9h9kapkl12llgv7";
+  };
+
+  patchPhase = "sed -i 's@/bin/echo@echo@g' configure";
+
+  configureFlags = "--enable-shared --disable-static";
+
+# TODO : v4l, libvisual
+  propagatedBuildInputs = [gstreamer libX11 libXv libXext alsaLib cdparanoia
+    libogg libtheora libvorbis freetype pango liboil gtk which gtkdoc];
+
+  buildInputs = [pkgconfig python];
+
+  meta = {
+    homepage = http://gstreamer.freedesktop.org;
+  };
+}
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/0.10.11.nix b/pkgs/development/libraries/gstreamer/gst-plugins-good/0.10.11.nix
new file mode 100644
index 000000000000..4653f4277e77
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-good/0.10.11.nix
@@ -0,0 +1,21 @@
+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;
+  };
+}
diff --git a/pkgs/development/libraries/gstreamer/gstreamer/0.10.21.nix b/pkgs/development/libraries/gstreamer/gstreamer/0.10.21.nix
new file mode 100644
index 000000000000..30b5b40ffe01
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/gstreamer/0.10.21.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 = "1ly3b6ja51vwwkdqzi20hg5azdsrz5pnhswgagdwsprb8nh8bhcl";
+  };
+
+  buildInputs = [perl bison flex pkgconfig python which  gtkdoc ];
+  propagatedBuildInputs = [glib libxml2];
+
+  configureFlags = "--enable-shared --disable-static --enable-failing-tests
+    --localstatedir=/var --disable-gtk-doc --disable-docbook";
+
+  meta = {
+    homepage = http://gstreamer.freedesktop.org;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eb124ca242b2..7310bb35e8a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2933,15 +2933,17 @@ let
     inherit fetchurl stdenv gmp;
   };
 
-  gst_all = import ../development/libraries/gstreamer {
-    inherit lib selectVersion stdenv fetchurl perl bison flex pkgconfig libxml2
+  gst_all = recurseIntoAttrs (import ../development/libraries/gstreamer {
+    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;
+      dbus libavc1394 ladspaH taglib bzip2 which;
+    flex = flex2535;
     inherit (xorg) libX11 libXv libXext;
     inherit (gtkLibs) glib pango gtk;
-    inherit (gnome) gnomevfs;
-  };
+    inherit (gnome) gnomevfs /* <- only passed for the no longer used older versions
+             it is depreceated and didn't build on amd64 due to samba dependenccy */ gtkdoc;
+  });
 
   gnet = import ../development/libraries/gnet {
     inherit fetchurl stdenv pkgconfig;