gstreamer 1.0.5 update

pkgs/applications/audio/mopidy/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, pythonPackages, pygobject, gst_python
+{ stdenv, fetchgit, pythonPackages, pygobject
 , gst_plugins_good, gst_plugins_base
 }:
 
@@ -28,8 +28,8 @@ pythonPackages.buildPythonPackage rec {
   postInstall = ''
     for p in $out/bin/mopidy $out/bin/mopidy-scan; do
       wrapProgram $p \
-        --prefix GST_PLUGIN_PATH : ${gst_plugins_good}/lib/gstreamer-0.10 \
-        --prefix GST_PLUGIN_PATH : ${gst_plugins_base}/lib/gstreamer-0.10
+        --prefix GST_PLUGIN_PATH : ${gst_plugins_good}/lib/gstreamer-* \
+        --prefix GST_PLUGIN_PATH : ${gst_plugins_base}/lib/gstreamer-*
     done
   '';
 

pkgs/applications/audio/mopidy/git.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, pythonPackages, pygobject, gst_python
+{ stdenv, fetchgit, pythonPackages, pygobject
 , gst_plugins_good, gst_plugins_base
 }:
 
@@ -28,8 +28,8 @@ pythonPackages.buildPythonPackage rec {
   postInstall = ''
     for p in $out/bin/mopidy $out/bin/mopidy-scan; do
       wrapProgram $p \
-        --prefix GST_PLUGIN_PATH : ${gst_plugins_good}/lib/gstreamer-0.10 \
-        --prefix GST_PLUGIN_PATH : ${gst_plugins_base}/lib/gstreamer-0.10
+        --prefix GST_PLUGIN_PATH : ${gst_plugins_good}/lib/gstreamer-* \
+        --prefix GST_PLUGIN_PATH : ${gst_plugins_base}/lib/gstreamer-*
     done
   '';
 

pkgs/applications/networking/browsers/uzbl/default.nix

@@ -32,7 +32,7 @@ rec {
       --prefix GST_PLUGIN_PATH : ${a.webkit.gstreamer}/lib/gstreamer-* \
       --prefix GST_PLUGIN_PATH : ${a.webkit.gst_plugins_base}/lib/gstreamer-* \
       --prefix GST_PLUGIN_PATH : ${a.webkit.gst_plugins_good}/lib/gstreamer-* \
-      --prefix GST_PLUGIN_PATH : ${a.webkit.gst_ffmpeg}/lib/gstreamer-* \
+      --prefix GST_PLUGIN_PATH : ${a.webkit.gst_libav}/lib/gstreamer-* \
       --prefix GIO_EXTRA_MODULES : ${a.glib_networking}/lib/gio/modules
     '';
 

pkgs/applications/networking/instant-messengers/baresip/default.nix

@@ -1,5 +1,5 @@
 {stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig
-, cairo, mpg123, gstreamer, gst_ffmpeg, gst_plugins_base, gst_plugins_bad
+, cairo, mpg123, gstreamer, gst_libav, gst_plugins_base, gst_plugins_bad
 , gst_plugins_good, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg
 , gsm, speex, portaudio, spandsp, libuuid
 }:
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "3ac15b3d3cf17b2417ba871e7eaaaf41ab10cb30b900adcee357d5e91ea033e7";
   };
   buildInputs = [zlib openssl libre librem pkgconfig
-    cairo mpg123 gstreamer gst_ffmpeg gst_plugins_base gst_plugins_bad gst_plugins_good
+    cairo mpg123 gstreamer gst_libav gst_plugins_base gst_plugins_bad gst_plugins_good
     alsaLib SDL libv4l celt libsndfile srtp ffmpeg gsm speex portaudio spandsp libuuid
     ];
   makeFlags = [

pkgs/applications/networking/instant-messengers/gajim/default.nix

@@ -9,7 +9,7 @@ let
     libXt xproto libXext xextproto libX11 gtkspell aspell
     scrnsaverproto pycrypto pythonDBus pythonSexy 
     docutils pyasn1 farstream gst_plugins_bad gstreamer
-    gst_ffmpeg gst_python
+    gst_libav
   ];
 in
 rec {
@@ -38,7 +38,7 @@ rec {
       sed -e 's^'"$i"'^'"$out/bin-wrapped/$name"'^' -i "$out/bin/$name"
       sed -e "2aexport LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}${a.gtkspell}/lib:${a.gtkspell}/lib64\"" -i "$out/bin/gajim"
       sed -e "2aexport NIX_LDFLAGS=\"\$NIX_LDFLAGS -L${a.gtkspell}/lib -L${a.gtkspell}/lib64\"" -i "$out/bin/gajim"
-      sed -e "2aexport GST_PLUGIN_PATH=\"\$GST_PLUGIN_PATH''${GST_PLUGIN_PATH:+:}$(echo ${a.gst_plugins_bad}/lib/gstreamer-*):$(echo ${a.gst_ffmpeg}/lib/gstreamer-*):$(echo ${a.farstream}/lib/gstreamer-*)\"" -i "$out/bin/gajim"
+      sed -e "2aexport GST_PLUGIN_PATH=\"\$GST_PLUGIN_PATH''${GST_PLUGIN_PATH:+:}$(echo ${a.gst_plugins_bad}/lib/gstreamer-*):$(echo ${a.gst_libav}/lib/gstreamer-*):$(echo ${a.farstream}/lib/gstreamer-*)\"" -i "$out/bin/gajim"
     done
   '') ["wrapBinContentsPython"];
 

pkgs/applications/video/gnash/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , SDL, SDL_mixer, gstreamer, gst_plugins_base, gst_plugins_good
-, gst_ffmpeg, speex
+, gst_libav, speex
 , libogg, libxml2, libjpeg, mesa, libpng, libungif, libtool
 , boost, freetype, agg, dbus, curl, pkgconfig, gettext
 , glib, gtk, gtkglext, x11, ming, dejagnu, python, perl
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   # XXX: KDE is supported as well so we could make it available optionally.
   buildInputs = [
     gettext x11 SDL SDL_mixer gstreamer gst_plugins_base gst_plugins_good
-    gst_ffmpeg speex libtool
+    gst_libav speex libtool
     libogg libxml2 libjpeg mesa libpng libungif boost freetype agg
     dbus curl pkgconfig glib gtk gtkglext
     xulrunner
@@ -65,9 +65,9 @@ stdenv.mkDerivation rec {
          --enable-gui=gtk"
 
        # In `libmedia', Gnash compiles with "-I$gst_plugins_base/include",
-       # whereas it really needs "-I$gst_plugins_base/include/gstreamer-0.10".
+       # whereas it really needs "-I$gst_plugins_base/include/gstreamer-*".
        # Work around this using GCC's $CPATH variable.
-       export CPATH="${gst_plugins_base}/include/gstreamer-0.10:${gst_plugins_good}/include/gstreamer-0.10"
+       export CPATH="${gst_plugins_base}/include/gstreamer-*:${gst_plugins_good}/include/gstreamer-*"
        echo "\$CPATH set to \`$CPATH'"
 
        echo "\$GST_PLUGIN_PATH set to \`$GST_PLUGIN_PATH'"
@@ -84,12 +84,12 @@ stdenv.mkDerivation rec {
     make install-plugins
 
     # Wrap programs so the find the GStreamer plug-ins they need
-    # (e.g., gst-ffmpeg is needed to watch movies such as YouTube's).
+    # (e.g., gst-libav is needed to watch movies such as YouTube's).
     for prog in "$out/bin/"*
     do
       wrapProgram "$prog" --prefix                                            \
         GST_PLUGIN_PATH ":"                                                     \
-        "${gst_plugins_base}/lib/gstreamer-0.10:${gst_plugins_good}/lib/gstreamer-0.10:${gst_ffmpeg}/lib/gstreamer-0.10"
+        "${gst_plugins_base}/lib/gstreamer-*:${gst_plugins_good}/lib/gstreamer-*:${gst_libav}/lib/gstreamer-*"
     done
   '';
 

pkgs/applications/video/transmageddon/default.nix

@@ -0,0 +1,29 @@
+{ stdenv, fetchgit, autoconf, automake, libtool, makeWrapper
+, python, pygobject, intltool }:
+
+stdenv.mkDerivation rec {
+  name = "transmageddon-0.22";
+
+  preConfigure = "autoreconf -vfi";
+
+  src = fetchgit {
+    url = git://git.gnome.org/transmageddon;
+    rev = "8b1eedadae484b3fb6599d27ff4cbe9ec5e3a3b9";
+    sha256 = "97567a3e26e54d10f28374b514fdee5d87776d185b56c6b74c1eb0dae11bc5a8";
+  };
+
+  pythonPath = [ pygobject ];
+
+  postInstall = ''
+    wrapProgram "$out/bin/transmageddon" \
+      --set PYTHONPATH $(toPythonPath "${pygobject}"):$PYTHONPATH
+  '';
+
+  buildInputs = [ autoconf automake libtool makeWrapper intltool python ];
+
+  meta = {
+    homepage = http://www.linuxrising.org;
+    license = stdenv.lib.licenses.lgpl21;
+    description = "A video transcoder using GStreamer";
+  };
+}

pkgs/development/libraries/farsight2/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, libnice, pkgconfig, python, gstreamer, gst_plugins_base
-, pygobject, gst_python, gupnp_igd }:
+, pygobject, gupnp_igd }:
 
 stdenv.mkDerivation rec {
   name = "farsight2-0.0.31";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "16qz4x14rdycm4nrn5wx6k2y22fzrazsbmihrxdwafx9cyf23kjm";
   };
 
-  buildInputs = [ libnice python pygobject gst_python gupnp_igd ];
+  buildInputs = [ libnice python pygobject gupnp_igd ];
 
   buildNativeInputs = [ pkgconfig ];
 

pkgs/development/libraries/farstream/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl, libnice, pkgconfig, python, gstreamer, gst_plugins_base
-, pygobject, gst_python, gupnp_igd
-, gst_plugins_good, gst_plugins_bad, gst_ffmpeg
+, pygobject, gupnp_igd
+, gst_plugins_good, gst_plugins_bad, gst_libav
 }:
 
 stdenv.mkDerivation rec {
@@ -14,9 +14,7 @@ stdenv.mkDerivation rec {
 
   buildNativeInputs = [ pkgconfig ];
 
-  propagatedBuildInputs = [ gstreamer gst_plugins_base gst_python 
-    gst_plugins_good gst_plugins_bad gst_ffmpeg
-    ];
+  propagatedBuildInputs = [ gstreamer gst_plugins_base gst_plugins_good gst_plugins_bad gst_libav ];
 
   meta = {
     homepage = http://www.freedesktop.org/wiki/Software/Farstream;

pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix → pkgs/development/libraries/gstreamer/gst-ffmpeg/0.10.nix

@@ -1,15 +1,19 @@
+
+# XXX: after gstream-1.0, this package became gst-libav. We're keeping this
+# around for phonon. 
+
 { fetchurl, stdenv, pkgconfig, gst_plugins_base, bzip2, yasm
 , useInternalFfmpeg ? false, ffmpeg ? null }:
 
 stdenv.mkDerivation rec {
-  name = "gst-ffmpeg-0.10.12";
+  name = "gst-ffmpeg-0.10.13";
 
   src = fetchurl {
     urls = [
       "http://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2"
       "mirror://gentoo/distfiles/${name}.tar.bz2"
       ];
-    sha256 = "0fyppl8q18g71jd2r0mbiqk8hhrdxq43dglma06mxyjb5c80fxxi";
+    sha256 = "0qmvgwcfybci78sd73mhvm4bsb7l0xsk9yljrgik80g011ds1z3n";
   };
 
   # Upstream strongly recommends against using --with-system-ffmpeg,

pkgs/development/libraries/gstreamer/gst-libav/default.nix

@@ -0,0 +1,34 @@
+{ fetchurl, stdenv, autoconf, automake, libtool, pkgconfig
+, gst_plugins_base, bzip2, yasm
+, useInternalLibAV ? false, libav ? null }:
+
+stdenv.mkDerivation rec {
+  name = "gst-libav-${version}";
+  version = "1.0.5";
+
+  src = fetchurl {
+    urls = [
+      "${meta.homepage}/src/gst-libav/${name}.tar.xz"
+      "mirror://gentoo/distfiles/${name}.tar.xz"
+    ];
+    sha256 = "1m9jzga9ahml3dnfm7syz6mglmysqpbkkyr48kka9cwna1kbxy5f";
+  };
+
+  preConfigure = "autoreconf -vfi";
+
+  # Upstream strongly recommends against using --with-system-libav,
+  # but we do it anyway because we're so hardcore (and we don't want
+  # multiple copies of libav).
+  configureFlags = stdenv.lib.optionalString (!useInternalLibAV) "--with-system-libav";
+  enableParallelBuilding = true; 
+
+  buildInputs =
+    [ autoconf automake libtool pkgconfig bzip2 gst_plugins_base ]
+    ++ (if useInternalLibAV then [ yasm ] else [ libav ]);
+
+  meta = {
+    homepage = http://gstreamer.freedesktop.org;
+    description = "GStreamer's plug-in using LibAV";
+    license = "GPLv2+";
+  };
+}

pkgs/development/libraries/gstreamer/gst-plugins-bad/0.10.nix

@@ -0,0 +1,30 @@
+{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gst_plugins_base
+, libdvdnav, libdvdread }:
+
+stdenv.mkDerivation rec {
+  name = "gst-plugins-bad-0.10.36";
+
+  src = fetchurl {
+    urls = [
+      "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz"
+      "mirror://gentoo/distfiles/${name}.tar.xz"
+      ];
+    sha256 = "0si79dsdx06w6p48v1c5ifbjhq26p4jn8swi18ni8x6j5yd5p3rf";
+  };
+
+  buildInputs =
+    [ pkgconfig glib gstreamer gst_plugins_base libdvdnav libdvdread ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = http://gstreamer.freedesktop.org;
+
+    description = "‘Bad’ (potentially low quality) plug-ins for GStreamer";
+
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+
+    license = "LGPLv2+";
+  };
+}

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

@@ -2,14 +2,14 @@
 , libdvdnav, libdvdread }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-bad-0.10.22";
+  name = "gst-plugins-bad-1.0.5";
 
   src = fetchurl {
     urls = [
-      "${meta.homepage}/src/gst-plugins-bad/${name}.tar.bz2"
-      "mirror://gentoo/distfiles/${name}.tar.bz2"
+      "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz"
+      "mirror://gentoo/distfiles/${name}.tar.xz"
       ];
-    sha256 = "030728gf0zjg62yng4qy9yapaffbvkziawa28rk0gspz8cpi1xyq";
+    sha256 = "0si79dsdx06w6p48v1c5ifbjhq26p4jn8swi18ni8x6j5yd5p3rf";
   };
 
   buildInputs =

pkgs/development/libraries/gstreamer/gst-plugins-base/0.10.nix

@@ -0,0 +1,46 @@
+{ fetchurl, stdenv, pkgconfig, python, gstreamer
+, xlibs, alsaLib, cdparanoia, libogg
+, libtheora, libvorbis, freetype, pango
+, liboil, glib
+, # Whether to build no plugins that have external dependencies
+  # (except the ALSA plugin).
+  minimalDeps ? false
+}:
+
+stdenv.mkDerivation rec {
+  name = "gst-plugins-base-0.10.36";
+
+  src = fetchurl {
+    urls = [
+      "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz"
+      "mirror://gentoo/distfiles/${name}.tar.xz"
+      ];
+    sha256 = "0jp6hjlra98cnkal4n6bdmr577q8mcyp3c08s3a02c4hjhw5rr0z";
+  };
+
+  patchPhase = ''
+    sed -i 's@/bin/echo@echo@g' configure
+    sed -i -e 's/^   /\t/' docs/{libs,plugins}/Makefile.in
+  '';
+
+  # TODO : v4l, libvisual
+  buildInputs =
+    [ pkgconfig glib alsaLib ]
+    ++ stdenv.lib.optionals (!minimalDeps)
+      [ xlibs.xlibs xlibs.libXv cdparanoia libogg libtheora libvorbis
+        freetype pango liboil
+      ];
+
+  propagatedBuildInputs = [ gstreamer ];
+
+  postInstall = "rm -rf $out/share/gtk-doc";
+
+  meta = {
+    homepage = http://gstreamer.freedesktop.org;
+
+    description = "Base plug-ins for GStreamer";
+
+    license = "LGPLv2+";
+  };
+}
+

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

@@ -8,14 +8,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-base-0.10.36";
+  name = "gst-plugins-base-1.0.5";
 
   src = fetchurl {
     urls = [
       "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz"
       "mirror://gentoo/distfiles/${name}.tar.xz"
       ];
-    sha256 = "0jp6hjlra98cnkal4n6bdmr577q8mcyp3c08s3a02c4hjhw5rr0z";
+    sha256 = "0wvigpblsarbxfv1ms34qza4yasqj18fwqf8268qgwwyp44nxkip";
   };
 
   patchPhase = ''

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

@@ -0,0 +1,38 @@
+{ fetchurl, stdenv, pkgconfig, gst_plugins_base, aalib, cairo
+, flac, libjpeg, zlib, speex, libpng, libdv, libcaca
+, libiec61883, libavc1394, taglib, pulseaudio
+, glib, gstreamer, bzip2
+}:
+
+stdenv.mkDerivation rec {
+  name = "gst-plugins-good-0.10.31";
+
+  src = fetchurl {
+    urls = [
+      "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz"
+      "mirror://gentoo/distfiles/${name}.tar.xz"
+      ];
+    sha256 = "0r1b54yixn8v2l1dlwmgpkr0v2a6a21id5njp9vgh58agim47a3p";
+  };
+
+  configureFlags = "--disable-oss";
+
+  buildInputs =
+    [ pkgconfig glib gstreamer gst_plugins_base libavc1394 libiec61883
+      aalib libcaca cairo libdv flac libjpeg libpng pulseaudio speex
+      taglib bzip2
+    ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = http://gstreamer.freedesktop.org;
+
+    description = "`Good' plug-ins for GStreamer";
+
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+
+    license = "LGPLv2+";
+  };
+}