summary refs log tree commit diff
path: root/pkgs/development/libraries/libvpx
diff options
context:
space:
mode:
authortaku0 <mxxouy6x3m_github@tatapa.org>2016-05-01 23:26:00 +0900
committerFranz Pletz <fpletz@fnordicwalking.de>2016-05-17 01:00:13 +0200
commit67cb0eaae3eccefbead7cbaf6e72275d947c072a (patch)
treec43c7aecb1d99c9d28acaa43780893e70b84ec54 /pkgs/development/libraries/libvpx
parent806ce6323e065341a241d12eb01228d1aae25f43 (diff)
downloadnixpkgs-67cb0eaae3eccefbead7cbaf6e72275d947c072a.tar
nixpkgs-67cb0eaae3eccefbead7cbaf6e72275d947c072a.tar.gz
nixpkgs-67cb0eaae3eccefbead7cbaf6e72275d947c072a.tar.bz2
nixpkgs-67cb0eaae3eccefbead7cbaf6e72275d947c072a.tar.lz
nixpkgs-67cb0eaae3eccefbead7cbaf6e72275d947c072a.tar.xz
nixpkgs-67cb0eaae3eccefbead7cbaf6e72275d947c072a.tar.zst
nixpkgs-67cb0eaae3eccefbead7cbaf6e72275d947c072a.zip
libvpx: 1.4.0 -> 1.5.0
Closes #15136.
Diffstat (limited to 'pkgs/development/libraries/libvpx')
-rw-r--r--pkgs/development/libraries/libvpx/default.nix9
1 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index 5c593dd1f75..278679698c6 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -13,12 +13,10 @@
 , runtimeCpuDetectSupport ? true # detect cpu capabilities at runtime
 , thumbSupport ? false # build arm assembly in thumb mode
 , 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
 , postprocSupport ? true # postprocessing
 , multithreadSupport ? true # multithreaded decoding & encoding
 , internalStatsSupport ? false # output of encoder internal stats for debug, if supported (encoders)
-, memTrackerSupport ? false # track memory usage
 , spatialResamplingSupport ? true # spatial sampling (scaling)
 , realtimeOnlySupport ? false # build for 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 {
   name = "libvpx-${version}";
-  version = "1.4.0";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "webmproject";
     repo = "libvpx";
     rev = "v${version}";
-    sha256 = "1y8cf2q5ij8z8ab5j36m18rbs62aah6sw6shzbs3jr70ja0z6n8s";
+    sha256 = "19ill4c7dak5f8m4pdbas87zknw3a34sca8a4i952q0l0jnif0np";
   };
 
   patchPhase = ''patchShebangs .'';
@@ -103,7 +101,6 @@ stdenv.mkDerivation rec {
     "--as=yasm"
     # Limit default decoder max to WHXGA
     (if sizeLimitSupport then "--size-limit=5120x3200" else null)
-    (enableFeature fastUnalignedSupport "fast-unaligned")
     "--disable-codec-srcs"
     (enableFeature debugLibsSupport "debug-libs")
     (enableFeature isMips "dequant-tokens")
@@ -112,7 +109,6 @@ stdenv.mkDerivation rec {
     (enableFeature (postprocSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-postproc")
     (enableFeature multithreadSupport "multithread")
     (enableFeature internalStatsSupport "internal-stats")
-    (enableFeature memTrackerSupport "mem-tracker")
     (enableFeature spatialResamplingSupport "spatial-resampling")
     (enableFeature realtimeOnlySupport "realtime-only")
     (enableFeature ontheflyBitpackingSupport "onthefly-bitpacking")
@@ -158,6 +154,7 @@ stdenv.mkDerivation rec {
     dontSetConfigureCross = true;
     configureFlags = configureFlags ++ [
       #"--extra-cflags="
+      #"--extra-cxxflags="
       #"--prefix="
       #"--libc="
       #"--libdir="