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

libav-11: maintenance 11.8 -> 11.9

Browse Source 
The patch doesn't apply anymore and changelog suggests it's not needed.
This commit is contained in:
Vladimír Čunát 2017-04-18 18:50:40 +02:00
parent ec55f8dcaa
commit 5576ef9f1d
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,7 @@ let inherit (stdenv.lib) optional optionals hasPrefix; in
let
result = {
libav_0_8 = libavFun "0.8.20" "0c7a2417c3a01eb74072691bb93ce802ae1be08f";
libav_11 = libavFun "11.8" "d0e93f6b229ae46c49d13ec183b13cfee70a51f0";
libav_11 = libavFun "11.9" "36ed1329099676ff3c970576e03c6a21f2da2e15";
libav_12 = libavFun "12" "4ecde7274621c82a6882b7614d907b28de25cc4e";
};
@ -41,7 +41,7 @@ let
patches = []
++ optional (vpxSupport && hasPrefix "0.8." version) ./vpxenc-0.8.17-libvpx-1.5.patch
++ optional (vpxSupport && hasPrefix "11." version) ./vpxenc-11.6-libvpx-1.5.patch;
;
preConfigure = "patchShebangs doc/texi2pod.pl";

22
pkgs/development/libraries/libav/vpxenc-11.6-libvpx-1.5.patch
View File

@ -1,22 +0,0 @@
--- 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",