[SCM] libopenshot/master: Refresh patches

toddy at users.alioth.debian.org toddy at users.alioth.debian.org
Mon Sep 25 12:55:16 UTC 2017


The following commit has been merged in the master branch:
commit 97710ec5180ef39b0c8a2782b06daf129e9e9498
Author: Dr. Tobias Quathamer <toddy at debian.org>
Date:   Mon Sep 25 14:47:59 2017 +0200

    Refresh patches

diff --git a/debian/patches/Disable-failing-tests.patch b/debian/patches/Disable-failing-tests.patch
index 1dbf60a..706e15b 100644
--- a/debian/patches/Disable-failing-tests.patch
+++ b/debian/patches/Disable-failing-tests.patch
@@ -8,7 +8,7 @@ https://github.com/OpenShot/libopenshot/issues/43
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/tests/FFmpegWriter_Tests.cpp b/tests/FFmpegWriter_Tests.cpp
-index 99cee7b..3480fb7 100644
+index 73357f2..bca786f 100644
 --- a/tests/FFmpegWriter_Tests.cpp
 +++ b/tests/FFmpegWriter_Tests.cpp
 @@ -73,8 +73,8 @@ TEST(FFmpegWriter_Test_Webm)
diff --git a/debian/patches/Use-system-libjsoncpp.patch b/debian/patches/Use-system-libjsoncpp.patch
index 4bf8c3b..0cbab5b 100644
--- a/debian/patches/Use-system-libjsoncpp.patch
+++ b/debian/patches/Use-system-libjsoncpp.patch
@@ -7,7 +7,7 @@ Subject: Use system libjsoncpp
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 29fbe45..5d8b101 100644
+index 431987b..c477cf3 100644
 --- a/tests/CMakeLists.txt
 +++ b/tests/CMakeLists.txt
 @@ -152,7 +152,13 @@ include_directories(${ZMQ_INCLUDE_DIRS})

-- 
libopenshot packaging



More information about the pkg-multimedia-commits mailing list