public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging'

Browse Source
This commit is contained in:
Vladimír Čunát
2014-12-26 22:41:19 +01:00
parent dd4dfee2c2 d89518bd1b
commit becf038336
17 changed files with 46 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/gstreamer/bad/default.nix
View File

@@ -11,7 +11,7 @@
assert faacSupport -> faac != null;
stdenv.mkDerivation rec {
name = "gst-plugins-bad-1.4.3";
name = "gst-plugins-bad-1.4.5";
meta = with stdenv.lib; {
description = "Gstreamer Bad Plugins";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz";
sha256 = "a6840080c469d0db51d6d4d0f7c42c97b3c8c01942f24401c61b1ad36726b97c";
sha256 = "0g4q9yqq71z32pz7zj54wigkcf438a2mcv5kvvwp4gb8a1rasbqm";
};
nativeBuildInputs = [ pkgconfig python ];

4
pkgs/development/libraries/gstreamer/base/default.nix
View File

@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
name = "gst-plugins-base-1.4.3";
name = "gst-plugins-base-1.4.5";
meta = {
description = "Base plugins and helper libraries";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz";
sha256 = "f7b4d2b3ba2bcac485896e2c1c36459cb091ebe8b49e91635c27d40f66792d9d";
sha256 = "07ampnfa6p41s0lhia62l9h8bdx3c7vxvdz93pbx64m3wycq3gbp";
};
nativeBuildInputs = [

4
pkgs/development/libraries/gstreamer/core/default.nix
View File

@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
name = "gstreamer-1.4.3";
name = "gstreamer-1.4.5";
meta = {
description = "Open source multimedia framework";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gstreamer/${name}.tar.xz";
sha256 = "11f155784d28b85a12b50d2fc8f91c6b75d9ca325cc76aaffba1a58d4c9549c9";
sha256 = "1bmhbhak6i5wmmb6w86jyyv8lax4gdq983la4lk4a0krz6kim020";
};
nativeBuildInputs = [

4
pkgs/development/libraries/gstreamer/good/default.nix
View File

@@ -7,7 +7,7 @@
}:
stdenv.mkDerivation rec {
name = "gst-plugins-good-1.4.3";
name = "gst-plugins-good-1.4.5";
meta = with stdenv.lib; {
description = "Gstreamer Good Plugins";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz";
sha256 = "5876a74402f2a24d1d3ae9163c32466bdc7a565696dddeef65e6a9a93efc5537";
sha256 = "0hg6qzdpib9nwn3hdxv0d4rvivi1c4bmxsq2a9hqmamwyzrvbcbr";
};
nativeBuildInputs = [ pkgconfig python ];

4
pkgs/development/libraries/gstreamer/libav/default.nix
View File

@@ -6,7 +6,7 @@
assert withSystemLibav -> libav != null;
stdenv.mkDerivation rec {
name = "gst-libav-1.4.3";
name = "gst-libav-1.4.5";
meta = {
homepage = "http://gstreamer.freedesktop.org";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-libav/${name}.tar.xz";
sha256 = "833229d2b1aad6549ad0297435516508cc3ac47b166d6393ecdffc34c31a01d3";
sha256 = "1g7vg9amh3cc3nmc415h6g2rqxqi4wgwqi08hxfbpwq48ri64p30";
};
configureFlags = stdenv.lib.optionalString withSystemLibav

4
pkgs/development/libraries/gstreamer/ugly/default.nix
View File

@@ -5,7 +5,7 @@
}:
stdenv.mkDerivation rec {
name = "gst-plugins-ugly-1.4.3";
name = "gst-plugins-ugly-1.4.5";
meta = with stdenv.lib; {
description = "Gstreamer Ugly Plugins";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz";
sha256 = "d581592a82cf3930361430d38436c30a58d8b6c249cad18f7f213b203e206d46";
sha256 = "0rwhljn3f8mp2pfchzfcx4pvps1546dndw9mr56lz50qyqffimaw";
};
nativeBuildInputs = [ pkgconfig python ];

6
pkgs/development/libraries/libpng/default.nix
View File

@@ -3,11 +3,11 @@
assert zlib != null;
let
version = "1.6.14";
sha256 = "0i5lwh9xnqj490c3mcx7rxaq4zr3wj27ba7vzfls45aqa2jl714n";
version = "1.6.16";
sha256 = "0q5ygy15jkpqbj5701ywrjzqp4nl5yz3r4g58h2p0kiycggm9xs2";
patch_src = fetchurl {
url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz";
sha256 = "1gwpm9kb57dknicy9j4mf8g9q5zz4ikhbznlk32jhw2b3l0mn446";
sha256 = "1sf27a5gvwvcm4wsf2pyq87d3g4l2fym8cirq9sli54bi753ikbh";
};
whenPatched = stdenv.lib.optionalString apngSupport;

10
pkgs/development/libraries/libvdpau/default.nix
View File

@@ -1,22 +1,24 @@
{ stdenv, fetchurl, pkgconfig, xorg }:
stdenv.mkDerivation rec {
name = "libvdpau-0.8";
name = "libvdpau-0.9";
src = fetchurl {
url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz";
sha256 = "1v81875hppablq9gpsmvhnyl7z80zihx6arry758pvdbq4fd39vk";
sha256 = "0vhfkjqghfva3zjif04w7pdp84g08c8xnwir3ah4b99m10a5fag3";
};
buildInputs = with xorg; [ pkgconfig dri2proto libXext ];
propagatedBuildInputs = [ xorg.libX11 ];
configureFlags = stdenv.lib.optional stdenv.isDarwin [ "--build=x86_64" ];
configureFlags = stdenv.lib.optional stdenv.isDarwin "--build=x86_64";
meta = with stdenv.lib; {
homepage = http://people.freedesktop.org/~aplattner/vdpau/;
description = "Library to use the Video Decode and Presentation API for Unix (VDPAU)";
license = licenses.mit;
license = licenses.mit; # expat version
platforms = platforms.unix;
maintainers = [ maintainers.vcunat ];
};
}