diff options
| author | Christian Albrecht <christian.albrecht@mayflower.de> | 2016-05-01 18:22:40 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-05-17 01:01:55 +0200 |
| commit | fd294521e6d77bf0ec2010368e8d1720060ff0db (patch) | |
| tree | 269c008648cbe434a250dabf844fd4e7ebb88c7d /pkgs | |
| parent | 67cb0eaae3eccefbead7cbaf6e72275d947c072a (diff) | |
| download | nixlib-fd294521e6d77bf0ec2010368e8d1720060ff0db.tar nixlib-fd294521e6d77bf0ec2010368e8d1720060ff0db.tar.gz nixlib-fd294521e6d77bf0ec2010368e8d1720060ff0db.tar.bz2 nixlib-fd294521e6d77bf0ec2010368e8d1720060ff0db.tar.lz nixlib-fd294521e6d77bf0ec2010368e8d1720060ff0db.tar.xz nixlib-fd294521e6d77bf0ec2010368e8d1720060ff0db.tar.zst nixlib-fd294521e6d77bf0ec2010368e8d1720060ff0db.zip | |
libav: 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')
3 files changed, 48 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index b84b852691fd..ef09b9e4b40b 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -38,6 +38,10 @@ let inherit sha1; # upstream directly provides sha1 of releases over https }; + patches = [] + ++ optionals (vpxSupport && version == "0.8.17" ) [ ./vpxenc-0.8.17-libvpx-1.5.patch ] + ++ optionals (vpxSupport && version == "11.6") [ ./vpxenc-11.6-libvpx-1.5.patch ]; + preConfigure = "patchShebangs doc/texi2pod.pl"; configureFlags = diff --git a/pkgs/development/libraries/libav/vpxenc-0.8.17-libvpx-1.5.patch b/pkgs/development/libraries/libav/vpxenc-0.8.17-libvpx-1.5.patch new file mode 100644 index 000000000000..456828c025ef --- /dev/null +++ b/pkgs/development/libraries/libav/vpxenc-0.8.17-libvpx-1.5.patch @@ -0,0 +1,22 @@ +--- a/libavcodec/libvpxenc.c 2016-05-01 17:57:16.753852614 +0200 ++++ b/libavcodec/libvpxenc.c 2016-05-01 18:01:08.252147138 +0200 +@@ -67,19 +67,11 @@ + + /** 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/libav/vpxenc-11.6-libvpx-1.5.patch b/pkgs/development/libraries/libav/vpxenc-11.6-libvpx-1.5.patch new file mode 100644 index 000000000000..f3c52582b44e --- /dev/null +++ b/pkgs/development/libraries/libav/vpxenc-11.6-libvpx-1.5.patch @@ -0,0 +1,22 @@ +--- a/libavcodec/libvpxenc.c 2016-05-01 17:53:17.974517377 +0200 ++++ b/libavcodec/libvpxenc.c 2016-05-01 17:54:30.564923297 +0200 +@@ -70,19 +70,11 @@ + + /** 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", |