[SCM] libopenshot/master: Add new patch to really fix the FTBFS on arm64.

[toddy at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit cc0b1c648a2c544931417b340aec895e00e1b41c
Author: Dr. Tobias Quathamer <toddy at debian.org>
Date:   Sat Nov 18 14:50:16 2017 +0100

    Add new patch to really fix the FTBFS on arm64.
    
    Closes: #879074

diff --git a/debian/patches/0004-Add-some-more-fault-tolerance-for-arm64.patch b/debian/patches/0004-Add-some-more-fault-tolerance-for-arm64.patch
new file mode 100644
index 0000000..43b0e7d
--- /dev/null
+++ b/debian/patches/0004-Add-some-more-fault-tolerance-for-arm64.patch
@@ -0,0 +1,72 @@
+From: "Dr. Tobias Quathamer" <toddy at debian.org>
+Date: Sat, 18 Nov 2017 14:49:53 +0100
+Subject: Add some more fault tolerance for arm64
+
+---
+ tests/FFmpegReader_Tests.cpp |  4 ++--
+ tests/Timeline_Tests.cpp     | 10 +++++-----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/tests/FFmpegReader_Tests.cpp b/tests/FFmpegReader_Tests.cpp
+index b6bce05..d4e8111 100644
+--- a/tests/FFmpegReader_Tests.cpp
++++ b/tests/FFmpegReader_Tests.cpp
+@@ -109,8 +109,8 @@ TEST(FFmpegReader_Check_Video_File)
+ 
+ 	// Check image properties on scanline 10, pixel 112
+ 	CHECK_EQUAL(0, (int)pixels[pixel_index]);
+-	CHECK_EQUAL(96, (int)pixels[pixel_index + 1]);
+-	CHECK_EQUAL(188, (int)pixels[pixel_index + 2]);
++	CHECK_CLOSE(96, (int)pixels[pixel_index + 1], 1);
++	CHECK_CLOSE(188, (int)pixels[pixel_index + 2], 1);
+ 	CHECK_EQUAL(255, (int)pixels[pixel_index + 3]);
+ 
+ 	// Close reader
+diff --git a/tests/Timeline_Tests.cpp b/tests/Timeline_Tests.cpp
+index 76195e8..4d861a6 100644
+--- a/tests/Timeline_Tests.cpp
++++ b/tests/Timeline_Tests.cpp
+@@ -130,14 +130,14 @@ TEST(Timeline_Check_Two_Track_Video)
+ 	// Check image properties
+ 	CHECK_CLOSE(176, (int)f->GetPixels(pixel_row)[pixel_index], 1);
+ 	CHECK_EQUAL(0, (int)f->GetPixels(pixel_row)[pixel_index + 1]);
+-	CHECK_EQUAL(186, (int)f->GetPixels(pixel_row)[pixel_index + 2]);
++	CHECK_CLOSE(186, (int)f->GetPixels(pixel_row)[pixel_index + 2], 1);
+ 	CHECK_EQUAL(255, (int)f->GetPixels(pixel_row)[pixel_index + 3]);
+ 
+ 	// Get frame
+ 	f = t.GetFrame(3);
+ 
+ 	// Check image properties
+-	CHECK_EQUAL(23, (int)f->GetPixels(pixel_row)[pixel_index]);
++	CHECK_CLOSE(23, (int)f->GetPixels(pixel_row)[pixel_index], 1);
+ 	CHECK_CLOSE(190, (int)f->GetPixels(pixel_row)[pixel_index + 1], 2);
+ 	CHECK_EQUAL(0, (int)f->GetPixels(pixel_row)[pixel_index + 2]);
+ 	CHECK_EQUAL(255, (int)f->GetPixels(pixel_row)[pixel_index + 3]);
+@@ -146,7 +146,7 @@ TEST(Timeline_Check_Two_Track_Video)
+ 	f = t.GetFrame(24);
+ 
+ 	// Check image properties
+-	CHECK_EQUAL(186, (int)f->GetPixels(pixel_row)[pixel_index]);
++	CHECK_CLOSE(186, (int)f->GetPixels(pixel_row)[pixel_index], 1);
+ 	CHECK_CLOSE(106, (int)f->GetPixels(pixel_row)[pixel_index + 1], 1);
+ 	CHECK_EQUAL(0, (int)f->GetPixels(pixel_row)[pixel_index + 2]);
+ 	CHECK_EQUAL(255, (int)f->GetPixels(pixel_row)[pixel_index + 3]);
+@@ -155,7 +155,7 @@ TEST(Timeline_Check_Two_Track_Video)
+ 	f = t.GetFrame(5);
+ 
+ 	// Check image properties
+-	CHECK_EQUAL(23, (int)f->GetPixels(pixel_row)[pixel_index]);
++	CHECK_CLOSE(23, (int)f->GetPixels(pixel_row)[pixel_index], 1);
+ 	CHECK_CLOSE(190, (int)f->GetPixels(pixel_row)[pixel_index + 1], 2);
+ 	CHECK_EQUAL(0, (int)f->GetPixels(pixel_row)[pixel_index + 2]);
+ 	CHECK_EQUAL(255, (int)f->GetPixels(pixel_row)[pixel_index + 3]);
+@@ -175,7 +175,7 @@ TEST(Timeline_Check_Two_Track_Video)
+ 	// Check image properties
+ 	CHECK_CLOSE(176, (int)f->GetPixels(pixel_row)[pixel_index], 1);
+ 	CHECK_EQUAL(0, (int)f->GetPixels(pixel_row)[pixel_index + 1]);
+-	CHECK_EQUAL(186, (int)f->GetPixels(pixel_row)[pixel_index + 2]);
++	CHECK_CLOSE(186, (int)f->GetPixels(pixel_row)[pixel_index + 2], 1);
+ 	CHECK_EQUAL(255, (int)f->GetPixels(pixel_row)[pixel_index + 3]);
+ 
+ 	// Close reader
diff --git a/debian/patches/series b/debian/patches/series
index 397eea4..17ba1d4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 Use-system-libjsoncpp.patch
 Disable-failing-tests.patch
 0003-Fix-failing-tests-by-using-a-fault-tolerance.patch
+0004-Add-some-more-fault-tolerance-for-arm64.patch

-- 
libopenshot packaging