diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-12-28 23:28:30 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-12-29 10:01:22 +0100 |
commit | e740b565cf01082be314dff8833c4a65a834bcff (patch) | |
tree | 59e8ce4fd4ecf004581e1f1eed533970fd6eba69 /pkgs/development/libraries/gstreamer | |
parent | cb639302df235bc1a9a3f1c14901c021813ee6b5 (diff) | |
parent | 9f735bdf5784ef1d93122036d5add9ad35c19a35 (diff) | |
download | nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar.gz nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar.bz2 nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar.lz nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar.xz nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar.zst nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.zip |
Merge master into stdenv-updates
Conflicts (easy): pkgs/development/compilers/llvm/default.nix pkgs/development/compilers/openjdk/default.nix pkgs/development/libraries/icu/default.nix pkgs/development/libraries/libssh/default.nix pkgs/development/libraries/libxslt/default.nix pkgs/development/tools/parsing/bison/3.x.nix
Diffstat (limited to 'pkgs/development/libraries/gstreamer')
6 files changed, 22 insertions, 22 deletions
diff --git a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix index e7aaaa46a96..49c612f59e7 100644 --- a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix @@ -1,15 +1,15 @@ -{ fetchurl, stdenv, pkgconfig, gst_plugins_base, bzip2, yasm +{ fetchurl, stdenv, pkgconfig, gst_plugins_base, bzip2, yasm, orc , 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, @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optionalString (!useInternalFfmpeg) "--with-system-ffmpeg"; buildInputs = - [ pkgconfig bzip2 gst_plugins_base ] + [ pkgconfig bzip2 gst_plugins_base orc ] ++ (if useInternalFfmpeg then [ yasm ] else [ ffmpeg ]); meta = { diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix index 2d1309f3a3c..a433d717039 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix @@ -1,19 +1,19 @@ { fetchurl, stdenv, pkgconfig, glib, gstreamer, gst_plugins_base -, libdvdnav, libdvdread }: +, libdvdnav, libdvdread, orc }: stdenv.mkDerivation rec { - name = "gst-plugins-bad-0.10.22"; + name = "gst-plugins-bad-0.10.23"; src = fetchurl { urls = [ "${meta.homepage}/src/gst-plugins-bad/${name}.tar.bz2" "mirror://gentoo/distfiles/${name}.tar.bz2" ]; - sha256 = "030728gf0zjg62yng4qy9yapaffbvkziawa28rk0gspz8cpi1xyq"; + sha256 = "148lw51dm6pgw8vc6v0fpvm7p233wr11nspdzmvq7bjp2cd7vbhf"; }; buildInputs = - [ pkgconfig glib gstreamer gst_plugins_base libdvdnav libdvdread ]; + [ pkgconfig glib gstreamer gst_plugins_base libdvdnav libdvdread orc ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix index d6717d799f1..59ee86da86d 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, python, gstreamer, xlibs, alsaLib, cdparanoia -, libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo +, libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo, orc , libintlOrEmpty , # Whether to build no plugins that have external dependencies # (except the ALSA plugin). @@ -18,13 +18,14 @@ stdenv.mkDerivation rec { }; 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 cairo ] + [ pkgconfig glib cairo orc ] # can't build alsaLib on darwin ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib ++ stdenv.lib.optionals (!minimalDeps) @@ -37,9 +38,9 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; propagatedBuildInputs = [ gstreamer ]; - + postInstall = "rm -rf $out/share/gtk-doc"; - + meta = with stdenv.lib; { homepage = http://gstreamer.freedesktop.org; description = "Base plug-ins for GStreamer"; @@ -48,4 +49,3 @@ stdenv.mkDerivation rec { platforms = platforms.unix; }; } - diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix index 85468b309c5..a09f8279760 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, pkgconfig, gst_plugins_base, aalib, cairo -, flac, libjpeg, zlib, speex, libpng, libdv, libcaca -, libiec61883, libavc1394, taglib, pulseaudio +, flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx +, libiec61883, libavc1394, taglib, pulseaudio, gdk_pixbuf, orc , glib, gstreamer, bzip2 }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib gstreamer gst_plugins_base libavc1394 libiec61883 aalib libcaca cairo libdv flac libjpeg libpng pulseaudio speex - taglib bzip2 + taglib bzip2 libvpx gdk_pixbuf orc ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix index b85fb983880..769de911fd6 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix @@ -1,19 +1,19 @@ { fetchurl, stdenv, pkgconfig, glib, gstreamer, gst_plugins_base -, libmad, libdvdread, libmpeg2, libcdio, a52dec }: +, libmad, libdvdread, libmpeg2, libcdio, a52dec, x264, orc }: stdenv.mkDerivation rec { - name = "gst-plugins-ugly-0.10.18"; + name = "gst-plugins-ugly-0.10.19"; src = fetchurl { urls = [ "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.bz2" "mirror://gentoo/distfiles/${name}.tar.bz2" ]; - sha256 = "054fdkb2riy5knda39cp6w3xp9lzax52bn12cklglscjrm46ghgr"; + sha256 = "1w4d5iz9ffvh43l261zdp997i6s2iwd61lflf755s3sw4xch1a8w"; }; buildInputs = - [ pkgconfig glib gstreamer gst_plugins_base libmad libdvdread a52dec ]; + [ pkgconfig glib gstreamer gst_plugins_base libmad libdvdread a52dec x264 orc ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gstreamer/gst-python/default.nix b/pkgs/development/libraries/gstreamer/gst-python/default.nix index fedb44068eb..e960aa90421 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 = |