diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-05-17 00:58:15 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-05-17 01:02:30 +0200 |
| commit | 28e051f06662204527c7a23e01bafa7868087efb (patch) | |
| tree | 203d52889a673230e24600d5090f0938f6ed266f /pkgs | |
| parent | fd294521e6d77bf0ec2010368e8d1720060ff0db (diff) | |
| download | nixlib-28e051f06662204527c7a23e01bafa7868087efb.tar nixlib-28e051f06662204527c7a23e01bafa7868087efb.tar.gz nixlib-28e051f06662204527c7a23e01bafa7868087efb.tar.bz2 nixlib-28e051f06662204527c7a23e01bafa7868087efb.tar.lz nixlib-28e051f06662204527c7a23e01bafa7868087efb.tar.xz nixlib-28e051f06662204527c7a23e01bafa7868087efb.tar.zst nixlib-28e051f06662204527c7a23e01bafa7868087efb.zip | |
ffmpeg: add patches for libvpx 1.5
ffmpeg bug report: https://trac.ffmpeg.org/ticket/4956 ffmepg fix commit: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab
Diffstat (limited to 'pkgs')
5 files changed, 53 insertions, 2 deletions
diff --git a/pkgs/development/libraries/ffmpeg/0.10.nix b/pkgs/development/libraries/ffmpeg/0.10.nix index b008151d6cb7..4eebad6b307d 100644 --- a/pkgs/development/libraries/ffmpeg/0.10.nix +++ b/pkgs/development/libraries/ffmpeg/0.10.nix @@ -4,4 +4,5 @@ callPackage ./generic.nix (args // rec { version = "${branch}.16"; branch = "0.10"; sha256 = "1l9z5yfp1vq4z2y4mh91707dhcn41c3pd505i0gvdzcdsp5j6y77"; + patches = [ ./vpxenc-0.10-libvpx-1.5.patch ]; }) diff --git a/pkgs/development/libraries/ffmpeg/1.2.nix b/pkgs/development/libraries/ffmpeg/1.2.nix index c87cf581c76c..312eb70fdf20 100644 --- a/pkgs/development/libraries/ffmpeg/1.2.nix +++ b/pkgs/development/libraries/ffmpeg/1.2.nix @@ -4,4 +4,5 @@ callPackage ./generic.nix (args // rec { version = "${branch}.12"; branch = "1.2"; sha256 = "0za9w87rk4x6wkjc6iaxqx2ihlsgj181ilfgxfjc54mdgxfcjfli"; + patches = [ ./vpxenc-1.2-libvpx-1.5.patch ]; }) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index d50c20331e4a..0c4e9df3df19 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -15,7 +15,7 @@ # Darwin frameworks , Cocoa # Inherit generics -, branch, sha256, version, ... +, branch, sha256, version, patches ? [], ... }: /* Maintainer notes: @@ -69,7 +69,8 @@ stdenv.mkDerivation rec { inherit sha256; }; - patchPhase = ''patchShebangs .''; + postPatch = ''patchShebangs .''; + inherit patches; outputs = [ "dev" "out" "bin" ] ++ optional (reqMin "1.0") "doc" ; # just dev-doc diff --git a/pkgs/development/libraries/ffmpeg/vpxenc-0.10-libvpx-1.5.patch b/pkgs/development/libraries/ffmpeg/vpxenc-0.10-libvpx-1.5.patch new file mode 100644 index 000000000000..740bb746aade --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/vpxenc-0.10-libvpx-1.5.patch @@ -0,0 +1,24 @@ +diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c +index 1d33ce9..dface51 100644 +--- a/libavcodec/libvpxenc.c ++++ b/libavcodec/libvpxenc.c +@@ -78,19 +78,11 @@ typedef struct VP8EncoderContext { + + /** String mappings for enum vp8e_enc_control_id */ + static const char *ctlidstr[] = { +- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY", +- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE", +- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE", +- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP", +- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP", +- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE", + [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED", + [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF", + [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY", +- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS", + [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD", + [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS", +- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER", + [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES", + [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH", + [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE", diff --git a/pkgs/development/libraries/ffmpeg/vpxenc-1.2-libvpx-1.5.patch b/pkgs/development/libraries/ffmpeg/vpxenc-1.2-libvpx-1.5.patch new file mode 100644 index 000000000000..7f1ec1df6c76 --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/vpxenc-1.2-libvpx-1.5.patch @@ -0,0 +1,24 @@ +diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c +index 4f1adb8..1791952 100644 +--- a/libavcodec/libvpxenc.c ++++ b/libavcodec/libvpxenc.c +@@ -87,19 +87,11 @@ typedef struct VP8EncoderContext { + + /** String mappings for enum vp8e_enc_control_id */ + static const char *const ctlidstr[] = { +- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY", +- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE", +- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE", +- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP", +- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP", +- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE", + [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED", + [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF", + [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY", +- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS", + [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD", + [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS", +- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER", + [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES", + [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH", + [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE", |