libvpx: 1.4.0 -> 1.5.0

Closes #15136.
This commit is contained in:
taku0 2016-05-01 23:26:00 +09:00 committed by Franz Pletz
parent 806ce6323e
commit 67cb0eaae3
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4

View File

@ -13,12 +13,10 @@
, runtimeCpuDetectSupport ? true # detect cpu capabilities at runtime , runtimeCpuDetectSupport ? true # detect cpu capabilities at runtime
, thumbSupport ? false # build arm assembly in thumb mode , thumbSupport ? false # build arm assembly in thumb mode
, examplesSupport ? true # build examples (vpxdec & vpxenc are part of examples) , examplesSupport ? true # build examples (vpxdec & vpxenc are part of examples)
, fastUnalignedSupport ? true # use unaligned accesses if supported by hardware
, debugLibsSupport ? false # include debug version of each library , debugLibsSupport ? false # include debug version of each library
, postprocSupport ? true # postprocessing , postprocSupport ? true # postprocessing
, multithreadSupport ? true # multithreaded decoding & encoding , multithreadSupport ? true # multithreaded decoding & encoding
, internalStatsSupport ? false # output of encoder internal stats for debug, if supported (encoders) , internalStatsSupport ? false # output of encoder internal stats for debug, if supported (encoders)
, memTrackerSupport ? false # track memory usage
, spatialResamplingSupport ? true # spatial sampling (scaling) , spatialResamplingSupport ? true # spatial sampling (scaling)
, realtimeOnlySupport ? false # build for real-time encoding , realtimeOnlySupport ? false # build for real-time encoding
, ontheflyBitpackingSupport ? false # on-the-fly bitpacking in real-time encoding , ontheflyBitpackingSupport ? false # on-the-fly bitpacking in real-time encoding
@ -61,13 +59,13 @@ assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libvpx-${version}"; name = "libvpx-${version}";
version = "1.4.0"; version = "1.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "webmproject"; owner = "webmproject";
repo = "libvpx"; repo = "libvpx";
rev = "v${version}"; rev = "v${version}";
sha256 = "1y8cf2q5ij8z8ab5j36m18rbs62aah6sw6shzbs3jr70ja0z6n8s"; sha256 = "19ill4c7dak5f8m4pdbas87zknw3a34sca8a4i952q0l0jnif0np";
}; };
patchPhase = ''patchShebangs .''; patchPhase = ''patchShebangs .'';
@ -103,7 +101,6 @@ stdenv.mkDerivation rec {
"--as=yasm" "--as=yasm"
# Limit default decoder max to WHXGA # Limit default decoder max to WHXGA
(if sizeLimitSupport then "--size-limit=5120x3200" else null) (if sizeLimitSupport then "--size-limit=5120x3200" else null)
(enableFeature fastUnalignedSupport "fast-unaligned")
"--disable-codec-srcs" "--disable-codec-srcs"
(enableFeature debugLibsSupport "debug-libs") (enableFeature debugLibsSupport "debug-libs")
(enableFeature isMips "dequant-tokens") (enableFeature isMips "dequant-tokens")
@ -112,7 +109,6 @@ stdenv.mkDerivation rec {
(enableFeature (postprocSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-postproc") (enableFeature (postprocSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-postproc")
(enableFeature multithreadSupport "multithread") (enableFeature multithreadSupport "multithread")
(enableFeature internalStatsSupport "internal-stats") (enableFeature internalStatsSupport "internal-stats")
(enableFeature memTrackerSupport "mem-tracker")
(enableFeature spatialResamplingSupport "spatial-resampling") (enableFeature spatialResamplingSupport "spatial-resampling")
(enableFeature realtimeOnlySupport "realtime-only") (enableFeature realtimeOnlySupport "realtime-only")
(enableFeature ontheflyBitpackingSupport "onthefly-bitpacking") (enableFeature ontheflyBitpackingSupport "onthefly-bitpacking")
@ -158,6 +154,7 @@ stdenv.mkDerivation rec {
dontSetConfigureCross = true; dontSetConfigureCross = true;
configureFlags = configureFlags ++ [ configureFlags = configureFlags ++ [
#"--extra-cflags=" #"--extra-cflags="
#"--extra-cxxflags="
#"--prefix=" #"--prefix="
#"--libc=" #"--libc="
#"--libdir=" #"--libdir="