From ff5399ccf03c138f9c9e19fdf08fdc63b9ab8d65 Mon Sep 17 00:00:00 2001
From: Simone Caronni <negativo17@gmail.com>
Date: Tue, 11 Apr 2017 09:00:05 +0200
Subject: [PATCH] Update to latest snapshots

---
 .gitignore |  1 +
 daala.spec | 62 ++++++++++++++++++++++++++++++++----------------------
 sources    |  2 +-
 3 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index 319998f..6e177d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /daala-4eddbab.tar.gz
 /daala-28de40b.tar.gz
+/daala-ee07b32.tar.gz
diff --git a/daala.spec b/daala.spec
index cd73ff6..a53b23b 100644
--- a/daala.spec
+++ b/daala.spec
@@ -1,10 +1,10 @@
-%global commit0 28de40bfcd84e7df3fbd64de7b89dd7fd889bb27
-%global date 20161216
+%global commit0 ee07b323a4d44cee6a068c93e49b75d7bcd28785
+%global date 20170324
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 Name:       daala
 Version:    0
-Release:    4%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist}
+Release:    5%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist}
 Summary:    Daala video compression
 License:    BSD
 URL:        http://xiph.org/daala/
@@ -61,9 +61,11 @@ testing %{name} support in your applications.
 %build
 autoreconf -vif
 %configure \
+    --disable-silent-rules \
     --disable-static \
     --enable-analyzer \
-    --enable-float-pvq
+    --enable-float-pvq \
+    --enable-tools
 
 %make_build
 %make_build tools
@@ -75,35 +77,35 @@ find %{buildroot} -name "*.la" -delete
 # Install tools (list from tools_TARGETS in Makefile.am)
 mkdir -p %{buildroot}%{_bindir}
 install -m 755 -p \
-    tools/png2y4m \
-    tools/y4m2png \
-    tools/dump_psnrhvs \
+    tools/bjontegaard \
     tools/block_size_analysis \
-    tools/to_monochrome \
-    tools/downsample \
-    tools/upsample \
-    tools/divu_const \
-    tools/trans \
-    tools/trans2d \
-    tools/trans_gain \
-    tools/gen_cdf \
-    tools/gen_sqrt_tbl \
     tools/compute_basis \
     tools/compute_haar_basis \
     tools/cos_search \
-    tools/gen_laplace_tables \
-    tools/daalainfo \
-    tools/dump_ssim \
+    tools/divu_const \
+    tools/downsample \
+    tools/draw_zigzags \
     tools/dump_fastssim \
-    tools/bjontegaard \
-    tools/yuvjpeg \
-    tools/jpegyuv \
-    tools/yuv2yuv4mpeg \
+    tools/dump_msssim \
     tools/dump_psnr \
+    tools/dump_psnrhvs \
+    tools/dump_ssim \
+    tools/gen_cdf \
+    tools/gen_laplace_tables \
+    tools/gen_sqrt_tbl \
+    tools/jpegyuv \
+    tools/.libs/daalainfo \
+    tools/png2y4m \
+    tools/to_monochrome \
+    tools/trans \
+    tools/trans2d \
+    tools/trans_gain \
+    tools/upsample \
     tools/vq_train \
-    tools/draw_zigzags \
-    tools/dump_msssim \
+    tools/y4m2png \
     tools/y4m2yuv \
+    tools/yuv2yuv4mpeg \
+    tools/yuvjpeg \
     %{buildroot}%{_bindir}/
 
 # Let rpm pick up the docs in the files section
@@ -114,6 +116,10 @@ mkdir -p %{buildroot}/%{_mandir}
 cp -fr doc/man/man3/ %{buildroot}/%{_mandir}
 rm -f %{buildroot}/%{_mandir}/man3/_*_include_daala_.3
 
+%check
+# Tests are incredibly long, disable for now
+#make V=0 check
+
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
@@ -134,6 +140,12 @@ rm -f %{buildroot}/%{_mandir}/man3/_*_include_daala_.3
 %{_bindir}/*
 
 %changelog
+* Thu Mar 30 2017 Simone Caronni <negativo17@gmail.com> - 0-5.20170324gitee07b32
+- Update to latest snapshot.
+- Make build verbose.
+- Add tests, disable them for now as they are incredibly long (30 minutes).
+- Fix daalainfo.
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0-4.20161216git28de40b
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
diff --git a/sources b/sources
index 9971560..a72a5bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (daala-28de40b.tar.gz) = 575366f37d12e4146a1bac649aee4f70a19d375a84fe1a7343ec367fb553e2a34746a3c208a87201f9cb5da995b7ea6afeb256df5efd568af0be88160fdfe1c7
+SHA512 (daala-ee07b32.tar.gz) = 51ef20e17c9fb24199489815fa440ebcce6d7724815f9c38cc8001301e81c42b95f5b0b697f831a0877a5d3198a4fdaaf0756510f0d04ed527ebac791f86bb0f