From 43da333bc1de566b662bd84d364874a2097b48cd Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 7 Aug 2012 03:48:37 +0200 Subject: [PATCH 01/19] gstreamer: Update to version 0.11.92. This already includes the version 1.0 API, so we'll expect things to break badly very soon. According to an official announcement, the API is final and won't change (except minor and absolutely necessary) until versions aufter 1.0. See the release announcement here: http://gstreamer.freedesktop.org/news/#2012-06-07T16:43:00Z Signed-off-by: aszlig --- pkgs/development/libraries/gstreamer/gstreamer/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/gstreamer/setup-hook.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/gstreamer/default.nix index 5d33e7bff03d1..195be4ab40ca2 100644 --- a/pkgs/development/libraries/gstreamer/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamer/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv, perl, bison, flex, pkgconfig, glib, libxml2 }: stdenv.mkDerivation rec { - name = "gstreamer-0.10.36"; + name = "gstreamer-0.11.92"; src = fetchurl { urls = [ "${meta.homepage}/src/gstreamer/${name}.tar.xz" "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "1nkid1n2l3rrlmq5qrf5yy06grrkwjh3yxl5g0w58w0pih8allci"; + sha256 = "5e41428eea3f62711bede6fd9457ac836874215fcfe5d6775c3f2000452da281"; }; buildInputs = [ perl bison flex pkgconfig ]; diff --git a/pkgs/development/libraries/gstreamer/gstreamer/setup-hook.sh b/pkgs/development/libraries/gstreamer/gstreamer/setup-hook.sh index ad184dc21e990..cdd918201eda5 100644 --- a/pkgs/development/libraries/gstreamer/gstreamer/setup-hook.sh +++ b/pkgs/development/libraries/gstreamer/gstreamer/setup-hook.sh @@ -1,7 +1,7 @@ addGstreamerLibPath () { - if test -d "$1/lib/gstreamer-0.10" + if test -d "$1/lib/gstreamer-1.0" then - export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}${GST_PLUGIN_PATH:+:}$1/lib/gstreamer-0.10" + export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}${GST_PLUGIN_PATH:+:}$1/lib/gstreamer-1.0" fi } From 6c1aa811df26e4367f8a4406092d287f97bd8e77 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 7 Aug 2012 03:53:37 +0200 Subject: [PATCH 02/19] gst-plugins: Update packages to 0.11.92 as well. This is in order to be compatible with GStreamer 0.11.92. Signed-off-by: aszlig --- .../libraries/gstreamer/gst-plugins-bad/default.nix | 8 ++++---- .../libraries/gstreamer/gst-plugins-base/default.nix | 4 ++-- .../libraries/gstreamer/gst-plugins-good/default.nix | 8 ++++---- .../libraries/gstreamer/gst-plugins-ugly/default.nix | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix index 2d1309f3a3cff..bb1bfab282e3d 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix +++ b/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-0.11.92"; 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 = "deb68624cd27dcdeea49ff6ed149ae6a3c755ec8d386e541faa073276f0c9402"; }; buildInputs = diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix index 2ac325dc2822e..f4ac209066a7d 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix +++ b/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-0.11.92"; src = fetchurl { urls = [ "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz" "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "0jp6hjlra98cnkal4n6bdmr577q8mcyp3c08s3a02c4hjhw5rr0z"; + sha256 = "00ad53f405a57b8c812edfbb0978be6bf57d0c8ea91069e8024c4d1aacf60902"; }; patchPhase = '' diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix index 4298a88f65e87..f7ec837d3a38b 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-good-0.10.30"; + name = "gst-plugins-good-0.11.92"; src = fetchurl { urls = [ - "${meta.homepage}/src/gst-plugins-good/${name}.tar.bz2" - "mirror://gentoo/distfiles/${name}.tar.bz2" + "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz" + "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "1xlmw211fcn60y2m5gxrryb3knqril4kk2c01b6j713xna8blb5i"; + sha256 = "b269ac044108d4325ab5009ab23c615141f00c5acce0202b79672bab2b74b553"; }; configureFlags = "--disable-oss"; diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix index b85fb983880b2..000fc2fa895a4 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix @@ -2,14 +2,14 @@ , libmad, libdvdread, libmpeg2, libcdio, a52dec }: stdenv.mkDerivation rec { - name = "gst-plugins-ugly-0.10.18"; + name = "gst-plugins-ugly-0.11.92"; src = fetchurl { urls = [ - "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.bz2" - "mirror://gentoo/distfiles/${name}.tar.bz2" + "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz" + "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "054fdkb2riy5knda39cp6w3xp9lzax52bn12cklglscjrm46ghgr"; + sha256 = "51d4ebd7728787722d649984cfa4633baf84412a05962cf82fc2b20a2f944d88"; }; buildInputs = From 6c64b01b69b33dfd36db298842bf8b7cfbcf6636 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 7 Aug 2012 04:24:52 +0200 Subject: [PATCH 03/19] gst-ffmpeg: Update to version 0.11.92. This version is only available in Git so far, so we just fetchgit the corresponding tag. Unfortunately deepClone can't be set to false in fetchgit, so we might want to fix this someday to avoid fetching a bunch of dependencies we don't need either if useInternalFfmpeg is true. Of course we also need to run autoreconf, because the Git source tree doesn't contain a generated configure script already. Signed-off-by: aszlig --- .../gstreamer/gst-ffmpeg/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix index e7aaaa46a96a8..1cfa3fcc957b2 100644 --- a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix @@ -1,24 +1,26 @@ -{ fetchurl, stdenv, pkgconfig, gst_plugins_base, bzip2, yasm +{ fetchgit, stdenv, autoconf, automake, libtool, pkgconfig +, gst_plugins_base, bzip2, yasm , useInternalFfmpeg ? false, ffmpeg ? null }: stdenv.mkDerivation rec { - name = "gst-ffmpeg-0.10.12"; + name = "gst-ffmpeg-${version}"; + version = "0.11.92"; - src = fetchurl { - urls = [ - "http://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2" - "mirror://gentoo/distfiles/${name}.tar.bz2" - ]; - sha256 = "0fyppl8q18g71jd2r0mbiqk8hhrdxq43dglma06mxyjb5c80fxxi"; + src = fetchgit { + url = "git://anongit.freedesktop.org/gstreamer/gst-ffmpeg"; + rev = "refs/tags/RELEASE-${version}"; + sha256 = "cd0fb825bfceaea64581272e3db812595a7ee1644281bdc466dc1ecc9c46f8b6"; }; + preConfigure = "autoreconf -vfi"; + # Upstream strongly recommends against using --with-system-ffmpeg, # but we do it anyway because we're so hardcore (and we don't want # multiple copies of ffmpeg). configureFlags = stdenv.lib.optionalString (!useInternalFfmpeg) "--with-system-ffmpeg"; buildInputs = - [ pkgconfig bzip2 gst_plugins_base ] + [ autoconf automake libtool pkgconfig bzip2 gst_plugins_base ] ++ (if useInternalFfmpeg then [ yasm ] else [ ffmpeg ]); meta = { From 335b3f79ecc7b411c97f0e89598f996fd81dac9a Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 7 Aug 2012 04:31:39 +0200 Subject: [PATCH 04/19] gst-ffmpeg: Use libav instead of ffmpeg. The reason is because GStreamer seems to prefer libav, rather than ffmpeg and doesn't build with ffmpeg at all, so we're switching to libav aswell. But we don't change the name of gst-ffmpeg into gst-libav yet, as the name wasn't changed in upstream either. Signed-off-by: aszlig --- pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix index 1cfa3fcc957b2..00f0180ae0910 100644 --- a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix @@ -1,6 +1,6 @@ { fetchgit, stdenv, autoconf, automake, libtool, pkgconfig , gst_plugins_base, bzip2, yasm -, useInternalFfmpeg ? false, ffmpeg ? null }: +, useInternalLibAV ? false, libav ? null }: stdenv.mkDerivation rec { name = "gst-ffmpeg-${version}"; @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { # Upstream strongly recommends against using --with-system-ffmpeg, # but we do it anyway because we're so hardcore (and we don't want # multiple copies of ffmpeg). - configureFlags = stdenv.lib.optionalString (!useInternalFfmpeg) "--with-system-ffmpeg"; + configureFlags = stdenv.lib.optionalString (!useInternalLibAV) "--with-system-libav"; buildInputs = [ autoconf automake libtool pkgconfig bzip2 gst_plugins_base ] - ++ (if useInternalFfmpeg then [ yasm ] else [ ffmpeg ]); + ++ (if useInternalLibAV then [ yasm ] else [ libav ]); meta = { homepage = "http://gstreamer.freedesktop.org/releases/gst-ffmpeg"; From bfc2d976039a3c8186091b6e1d5dc408769de6bf Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 7 Aug 2012 04:34:05 +0200 Subject: [PATCH 05/19] libav: Update to version 0.8.3. gst-ffmpeg requires the 0.8 branch of libav, so we're updating it aswell, looking forward for even more builds to break badly. Signed-off-by: aszlig --- pkgs/development/libraries/libav/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 3fb1650bf46fe..649eff911527f 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -17,11 +17,11 @@ assert x264Support -> x264 != null; assert xvidSupport -> xvidcore != null; stdenv.mkDerivation rec { - name = "libav-0.7"; + name = "libav-0.8.3"; src = fetchurl { url = "http://libav.org/releases/${name}.tar.xz"; - sha256 = "04pl6y53xh6xmwzz0f12mg5vh62ylp5zwwinj6dxzd8pnbjg4lsz"; + sha256 = "37a9fc8bb5e56dcb0487afbb013f745a14addff61cea08a6009e2fd01251f080"; }; # `--enable-gpl' (as well as the `postproc' and `swscale') mean that @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { "--enable-gpl" "--enable-postproc" "--enable-swscale" - "--disable-ffserver" - "--disable-ffplay" + "--disable-avserver" + "--disable-avplay" "--enable-shared" "--enable-runtime-cpudetect" ] From 846f30aa2ce21660f16e526d26623204163949c2 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 7 Aug 2012 06:04:36 +0200 Subject: [PATCH 06/19] gstreamer: Add python to build dependencies. We want to build the Python library from the main GStreamer source tree, as the external gst-python library will become obsolete in GStreamer 1.0. Signed-off-by: aszlig --- pkgs/development/libraries/gstreamer/gstreamer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/gstreamer/default.nix index 195be4ab40ca2..460092bf98fd1 100644 --- a/pkgs/development/libraries/gstreamer/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamer/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, perl, bison, flex, pkgconfig, glib, libxml2 }: +{ fetchurl, stdenv, perl, python, bison, flex, pkgconfig, glib, libxml2 }: stdenv.mkDerivation rec { name = "gstreamer-0.11.92"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "5e41428eea3f62711bede6fd9457ac836874215fcfe5d6775c3f2000452da281"; }; - buildInputs = [ perl bison flex pkgconfig ]; + buildInputs = [ perl python bison flex pkgconfig ]; propagatedBuildInputs = [ glib libxml2 ]; patchPhase = '' From 419e6c064af923dac3806309842cec206e1d5d3d Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 7 Aug 2012 06:06:43 +0200 Subject: [PATCH 07/19] gst-python: Remove package and all references. As pointed out earlier, gst-python will become obsolete in GStreamer 1.0 and as we already build the main GStreamer with its Python library, we won't need gst-python anymore. Signed-off-by: aszlig --- .../instant-messengers/gajim/default.nix | 2 +- .../libraries/farsight2/default.nix | 4 +-- .../libraries/farstream/default.nix | 4 +-- .../gstreamer/gst-python/default.nix | 30 ------------------- .../libraries/telepathy/farstream/default.nix | 4 +-- pkgs/top-level/all-packages.nix | 6 ++-- 6 files changed, 9 insertions(+), 41 deletions(-) delete mode 100644 pkgs/development/libraries/gstreamer/gst-python/default.nix diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 1def7e2b1f017..45bc6482009bc 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/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_ffmpeg ]; in rec { diff --git a/pkgs/development/libraries/farsight2/default.nix b/pkgs/development/libraries/farsight2/default.nix index cbb21073685c7..f0e45298de001 100644 --- a/pkgs/development/libraries/farsight2/default.nix +++ b/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 ]; diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix index 3babcb8283371..f1afeb7f0d76a 100644 --- a/pkgs/development/libraries/farstream/default.nix +++ b/pkgs/development/libraries/farstream/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libnice, pkgconfig, python, gstreamer, gst_plugins_base -, pygobject, gst_python, gupnp_igd +, pygobject, gupnp_igd , gst_plugins_good, gst_plugins_bad, gst_ffmpeg }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildNativeInputs = [ pkgconfig ]; - propagatedBuildInputs = [ gstreamer gst_plugins_base gst_python + propagatedBuildInputs = [ gstreamer gst_plugins_base gst_plugins_good gst_plugins_bad gst_ffmpeg ]; diff --git a/pkgs/development/libraries/gstreamer/gst-python/default.nix b/pkgs/development/libraries/gstreamer/gst-python/default.nix deleted file mode 100644 index fedb44068eb8e..0000000000000 --- a/pkgs/development/libraries/gstreamer/gst-python/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, python, gstreamer - , gst_plugins_base, pygtk -}: - -stdenv.mkDerivation rec { - name = "gst-python-0.10.19"; - - src = fetchurl { - urls = [ - "${meta.homepage}/src/gst-python/${name}.tar.bz2" - "mirror://gentoo/distfiles/${name}.tar.bz2" - ]; - sha256 = "956f81a8c15daa3f17e688a0dc5a5d18a3118141066952d3b201a6ac0c52b415"; - }; - - buildInputs = - [ pkgconfig gst_plugins_base pygtk ] - ; - - propagatedBuildInputs = [ gstreamer python ]; - - meta = { - homepage = http://gstreamer.freedesktop.org; - - description = "Python bindings for GStreamer"; - - license = "LGPLv2+"; - }; -} - diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix index a183737dc9b22..e5791fc35605f 100644 --- a/pkgs/development/libraries/telepathy/farstream/default.nix +++ b/pkgs/development/libraries/telepathy/farstream/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, telepathy_glib, farstream, gst_plugins_base, dbus_glib -, pkgconfig, libxslt, python, gstreamer, gst_python, pygobject }: +, pkgconfig, libxslt, python, gstreamer, pygobject }: stdenv.mkDerivation rec { name = "${pname}-0.2.3"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1a163gk9y3ckabm4a43lxc5a7j2s42hykbwr6r7b5mlfyqq8myx1"; }; - buildInputs = [ gst_plugins_base gst_python pygobject ]; + buildInputs = [ gst_plugins_base pygobject ]; propagatedBuildInputs = [ dbus_glib farstream telepathy_glib gstreamer ]; buildNativeInputs = [ pkgconfig python libxslt]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e332c6b15b33f..8932554b7991d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3782,7 +3782,7 @@ let mpfr = callPackage ../development/libraries/mpfr { }; gst_all = { - inherit (pkgs) gstreamer gnonlin gst_python qt_gstreamer; + inherit (pkgs) gstreamer gnonlin qt_gstreamer; gstPluginsBase = pkgs.gst_plugins_base; gstPluginsBad = pkgs.gst_plugins_bad; gstPluginsGood = pkgs.gst_plugins_good; @@ -3802,8 +3802,6 @@ let gst_ffmpeg = callPackage ../development/libraries/gstreamer/gst-ffmpeg {}; - gst_python = callPackage ../development/libraries/gstreamer/gst-python {}; - gnonlin = callPackage ../development/libraries/gstreamer/gnonlin {}; qt_gstreamer = callPackage ../development/libraries/gstreamer/qt-gstreamer {}; @@ -8780,7 +8778,7 @@ let gajim = builderDefsPackage (import ../applications/networking/instant-messengers/gajim) { inherit perl intltool pyGtkGlade gettext pkgconfig makeWrapper pygobject pyopenssl gtkspell libsexy pycrypto aspell pythonDBus pythonSexy - docutils gtk farstream gst_plugins_bad gstreamer gst_ffmpeg gst_python; + docutils gtk farstream gst_plugins_bad gstreamer gst_ffmpeg; dbus = dbus.libs; inherit (gnome) libglade; inherit (xlibs) libXScrnSaver libXt xproto libXext xextproto libX11 From 3c0f23db177b37ac08ed65661167045dc2824ee1 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 7 Aug 2012 11:10:51 +0200 Subject: [PATCH 08/19] pygobject: Update to version 3.0.4. This replaces the former gst-python derivation and is the way how GStreamer should be used in API version 1.0, for reference please see: https://wiki.ubuntu.com/Novacut/GStreamer1.0#Python_Porting_Guide Signed-off-by: aszlig --- .../python-modules/pygobject/default.nix | 28 ++++++------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix index 4ef851f5b3edf..300ec4b0fc1c7 100644 --- a/pkgs/development/python-modules/pygobject/default.nix +++ b/pkgs/development/python-modules/pygobject/default.nix @@ -1,28 +1,18 @@ -{ stdenv, fetchurl, python, pkgconfig, glib }: +{ stdenv, fetchurl, python, pkgconfig, glib, gobjectIntrospection +, cairo, pycairo, expat }: stdenv.mkDerivation rec { - name = "pygobject-2.27.0"; + name = "pygobject-3.0.4"; src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.27/${name}.tar.bz2"; - sha256 = "18mq4mj9s9sw12m6gbbc4iffrq993c7q09v9yahlnamrqn3bv53m"; + url = "http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.0/${name}.tar.xz"; + sha256 = "f457b1d7f6b8bfa727593c3696d2b405da66b4a8d34cd7d3362ebda1221f0661"; }; - configureFlags = "--disable-introspection"; - - buildInputs = [ python pkgconfig glib ]; - - postInstall = '' - # All python code is installed into a "gtk-2.0" sub-directory. That - # sub-directory may be useful on systems which share several library - # versions in the same prefix, i.e. /usr/local, but on Nix that directory - # is useless. Furthermore, its existence makes it very hard to guess a - # proper $PYTHONPATH that allows "import gtk" to succeed. - cd $(toPythonPath $out)/gtk-2.0 - for n in *; do - ln -s "gtk-2.0/$n" "../$n" - done - ''; + buildInputs = [ + python pkgconfig glib gobjectIntrospection + cairo pycairo expat + ]; meta = { homepage = http://live.gnome.org/PyGObject; From 21ef8f2d8b0fe775efe025fa41b6c2848e66fb87 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 7 Aug 2012 11:53:28 +0200 Subject: [PATCH 09/19] transmageddon: New package, as it uses pygobject. Mainly this is added so we have an example to test if pygobject integration works. Unfortunately the version seems to be for pygi before it has been merged into pygobject. So we will set all pointers to prepare for this, so that we only have to change the git revision to some later version in order to get it running (build is running fine, which doesn't come as a surprise for a project using Python). Signed-off-by: aszlig --- .../video/transmageddon/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/video/transmageddon/default.nix diff --git a/pkgs/applications/video/transmageddon/default.nix b/pkgs/applications/video/transmageddon/default.nix new file mode 100644 index 0000000000000..76f1401afde0c --- /dev/null +++ b/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"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8932554b7991d..9e4d274ac1635 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7802,6 +7802,8 @@ let wrapPython = pythonPackages.wrapPython; }; + transmageddon = callPackage ../applications/video/transmageddon { }; + transmission = callPackage ../applications/networking/p2p/transmission { }; transmission_remote_gtk = callPackage ../applications/networking/p2p/transmission-remote-gtk {}; From fb6063b50b908b037a64d202efb4c16dfaf7b041 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 22 Aug 2012 09:12:01 +0200 Subject: [PATCH 10/19] gst-ffmpeg: Rename to gst-libav. Rename gst-ffmpeg to gst-libav and update all references pointing to gst-ffmpeg, as noted by @vcunat. For more info please look at the release notes of 0.11.90: http://gstreamer.freedesktop.org/releases/gst-libav/0.11.90.html Signed-off-by: aszlig --- .../networking/browsers/uzbl/default.nix | 2 +- .../instant-messengers/baresip/default.nix | 4 ++-- .../networking/instant-messengers/gajim/default.nix | 4 ++-- pkgs/applications/video/gnash/default.nix | 8 ++++---- pkgs/development/libraries/farstream/default.nix | 4 ++-- .../gstreamer/{gst-ffmpeg => gst-libav}/default.nix | 8 ++++---- pkgs/development/libraries/webkit/default.nix | 4 ++-- pkgs/development/libraries/webkit/gtk2.nix | 4 ++-- pkgs/development/libraries/webkit/svn.nix | 4 ++-- pkgs/top-level/all-packages.nix | 12 ++++++------ 10 files changed, 27 insertions(+), 27 deletions(-) rename pkgs/development/libraries/gstreamer/{gst-ffmpeg => gst-libav}/default.nix (81%) diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix index 4c6458d909fd9..7f015e561fc72 100644 --- a/pkgs/applications/networking/browsers/uzbl/default.nix +++ b/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 ''; diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index ba530374c71f8..cebaf62e5eeec 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/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 = [ diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 45bc6482009bc..260c09f44cd48 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/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_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"]; diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index db6bde782b99e..9a7f97da3aeaf 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/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 @@ -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-0.10:${gst_plugins_good}/lib/gstreamer-0.10:${gst_libav}/lib/gstreamer-0.10" done ''; diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix index f1afeb7f0d76a..03b19fbd7884e 100644 --- a/pkgs/development/libraries/farstream/default.nix +++ b/pkgs/development/libraries/farstream/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libnice, pkgconfig, python, gstreamer, gst_plugins_base , pygobject, gupnp_igd -, gst_plugins_good, gst_plugins_bad, gst_ffmpeg +, gst_plugins_good, gst_plugins_bad, gst_libav }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildNativeInputs = [ pkgconfig ]; propagatedBuildInputs = [ gstreamer gst_plugins_base - gst_plugins_good gst_plugins_bad gst_ffmpeg + gst_plugins_good gst_plugins_bad gst_libav ]; meta = { diff --git a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/gst-libav/default.nix similarity index 81% rename from pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix rename to pkgs/development/libraries/gstreamer/gst-libav/default.nix index 00f0180ae0910..c08cb489b221f 100644 --- a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-libav/default.nix @@ -3,7 +3,7 @@ , useInternalLibAV ? false, libav ? null }: stdenv.mkDerivation rec { - name = "gst-ffmpeg-${version}"; + name = "gst-libav-${version}"; version = "0.11.92"; src = fetchgit { @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { preConfigure = "autoreconf -vfi"; - # Upstream strongly recommends against using --with-system-ffmpeg, + # 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 ffmpeg). + # multiple copies of libav). configureFlags = stdenv.lib.optionalString (!useInternalLibAV) "--with-system-libav"; buildInputs = @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://gstreamer.freedesktop.org/releases/gst-ffmpeg"; - description = "GStreamer's plug-in using FFmpeg"; + description = "GStreamer's plug-in using LibAV"; license = "GPLv2+"; }; } diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix index d229228b94f79..0161766ea070c 100644 --- a/pkgs/development/libraries/webkit/default.nix +++ b/pkgs/development/libraries/webkit/default.nix @@ -18,7 +18,7 @@ rec { ]; propagatedBuildInputs = [ - gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good + gstreamer gst_plugins_base gst_libav gst_plugins_good ]; configureFlags = [ @@ -91,6 +91,6 @@ rec { maintainers = [stdenv.lib.maintainers.raskin]; }; passthru = { - inherit gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg; + inherit gstreamer gst_plugins_base gst_plugins_good gst_libav; }; } diff --git a/pkgs/development/libraries/webkit/gtk2.nix b/pkgs/development/libraries/webkit/gtk2.nix index 0b836cd08f002..9df8dcd12ae17 100644 --- a/pkgs/development/libraries/webkit/gtk2.nix +++ b/pkgs/development/libraries/webkit/gtk2.nix @@ -18,7 +18,7 @@ rec { ]; propagatedBuildInputs = [ - gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good + gstreamer gst_plugins_base gst_libav gst_plugins_good ]; configureFlags = [ @@ -87,6 +87,6 @@ rec { maintainers = [stdenv.lib.maintainers.raskin]; }; passthru = { - inherit gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg; + inherit gstreamer gst_plugins_base gst_plugins_good gst_libav; }; } diff --git a/pkgs/development/libraries/webkit/svn.nix b/pkgs/development/libraries/webkit/svn.nix index db6fe1ba55c87..8cbcee741b670 100644 --- a/pkgs/development/libraries/webkit/svn.nix +++ b/pkgs/development/libraries/webkit/svn.nix @@ -17,7 +17,7 @@ rec { ]; propagatedBuildInputs = [ - gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good + gstreamer gst_plugins_base gst_libav gst_plugins_good ]; configureCommand = "./autogen.sh "; @@ -86,6 +86,6 @@ rec { maintainers = [stdenv.lib.maintainers.raskin]; }; passthru = { - inherit gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg; + inherit gstreamer gst_plugins_base gst_plugins_good gst_libav; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e4d274ac1635..48c9febbd5890 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3787,7 +3787,7 @@ let gstPluginsBad = pkgs.gst_plugins_bad; gstPluginsGood = pkgs.gst_plugins_good; gstPluginsUgly = pkgs.gst_plugins_ugly; - gstFfmpeg = pkgs.gst_ffmpeg; + gstLibAV = pkgs.gst_libav; }; gstreamer = callPackage ../development/libraries/gstreamer/gstreamer {}; @@ -3800,7 +3800,7 @@ let gst_plugins_ugly = callPackage ../development/libraries/gstreamer/gst-plugins-ugly {}; - gst_ffmpeg = callPackage ../development/libraries/gstreamer/gst-ffmpeg {}; + gst_libav = callPackage ../development/libraries/gstreamer/gst-libav {}; gnonlin = callPackage ../development/libraries/gstreamer/gnonlin {}; @@ -5000,7 +5000,7 @@ let icu cairo intltool automake libtool pkgconfig autoconf bison libproxy enchant python ruby which flex geoclue mesa; - inherit gstreamer gst_plugins_base gst_ffmpeg + inherit gstreamer gst_plugins_base gst_libav gst_plugins_good; inherit (xlibs) libXt renderproto libXrender kbproto; libpng = libpng12; @@ -5016,7 +5016,7 @@ let icu cairo intltool automake libtool pkgconfig autoconf bison libproxy enchant python ruby which flex geoclue; - inherit gstreamer gst_plugins_base gst_ffmpeg + inherit gstreamer gst_plugins_base gst_libav gst_plugins_good; inherit (xlibs) libXt renderproto libXrender; libpng = libpng12; @@ -5032,7 +5032,7 @@ let icu cairo perl intltool automake libtool pkgconfig autoconf bison libproxy enchant python ruby which flex geoclue; - inherit gstreamer gst_plugins_base gst_ffmpeg + inherit gstreamer gst_plugins_base gst_libav gst_plugins_good; inherit (xlibs) libXt renderproto libXrender; libpng = libpng12; @@ -8780,7 +8780,7 @@ let gajim = builderDefsPackage (import ../applications/networking/instant-messengers/gajim) { inherit perl intltool pyGtkGlade gettext pkgconfig makeWrapper pygobject pyopenssl gtkspell libsexy pycrypto aspell pythonDBus pythonSexy - docutils gtk farstream gst_plugins_bad gstreamer gst_ffmpeg; + docutils gtk farstream gst_plugins_bad gstreamer gst_libav; dbus = dbus.libs; inherit (gnome) libglade; inherit (xlibs) libXScrnSaver libXt xproto libXext xextproto libX11 From b09b93ccf5c17e1fb723521c16ec84a185e19b3f Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 22 Aug 2012 09:14:00 +0200 Subject: [PATCH 11/19] gst-libav: Switch to the tarball instead of git. I've used git before, as I obviously didn't find the tarballs for gst-ffmpeg before. And it obviously turned out that newer releases end up in the gst-libav releases folder, so my bad for being blind. Signed-off-by: aszlig --- .../libraries/gstreamer/gst-libav/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/gst-libav/default.nix b/pkgs/development/libraries/gstreamer/gst-libav/default.nix index c08cb489b221f..13d50c14ad031 100644 --- a/pkgs/development/libraries/gstreamer/gst-libav/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-libav/default.nix @@ -1,4 +1,4 @@ -{ fetchgit, stdenv, autoconf, automake, libtool, pkgconfig +{ fetchurl, stdenv, autoconf, automake, libtool, pkgconfig , gst_plugins_base, bzip2, yasm , useInternalLibAV ? false, libav ? null }: @@ -6,10 +6,12 @@ stdenv.mkDerivation rec { name = "gst-libav-${version}"; version = "0.11.92"; - src = fetchgit { - url = "git://anongit.freedesktop.org/gstreamer/gst-ffmpeg"; - rev = "refs/tags/RELEASE-${version}"; - sha256 = "cd0fb825bfceaea64581272e3db812595a7ee1644281bdc466dc1ecc9c46f8b6"; + src = fetchurl { + urls = [ + "${meta.homepage}/src/gst-libav/${name}.tar.xz" + "mirror://gentoo/distfiles/${name}.tar.xz" + ]; + sha256 = "6376c421e14e3281ec86fcbf3fc62a5296a9705b025dbf0e5841ddf90c8ec2b7"; }; preConfigure = "autoreconf -vfi"; @@ -24,7 +26,7 @@ stdenv.mkDerivation rec { ++ (if useInternalLibAV then [ yasm ] else [ libav ]); meta = { - homepage = "http://gstreamer.freedesktop.org/releases/gst-ffmpeg"; + homepage = http://gstreamer.freedesktop.org; description = "GStreamer's plug-in using LibAV"; license = "GPLv2+"; }; From b934d68c5ff0fe0d2239e27048947173cf7839fe Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 22 Aug 2012 09:27:35 +0200 Subject: [PATCH 12/19] gstreamer: Update all modules to version 0.11.93. Except gnonlin, which unfortunately isn't available for the upcoming release yet. Signed-off-by: aszlig --- pkgs/development/libraries/gstreamer/gst-libav/default.nix | 4 ++-- .../libraries/gstreamer/gst-plugins-bad/default.nix | 4 ++-- .../libraries/gstreamer/gst-plugins-base/default.nix | 4 ++-- .../libraries/gstreamer/gst-plugins-good/default.nix | 4 ++-- .../libraries/gstreamer/gst-plugins-ugly/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/gstreamer/default.nix | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/gst-libav/default.nix b/pkgs/development/libraries/gstreamer/gst-libav/default.nix index 13d50c14ad031..5e7fc2fe81478 100644 --- a/pkgs/development/libraries/gstreamer/gst-libav/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-libav/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { name = "gst-libav-${version}"; - version = "0.11.92"; + version = "0.11.93"; src = fetchurl { urls = [ "${meta.homepage}/src/gst-libav/${name}.tar.xz" "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "6376c421e14e3281ec86fcbf3fc62a5296a9705b025dbf0e5841ddf90c8ec2b7"; + sha256 = "d991612a12230c0efdbe54e97597acb554524c056bb0b2c7fd3838a88d9e5cf2"; }; preConfigure = "autoreconf -vfi"; diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix index bb1bfab282e3d..31f33358a0ae5 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix @@ -2,14 +2,14 @@ , libdvdnav, libdvdread }: stdenv.mkDerivation rec { - name = "gst-plugins-bad-0.11.92"; + name = "gst-plugins-bad-0.11.93"; src = fetchurl { urls = [ "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz" "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "deb68624cd27dcdeea49ff6ed149ae6a3c755ec8d386e541faa073276f0c9402"; + sha256 = "b233098ce9e7b5f3e123ca60faedd0794aee2ed00d87a04884646bdb2195d7a6"; }; buildInputs = diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix index f4ac209066a7d..1621865b92709 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix @@ -8,14 +8,14 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-base-0.11.92"; + name = "gst-plugins-base-0.11.93"; src = fetchurl { urls = [ "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz" "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "00ad53f405a57b8c812edfbb0978be6bf57d0c8ea91069e8024c4d1aacf60902"; + sha256 = "d0cce74557a7815c0a9dae7ae9241eea6314478e0bfa3759dbac1b63bcff51d8"; }; patchPhase = '' diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix index f7ec837d3a38b..8b6281878e664 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-good-0.11.92"; + name = "gst-plugins-good-0.11.93"; src = fetchurl { urls = [ "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz" "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "b269ac044108d4325ab5009ab23c615141f00c5acce0202b79672bab2b74b553"; + sha256 = "6ef9b537284f0cd9e727d31f36eef907333d16e7deb6d61a93df738f00c5c93c"; }; configureFlags = "--disable-oss"; diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix index 000fc2fa895a4..a852d73453c4f 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix @@ -2,14 +2,14 @@ , libmad, libdvdread, libmpeg2, libcdio, a52dec }: stdenv.mkDerivation rec { - name = "gst-plugins-ugly-0.11.92"; + name = "gst-plugins-ugly-0.11.93"; src = fetchurl { urls = [ "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz" "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "51d4ebd7728787722d649984cfa4633baf84412a05962cf82fc2b20a2f944d88"; + sha256 = "d6654430c65e620fc9bd3d471bca43993eb698fe0a0b23bab76f4fd46cccbb30"; }; buildInputs = diff --git a/pkgs/development/libraries/gstreamer/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/gstreamer/default.nix index 460092bf98fd1..62729778376ed 100644 --- a/pkgs/development/libraries/gstreamer/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamer/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv, perl, python, bison, flex, pkgconfig, glib, libxml2 }: stdenv.mkDerivation rec { - name = "gstreamer-0.11.92"; + name = "gstreamer-0.11.93"; src = fetchurl { urls = [ "${meta.homepage}/src/gstreamer/${name}.tar.xz" "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "5e41428eea3f62711bede6fd9457ac836874215fcfe5d6775c3f2000452da281"; + sha256 = "aa925faddbfbc9d8f8d1289d781736e6aa116c75ba7a48ca1b3d78d397c1095a"; }; buildInputs = [ perl python bison flex pkgconfig ]; From 01d8420f64ae699bd2bc60615303fda4841e514c Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 3 Dec 2012 11:30:28 +0100 Subject: [PATCH 13/19] gstreamer: Update to new upstream version 1.0.3. It has been a while since I've worked on GStreamer, so version 1.0 has been released already. Signed-off-by: aszlig --- pkgs/development/libraries/gstreamer/gstreamer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/gstreamer/default.nix index 62729778376ed..52f0ad95c1def 100644 --- a/pkgs/development/libraries/gstreamer/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamer/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv, perl, python, bison, flex, pkgconfig, glib, libxml2 }: stdenv.mkDerivation rec { - name = "gstreamer-0.11.93"; + name = "gstreamer-1.0.3"; src = fetchurl { urls = [ "${meta.homepage}/src/gstreamer/${name}.tar.xz" "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "aa925faddbfbc9d8f8d1289d781736e6aa116c75ba7a48ca1b3d78d397c1095a"; + sha256 = "69ac49e2ae9cd2ea5f789de641aeb338bb8731961acfced08ae1c76a797fe6b1"; }; buildInputs = [ perl python bison flex pkgconfig ]; From be3a216fed23ab2a49a09f2ced5e1d80b058aeff Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 3 Dec 2012 11:37:11 +0100 Subject: [PATCH 14/19] gst-plugins: Update all plugins to version v1.0.3. In case you're wondering why I'm not using base32 SHA256: The upstream already provides SHA256 hashes, so I found it more clear to use those as-is so you could easily compare them without converting using nix-hash or whatnot. Signed-off-by: aszlig --- .../libraries/gstreamer/gst-plugins-bad/default.nix | 4 ++-- .../libraries/gstreamer/gst-plugins-base/default.nix | 4 ++-- .../libraries/gstreamer/gst-plugins-good/default.nix | 4 ++-- .../libraries/gstreamer/gst-plugins-ugly/default.nix | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix index 31f33358a0ae5..68068930915e2 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix @@ -2,14 +2,14 @@ , libdvdnav, libdvdread }: stdenv.mkDerivation rec { - name = "gst-plugins-bad-0.11.93"; + name = "gst-plugins-bad-1.0.3"; src = fetchurl { urls = [ "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz" "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "b233098ce9e7b5f3e123ca60faedd0794aee2ed00d87a04884646bdb2195d7a6"; + sha256 = "2eae746be0b4c7fa2f1e057c91bd36940d7c25593ab612b707904461360031f0"; }; buildInputs = diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix index 1621865b92709..c446a6e5ca84a 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix @@ -8,14 +8,14 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-base-0.11.93"; + name = "gst-plugins-base-1.0.3"; src = fetchurl { urls = [ "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz" "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "d0cce74557a7815c0a9dae7ae9241eea6314478e0bfa3759dbac1b63bcff51d8"; + sha256 = "066ba8a7fa709a25ad291f7b21329b73f513637aafceee00396e588e723d7f9e"; }; patchPhase = '' diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix index 8b6281878e664..fab0da5d6dd22 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-good-0.11.93"; + name = "gst-plugins-good-1.0.3"; src = fetchurl { urls = [ "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz" "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "6ef9b537284f0cd9e727d31f36eef907333d16e7deb6d61a93df738f00c5c93c"; + sha256 = "92ab8bdee2e539a5302c1b0c8d460e638da33ebf89142caee210cb0c9720c68e"; }; configureFlags = "--disable-oss"; diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix index a852d73453c4f..c7e09c4cbca25 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix @@ -2,14 +2,14 @@ , libmad, libdvdread, libmpeg2, libcdio, a52dec }: stdenv.mkDerivation rec { - name = "gst-plugins-ugly-0.11.93"; + name = "gst-plugins-ugly-1.0.3"; src = fetchurl { urls = [ "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz" "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "d6654430c65e620fc9bd3d471bca43993eb698fe0a0b23bab76f4fd46cccbb30"; + sha256 = "b8f4cfef12201f19c53a4cde7bc4fef995740c566ea45921d4473f3714e4d8c0"; }; buildInputs = From b8396cfb7e41358e1d1df6a4da8d225241b566e2 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 3 Dec 2012 11:41:59 +0100 Subject: [PATCH 15/19] gst-libav: Update to upstream version 1.0.3. Signed-off-by: aszlig --- pkgs/development/libraries/gstreamer/gst-libav/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/gst-libav/default.nix b/pkgs/development/libraries/gstreamer/gst-libav/default.nix index 5e7fc2fe81478..e2b54d70b344d 100644 --- a/pkgs/development/libraries/gstreamer/gst-libav/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-libav/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { name = "gst-libav-${version}"; - version = "0.11.93"; + version = "1.0.3"; src = fetchurl { urls = [ "${meta.homepage}/src/gst-libav/${name}.tar.xz" "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "d991612a12230c0efdbe54e97597acb554524c056bb0b2c7fd3838a88d9e5cf2"; + sha256 = "5193f158e2554a9450325dbb0c60e8f4b6b8a9244ae10ea07d0f7418a0e07959"; }; preConfigure = "autoreconf -vfi"; From b936e85792a6aaccec75f10cff0f64dcfe1118d9 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Fri, 1 Mar 2013 00:46:03 -0800 Subject: [PATCH 16/19] gst-ffpmeg -> gst-libav gst-libav-1.0.5 gst-plugins-bad-1.0.5 gst-plugins-base-1.0.5 gst-plugins-good-1.0.5 gst-plugins-ugly-1.0.5 gst-python-0.10.22 gstreamer-1.0.5 Fixups for GST_PLUGIN_PATH. --- pkgs/applications/audio/mopidy/default.nix | 4 ++-- pkgs/applications/audio/mopidy/git.nix | 4 ++-- .../networking/browsers/uzbl/default.nix | 2 +- .../instant-messengers/baresip/default.nix | 4 ++-- .../networking/instant-messengers/gajim/default.nix | 4 ++-- pkgs/applications/video/gnash/default.nix | 10 +++++----- pkgs/development/libraries/farstream/default.nix | 4 ++-- .../gstreamer/{gst-ffmpeg => gst-libav}/default.nix | 6 +++--- .../libraries/gstreamer/gst-plugins-bad/default.nix | 8 ++++---- .../libraries/gstreamer/gst-plugins-base/default.nix | 4 ++-- .../libraries/gstreamer/gst-plugins-good/default.nix | 8 ++++---- .../libraries/gstreamer/gst-plugins-ugly/default.nix | 8 ++++---- .../libraries/gstreamer/gst-python/default.nix | 4 ++-- .../libraries/gstreamer/gstreamer/default.nix | 4 ++-- .../libraries/gstreamer/gstreamer/setup-hook.sh | 4 ++-- pkgs/development/libraries/webkit/default.nix | 4 ++-- pkgs/development/libraries/webkit/gtk2.nix | 4 ++-- pkgs/development/libraries/webkit/svn.nix | 2 +- pkgs/top-level/all-packages.nix | 12 ++++++------ pkgs/top-level/release-python.nix | 2 +- 20 files changed, 51 insertions(+), 51 deletions(-) rename pkgs/development/libraries/gstreamer/{gst-ffmpeg => gst-libav}/default.nix (81%) diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 934669f225c6f..38f389f483e39 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -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-1.0 \ + --prefix GST_PLUGIN_PATH : ${gst_plugins_base}/lib/gstreamer-1.0 done ''; diff --git a/pkgs/applications/audio/mopidy/git.nix b/pkgs/applications/audio/mopidy/git.nix index 81728e646c3e4..141f2acb98e99 100644 --- a/pkgs/applications/audio/mopidy/git.nix +++ b/pkgs/applications/audio/mopidy/git.nix @@ -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-1.0 \ + --prefix GST_PLUGIN_PATH : ${gst_plugins_base}/lib/gstreamer-1.0 done ''; diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix index 4c6458d909fd9..7f015e561fc72 100644 --- a/pkgs/applications/networking/browsers/uzbl/default.nix +++ b/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 ''; diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index ba530374c71f8..cebaf62e5eeec 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/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 = [ diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 1def7e2b1f017..cc12a58d89442 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/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 gst_python ]; 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"]; diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index db6bde782b99e..b667aa9e9df9c 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/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-1.0". # 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-1.0:${gst_plugins_good}/include/gstreamer-1.0" echo "\$CPATH set to \`$CPATH'" echo "\$GST_PLUGIN_PATH set to \`$GST_PLUGIN_PATH'" @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { 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-1.0:${gst_plugins_good}/lib/gstreamer-1.0:${gst_libav}/lib/gstreamer-1.0" done ''; diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix index 3babcb8283371..60a9627ea09d4 100644 --- a/pkgs/development/libraries/farstream/default.nix +++ b/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 +, gst_plugins_good, gst_plugins_bad, gst_libav }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildNativeInputs = [ pkgconfig ]; propagatedBuildInputs = [ gstreamer gst_plugins_base gst_python - gst_plugins_good gst_plugins_bad gst_ffmpeg + gst_plugins_good gst_plugins_bad gst_libav ]; meta = { diff --git a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/gst-libav/default.nix similarity index 81% rename from pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix rename to pkgs/development/libraries/gstreamer/gst-libav/default.nix index e7aaaa46a96a8..0e4d0edd8e39f 100644 --- a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-libav/default.nix @@ -2,14 +2,14 @@ , useInternalFfmpeg ? false, ffmpeg ? null }: stdenv.mkDerivation rec { - name = "gst-ffmpeg-0.10.12"; + name = "gst-libav-1.0.5"; src = fetchurl { urls = [ - "http://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2" + "http://gstreamer.freedesktop.org/src/gst-libav/${name}.tar.xz" "mirror://gentoo/distfiles/${name}.tar.bz2" ]; - sha256 = "0fyppl8q18g71jd2r0mbiqk8hhrdxq43dglma06mxyjb5c80fxxi"; + sha256 = "1m9jzga9ahml3dnfm7syz6mglmysqpbkkyr48kka9cwna1kbxy5f"; }; # Upstream strongly recommends against using --with-system-ffmpeg, diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix index 2d1309f3a3cff..8ec8098cb266b 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix +++ b/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 = diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix index 2ac325dc2822e..56ee57122c3ed 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix +++ b/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 = '' diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix index 4298a88f65e87..98f3a45de0064 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-good-0.10.30"; + name = "gst-plugins-good-1.0.5"; src = fetchurl { urls = [ - "${meta.homepage}/src/gst-plugins-good/${name}.tar.bz2" - "mirror://gentoo/distfiles/${name}.tar.bz2" + "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz" + "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "1xlmw211fcn60y2m5gxrryb3knqril4kk2c01b6j713xna8blb5i"; + sha256 = "1i8b2kap50pz5m3iq4hf23jjbx3cwn5lxjj84nrg35kqis20pgak"; }; configureFlags = "--disable-oss"; diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix index b85fb983880b2..8ef88c24f5f3e 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix @@ -2,14 +2,14 @@ , libmad, libdvdread, libmpeg2, libcdio, a52dec }: stdenv.mkDerivation rec { - name = "gst-plugins-ugly-0.10.18"; + name = "gst-plugins-ugly-1.0.5"; src = fetchurl { urls = [ - "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.bz2" - "mirror://gentoo/distfiles/${name}.tar.bz2" + "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz" + "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "054fdkb2riy5knda39cp6w3xp9lzax52bn12cklglscjrm46ghgr"; + sha256 = "0c8kg59fg3v6hjf7wlwypcp9vnql359nvd4knj1jg6vdm4p1ham6"; }; buildInputs = diff --git a/pkgs/development/libraries/gstreamer/gst-python/default.nix b/pkgs/development/libraries/gstreamer/gst-python/default.nix index fedb44068eb8e..e960aa90421bc 100644 --- a/pkgs/development/libraries/gstreamer/gst-python/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-python/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "gst-python-0.10.19"; + name = "gst-python-0.10.22"; src = fetchurl { urls = [ "${meta.homepage}/src/gst-python/${name}.tar.bz2" "mirror://gentoo/distfiles/${name}.tar.bz2" ]; - sha256 = "956f81a8c15daa3f17e688a0dc5a5d18a3118141066952d3b201a6ac0c52b415"; + sha256 = "0y1i4n5m1diljqr9dsq12anwazrhbs70jziich47gkdwllcza9lg"; }; buildInputs = diff --git a/pkgs/development/libraries/gstreamer/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/gstreamer/default.nix index 5d33e7bff03d1..8587436657af6 100644 --- a/pkgs/development/libraries/gstreamer/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamer/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv, perl, bison, flex, pkgconfig, glib, libxml2 }: stdenv.mkDerivation rec { - name = "gstreamer-0.10.36"; + name = "gstreamer-1.0.5"; src = fetchurl { urls = [ "${meta.homepage}/src/gstreamer/${name}.tar.xz" "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "1nkid1n2l3rrlmq5qrf5yy06grrkwjh3yxl5g0w58w0pih8allci"; + sha256 = "0xsvgi4axavrh0bkjr9h8yq75bmjjs37y7mwlg84d6phcxsq5hi6"; }; buildInputs = [ perl bison flex pkgconfig ]; diff --git a/pkgs/development/libraries/gstreamer/gstreamer/setup-hook.sh b/pkgs/development/libraries/gstreamer/gstreamer/setup-hook.sh index ad184dc21e990..cdd918201eda5 100644 --- a/pkgs/development/libraries/gstreamer/gstreamer/setup-hook.sh +++ b/pkgs/development/libraries/gstreamer/gstreamer/setup-hook.sh @@ -1,7 +1,7 @@ addGstreamerLibPath () { - if test -d "$1/lib/gstreamer-0.10" + if test -d "$1/lib/gstreamer-1.0" then - export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}${GST_PLUGIN_PATH:+:}$1/lib/gstreamer-0.10" + export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}${GST_PLUGIN_PATH:+:}$1/lib/gstreamer-1.0" fi } diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix index d229228b94f79..0161766ea070c 100644 --- a/pkgs/development/libraries/webkit/default.nix +++ b/pkgs/development/libraries/webkit/default.nix @@ -18,7 +18,7 @@ rec { ]; propagatedBuildInputs = [ - gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good + gstreamer gst_plugins_base gst_libav gst_plugins_good ]; configureFlags = [ @@ -91,6 +91,6 @@ rec { maintainers = [stdenv.lib.maintainers.raskin]; }; passthru = { - inherit gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg; + inherit gstreamer gst_plugins_base gst_plugins_good gst_libav; }; } diff --git a/pkgs/development/libraries/webkit/gtk2.nix b/pkgs/development/libraries/webkit/gtk2.nix index 0b836cd08f002..9df8dcd12ae17 100644 --- a/pkgs/development/libraries/webkit/gtk2.nix +++ b/pkgs/development/libraries/webkit/gtk2.nix @@ -18,7 +18,7 @@ rec { ]; propagatedBuildInputs = [ - gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good + gstreamer gst_plugins_base gst_libav gst_plugins_good ]; configureFlags = [ @@ -87,6 +87,6 @@ rec { maintainers = [stdenv.lib.maintainers.raskin]; }; passthru = { - inherit gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg; + inherit gstreamer gst_plugins_base gst_plugins_good gst_libav; }; } diff --git a/pkgs/development/libraries/webkit/svn.nix b/pkgs/development/libraries/webkit/svn.nix index db6fe1ba55c87..c63c71c716cc1 100644 --- a/pkgs/development/libraries/webkit/svn.nix +++ b/pkgs/development/libraries/webkit/svn.nix @@ -17,7 +17,7 @@ rec { ]; propagatedBuildInputs = [ - gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good + gstreamer gst_plugins_base gst_libav gst_plugins_good ]; configureCommand = "./autogen.sh "; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93918671fb606..4b76ac6922045 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3894,7 +3894,7 @@ let gstPluginsBad = pkgs.gst_plugins_bad; gstPluginsGood = pkgs.gst_plugins_good; gstPluginsUgly = pkgs.gst_plugins_ugly; - gstFfmpeg = pkgs.gst_ffmpeg; + gstLibAV = pkgs.gst_libav; }; gstreamer = callPackage ../development/libraries/gstreamer/gstreamer {}; @@ -3907,7 +3907,7 @@ let gst_plugins_ugly = callPackage ../development/libraries/gstreamer/gst-plugins-ugly {}; - gst_ffmpeg = callPackage ../development/libraries/gstreamer/gst-ffmpeg {}; + gst_libav = callPackage ../development/libraries/gstreamer/gst-libav {}; gst_python = callPackage ../development/libraries/gstreamer/gst-python {}; @@ -5118,7 +5118,7 @@ let icu cairo intltool automake libtool pkgconfig autoconf bison libproxy enchant python ruby which flex geoclue mesa; - inherit gstreamer gst_plugins_base gst_ffmpeg + inherit gstreamer gst_plugins_base gst_libav gst_plugins_good; inherit (xlibs) libXt renderproto libXrender kbproto; libpng = libpng12; @@ -5134,7 +5134,7 @@ let icu cairo intltool automake libtool pkgconfig autoconf bison libproxy enchant python ruby which flex geoclue; - inherit gstreamer gst_plugins_base gst_ffmpeg + inherit gstreamer gst_plugins_base gst_libav gst_plugins_good; inherit (xlibs) libXt renderproto libXrender; libpng = libpng12; @@ -5150,7 +5150,7 @@ let icu cairo perl intltool automake libtool pkgconfig autoconf bison libproxy enchant python ruby which flex geoclue; - inherit gstreamer gst_plugins_base gst_ffmpeg + inherit gstreamer gst_plugins_base gst_libav gst_plugins_good; inherit (xlibs) libXt renderproto libXrender; libpng = libpng12; @@ -8899,7 +8899,7 @@ let gajim = builderDefsPackage (import ../applications/networking/instant-messengers/gajim) { inherit perl intltool pyGtkGlade gettext pkgconfig makeWrapper pygobject pyopenssl gtkspell libsexy pycrypto aspell pythonDBus pythonSexy - docutils gtk farstream gst_plugins_bad gstreamer gst_ffmpeg gst_python; + docutils gtk farstream gst_plugins_bad gstreamer gst_libav gst_python; dbus = dbus.libs; inherit (gnome) libglade; inherit (xlibs) libXScrnSaver libXt xproto libXext xextproto libX11 diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 7d98a51cab519..da6838af7fe44 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -549,7 +549,7 @@ in gsettings_desktop_schemas = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; gsmartcontrol = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; gssdp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gst_ffmpeg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gst_libav = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; gst_plugins_bad = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; gst_plugins_base = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; gst_plugins_good = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; From 4990ae1836ea03376d523cda7aca9838ff4772c6 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Fri, 1 Mar 2013 01:16:49 -0800 Subject: [PATCH 17/19] gst-libav no longer supports using the system ffmpeg. --- .../libraries/gstreamer/gst-libav/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/gst-libav/default.nix b/pkgs/development/libraries/gstreamer/gst-libav/default.nix index 0e4d0edd8e39f..8e16cba22896d 100644 --- a/pkgs/development/libraries/gstreamer/gst-libav/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-libav/default.nix @@ -1,5 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, gst_plugins_base, bzip2, yasm -, useInternalFfmpeg ? false, ffmpeg ? null }: +{ fetchurl, stdenv, pkgconfig, gst_plugins_base, bzip2, yasm }: stdenv.mkDerivation rec { name = "gst-libav-1.0.5"; @@ -12,17 +11,13 @@ stdenv.mkDerivation rec { sha256 = "1m9jzga9ahml3dnfm7syz6mglmysqpbkkyr48kka9cwna1kbxy5f"; }; - # Upstream strongly recommends against using --with-system-ffmpeg, - # but we do it anyway because we're so hardcore (and we don't want - # multiple copies of ffmpeg). - configureFlags = stdenv.lib.optionalString (!useInternalFfmpeg) "--with-system-ffmpeg"; - buildInputs = - [ pkgconfig bzip2 gst_plugins_base ] - ++ (if useInternalFfmpeg then [ yasm ] else [ ffmpeg ]); + [ pkgconfig bzip2 gst_plugins_base yasm ]; + + enableParallelBuilding = true; meta = { - homepage = "http://gstreamer.freedesktop.org/releases/gst-ffmpeg"; + homepage = "http://gstreamer.freedesktop.org/releases/gst-libav"; description = "GStreamer's plug-in using FFmpeg"; license = "GPLv2+"; }; From be72215400c5f8e1a4394762f4c2b1b8e392cb12 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Mon, 4 Mar 2013 22:58:26 -0800 Subject: [PATCH 18/19] update gst plugin path to match any gstreamer version. --- pkgs/applications/audio/mopidy/default.nix | 4 ++-- pkgs/applications/audio/mopidy/git.nix | 4 ++-- pkgs/applications/video/gnash/default.nix | 6 +++--- .../development/libraries/gstreamer/gstreamer/setup-hook.sh | 5 +++-- .../libraries/phonon-backend-gstreamer/default.nix | 4 ++-- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 5177359893485..527473fc636d1 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -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-1.0 \ - --prefix GST_PLUGIN_PATH : ${gst_plugins_base}/lib/gstreamer-1.0 + --prefix GST_PLUGIN_PATH : ${gst_plugins_good}/lib/gstreamer-* \ + --prefix GST_PLUGIN_PATH : ${gst_plugins_base}/lib/gstreamer-* done ''; diff --git a/pkgs/applications/audio/mopidy/git.nix b/pkgs/applications/audio/mopidy/git.nix index 247f3f7da136d..627253cbba88b 100644 --- a/pkgs/applications/audio/mopidy/git.nix +++ b/pkgs/applications/audio/mopidy/git.nix @@ -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-1.0 \ - --prefix GST_PLUGIN_PATH : ${gst_plugins_base}/lib/gstreamer-1.0 + --prefix GST_PLUGIN_PATH : ${gst_plugins_good}/lib/gstreamer-* \ + --prefix GST_PLUGIN_PATH : ${gst_plugins_base}/lib/gstreamer-* done ''; diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index 0802d7aa5b202..7486d1db0aae5 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/pkgs/applications/video/gnash/default.nix @@ -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-1.0". + # 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-1.0:${gst_plugins_good}/include/gstreamer-1.0" + 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'" @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { do wrapProgram "$prog" --prefix \ GST_PLUGIN_PATH ":" \ - "${gst_plugins_base}/lib/gstreamer-1.0:${gst_plugins_good}/lib/gstreamer-1.0:${gst_libav}/lib/gstreamer-1.0" + "${gst_plugins_base}/lib/gstreamer-*:${gst_plugins_good}/lib/gstreamer-*:${gst_libav}/lib/gstreamer-*" done ''; diff --git a/pkgs/development/libraries/gstreamer/gstreamer/setup-hook.sh b/pkgs/development/libraries/gstreamer/gstreamer/setup-hook.sh index cdd918201eda5..e81a4ea1532f8 100644 --- a/pkgs/development/libraries/gstreamer/gstreamer/setup-hook.sh +++ b/pkgs/development/libraries/gstreamer/gstreamer/setup-hook.sh @@ -1,7 +1,8 @@ addGstreamerLibPath () { - if test -d "$1/lib/gstreamer-1.0" + # + if test -d "$1/lib/gstreamer-*" then - export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}${GST_PLUGIN_PATH:+:}$1/lib/gstreamer-1.0" + export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}${GST_PLUGIN_PATH:+:}$1/lib/gstreamer-*" fi } diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix index b2677eb1e7a52..81b77fb70f868 100644 --- a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix +++ b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix @@ -2,7 +2,7 @@ , gst_plugins_base }: let - version = "4.6.0"; + version = "4.6.3"; pname = "phonon-backend-gstreamer"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/phonon/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "0bwkd1dmj8p4m5xindh6ixfvifq36qmvfn246vx22syqfl6f1m2v"; + sha256 = "0n5ggap1xzspq8x1j9bvnf7wqqh5495sysri7zyg42g32gqp7qjm"; }; buildInputs = [ phonon qt4 gstreamer gst_plugins_base ]; From f14d9e2c42b7a89554eafd6a195bb34daf33ac1c Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Tue, 5 Mar 2013 14:12:36 -0800 Subject: [PATCH 19/19] gst_python goes away. Create modules for gst-0.10 stuff, and setup phonon to use them. --- pkgs/applications/audio/mopidy/default.nix | 2 +- pkgs/applications/audio/mopidy/git.nix | 2 +- .../libraries/gstreamer/gst-ffmpeg/0.10.nix | 33 +++++++++++++ .../gstreamer/gst-plugins-bad/0.10.nix | 30 ++++++++++++ .../gstreamer/gst-plugins-base/0.10.nix | 46 +++++++++++++++++ .../gstreamer/gst-plugins-good/0.10.nix | 38 ++++++++++++++ .../gstreamer/gst-plugins-ugly/0.10.nix | 30 ++++++++++++ .../libraries/gstreamer/gstreamer/0.10.nix | 49 +++++++++++++++++++ .../python-modules/pygobject/default.nix | 3 +- pkgs/top-level/all-packages.nix | 24 ++++++++- 10 files changed, 252 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/libraries/gstreamer/gst-ffmpeg/0.10.nix create mode 100644 pkgs/development/libraries/gstreamer/gst-plugins-bad/0.10.nix create mode 100644 pkgs/development/libraries/gstreamer/gst-plugins-base/0.10.nix create mode 100644 pkgs/development/libraries/gstreamer/gst-plugins-good/0.10.nix create mode 100644 pkgs/development/libraries/gstreamer/gst-plugins-ugly/0.10.nix create mode 100644 pkgs/development/libraries/gstreamer/gstreamer/0.10.nix diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 527473fc636d1..4d34c8ccbf5f9 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/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 }: diff --git a/pkgs/applications/audio/mopidy/git.nix b/pkgs/applications/audio/mopidy/git.nix index 627253cbba88b..26a82002690c6 100644 --- a/pkgs/applications/audio/mopidy/git.nix +++ b/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 }: diff --git a/pkgs/development/libraries/gstreamer/gst-ffmpeg/0.10.nix b/pkgs/development/libraries/gstreamer/gst-ffmpeg/0.10.nix new file mode 100644 index 0000000000000..3007cd102db38 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/gst-ffmpeg/0.10.nix @@ -0,0 +1,33 @@ + +# 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.13"; + + src = fetchurl { + urls = [ + "http://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2" + "mirror://gentoo/distfiles/${name}.tar.bz2" + ]; + sha256 = "0qmvgwcfybci78sd73mhvm4bsb7l0xsk9yljrgik80g011ds1z3n"; + }; + + # Upstream strongly recommends against using --with-system-ffmpeg, + # but we do it anyway because we're so hardcore (and we don't want + # multiple copies of ffmpeg). + configureFlags = stdenv.lib.optionalString (!useInternalFfmpeg) "--with-system-ffmpeg"; + + buildInputs = + [ pkgconfig bzip2 gst_plugins_base ] + ++ (if useInternalFfmpeg then [ yasm ] else [ ffmpeg ]); + + meta = { + homepage = "http://gstreamer.freedesktop.org/releases/gst-ffmpeg"; + description = "GStreamer's plug-in using FFmpeg"; + license = "GPLv2+"; + }; +} diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-bad/0.10.nix b/pkgs/development/libraries/gstreamer/gst-plugins-bad/0.10.nix new file mode 100644 index 0000000000000..f57a66950155e --- /dev/null +++ b/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+"; + }; +} diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/0.10.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/0.10.nix new file mode 100644 index 0000000000000..2ac325dc2822e --- /dev/null +++ b/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+"; + }; +} + diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/0.10.nix b/pkgs/development/libraries/gstreamer/gst-plugins-good/0.10.nix new file mode 100644 index 0000000000000..2f009754d2296 --- /dev/null +++ b/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+"; + }; +} diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-ugly/0.10.nix b/pkgs/development/libraries/gstreamer/gst-plugins-ugly/0.10.nix new file mode 100644 index 0000000000000..e4fdf8e83a9f4 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/gst-plugins-ugly/0.10.nix @@ -0,0 +1,30 @@ +{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gst_plugins_base +, libmad, libdvdread, libmpeg2, libcdio, a52dec }: + +stdenv.mkDerivation rec { + name = "gst-plugins-ugly-0.10.19"; + + src = fetchurl { + urls = [ + "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz" + "mirror://gentoo/distfiles/${name}.tar.xz" + ]; + sha256 = "0wx8dr3sqfkar106yw6h57jdv2cifwsydkziz9z7wqwjz1gzcd29"; + }; + + buildInputs = + [ pkgconfig glib gstreamer gst_plugins_base libmad libdvdread a52dec ]; + + enableParallelBuilding = true; + + meta = { + homepage = http://gstreamer.freedesktop.org; + + description = "‘Ugly’ (potentially patent-encumbered) plug-ins for GStreamer"; + + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + + license = "LGPLv2+"; + }; +} diff --git a/pkgs/development/libraries/gstreamer/gstreamer/0.10.nix b/pkgs/development/libraries/gstreamer/gstreamer/0.10.nix new file mode 100644 index 0000000000000..c3499801e6970 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/gstreamer/0.10.nix @@ -0,0 +1,49 @@ +{ fetchurl, stdenv, perl, python, bison, flex, pkgconfig, glib, libxml2 }: + +stdenv.mkDerivation rec { + name = "gstreamer-0.10.36"; + + src = fetchurl { + urls = + [ "${meta.homepage}/src/gstreamer/${name}.tar.xz" + "mirror://gentoo/distfiles/${name}.tar.xz" + ]; + sha256 = "1nkid1n2l3rrlmq5qrf5yy06grrkwjh3yxl5g0w58w0pih8allci"; + }; + + buildInputs = [ perl python bison flex pkgconfig ]; + propagatedBuildInputs = [ glib libxml2 ]; + + patchPhase = '' + sed -i -e 's/^ /\t/' docs/gst/Makefile.in docs/libs/Makefile.in docs/plugins/Makefile.in + ''; + + configureFlags = '' + --disable-examples --enable-failing-tests --localstatedir=/var --disable-gtk-doc --disable-docbook + ''; + + # Hm, apparently --disable-gtk-doc is ignored... + postInstall = "rm -rf $out/share/gtk-doc"; + + setupHook = ./setup-hook.sh; + + meta = { + homepage = http://gstreamer.freedesktop.org; + + description = "GStreamer, a library for constructing graphs of media-handling components"; + + longDescription = '' + GStreamer is a library for constructing graphs of media-handling + components. The applications it supports range from simple + Ogg/Vorbis playback, audio/video streaming to complex audio + (mixing) and video (non-linear editing) processing. + + Applications can take advantage of advances in codec and filter + technology transparently. Developers can add new codecs and + filters by writing a simple plugin with a clean, generic + interface. + ''; + + license = "LGPLv2+"; + }; +} diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix index 057a724f3fa5e..d7d2733e7f073 100644 --- a/pkgs/development/python-modules/pygobject/default.nix +++ b/pkgs/development/python-modules/pygobject/default.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchurl, python, pkgconfig, glib, gobjectIntrospection -, cairo, pycairo, expat }: +{ stdenv, fetchurl, python, pkgconfig, glib }: stdenv.mkDerivation rec { name = "pygobject-3.0.4"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d9bf7712d81c7..ee8293cc3c576 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3898,16 +3898,35 @@ let }; gstreamer = callPackage ../development/libraries/gstreamer/gstreamer {}; + gstreamer_0_10 = callPackage ../development/libraries/gstreamer/gstreamer/0.10.nix {}; gst_plugins_base = callPackage ../development/libraries/gstreamer/gst-plugins-base {}; + gst_plugins_base_0_10 = callPackage ../development/libraries/gstreamer/gst-plugins-base/0.10.nix { + gstreamer = gstreamer_0_10; + }; gst_plugins_good = callPackage ../development/libraries/gstreamer/gst-plugins-good {}; + gst_plugins_good_0_10 = callPackage ../development/libraries/gstreamer/gst-plugins-good/0.10.nix { + gstreamer = gstreamer_0_10; + gst_plugins_base = gst_plugins_base_0_10; + }; gst_plugins_bad = callPackage ../development/libraries/gstreamer/gst-plugins-bad {}; + gst_plugins_bad_0_10 = callPackage ../development/libraries/gstreamer/gst-plugins-bad/0.10.nix { + gstreamer = gstreamer_0_10; + gst_plugins_base = gst_plugins_base_0_10; + }; gst_plugins_ugly = callPackage ../development/libraries/gstreamer/gst-plugins-ugly {}; + gst_plugins_ugly_0_10 = callPackage ../development/libraries/gstreamer/gst-plugins-ugly/0.10.nix { + gstreamer = gstreamer_0_10; + gst_plugins_base = gst_plugins_base_0_10; + }; gst_libav = callPackage ../development/libraries/gstreamer/gst-libav {}; + gst_ffmpeg_0_10 = callPackage ../development/libraries/gstreamer/gst-ffmpeg/0.10.nix { # gst_ffmpeg was renamed to gst_libav with gstreamer 1.0 + gst_plugins_base = gst_plugins_base_0_10; + }; gnonlin = callPackage ../development/libraries/gstreamer/gnonlin {}; @@ -4793,7 +4812,10 @@ let phonon = callPackage ../development/libraries/phonon { }; - phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer { }; + phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer { + gstreamer = gstreamer_0_10; + gst_plugins_base = gst_plugins_base_0_10; + }; phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc { };