commit: d97b4ecd2291523baf3caeb93d0b0f884a074031 Author: Ninpo <ninpo <AT> qap <DOT> la> AuthorDate: Sun Jul 9 11:24:26 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jul 9 22:20:56 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d97b4ecd
media-libs/libopenshot: Two test fixes * Fix parallel test issues by renaming the output files to avoid clobbering (reported upstream at https://github.com/OpenShot/libopenshot/issues/933) * Skip flaky test (reported upstream at https://github.com/OpenShot/libopenshot/issues/934) Closes: https://bugs.gentoo.org/909759 Signed-off-by: Ninpo <ninpo <AT> qap.la> Closes: https://github.com/gentoo/gentoo/pull/31810 Signed-off-by: Sam James <sam <AT> gentoo.org> ...ibopenshot-0.3.2-fix-test-file-collisions.patch | 89 ++++++++++++++++++++++ media-libs/libopenshot/libopenshot-0.3.2-r1.ebuild | 6 +- 2 files changed, 94 insertions(+), 1 deletion(-) diff --git a/media-libs/libopenshot/files/libopenshot-0.3.2-fix-test-file-collisions.patch b/media-libs/libopenshot/files/libopenshot-0.3.2-fix-test-file-collisions.patch new file mode 100644 index 000000000000..38bb96c5e048 --- /dev/null +++ b/media-libs/libopenshot/files/libopenshot-0.3.2-fix-test-file-collisions.patch @@ -0,0 +1,89 @@ +Fixes test file collisions with high concurrency builds +Fix by Ninpo <[email protected]> +https://bugs.gentoo.org/909759, https://github.com/OpenShot/libopenshot/issues/933 + +--- a/tests/FFmpegWriter.cpp ++++ b/tests/FFmpegWriter.cpp +@@ -34,7 +34,7 @@ TEST_CASE( "Webm", "[libopenshot][ffmpegwriter]" ) + r.Open(); + + /* WRITER ---------------- */ +- FFmpegWriter w("output1.webm"); ++ FFmpegWriter w("Webm-output1.webm"); + + // Set options + w.SetAudioOptions(true, "libvorbis", 44100, 2, LAYOUT_STEREO, 188000); +@@ -50,7 +50,7 @@ TEST_CASE( "Webm", "[libopenshot][ffmpegwriter]" ) + w.Close(); + r.Close(); + +- FFmpegReader r1("output1.webm"); ++ FFmpegReader r1("Webm-output1.webm"); + r1.Open(); + + // Verify various settings on new MP4 +@@ -81,7 +81,7 @@ TEST_CASE( "Options_Overloads", "[libopenshot][ffmpegwriter]" ) + r.Open(); + + /* WRITER ---------------- */ +- FFmpegWriter w("output1.mp4"); ++ FFmpegWriter w("Options_Overloads-output1.mp4"); + + // Set options + w.SetAudioOptions("aac", 48000, 192000); +@@ -97,7 +97,7 @@ TEST_CASE( "Options_Overloads", "[libopenshot][ffmpegwriter]" ) + w.Close(); + r.Close(); + +- FFmpegReader r1("output1.mp4"); ++ FFmpegReader r1("Options_Overloads-output1.mp4"); + r1.Open(); + + // Verify implied settings +@@ -123,7 +123,7 @@ TEST_CASE( "DisplayInfo", "[libopenshot][ffmpegwriter]" ) + r.Open(); + + /* WRITER ---------------- */ +- FFmpegWriter w("output1.webm"); ++ FFmpegWriter w("DisplayInfo-output1.webm"); + + // Set options + w.SetAudioOptions(true, "libvorbis", 44100, 2, LAYOUT_STEREO, 188000); +@@ -203,7 +203,7 @@ TEST_CASE( "Gif", "[libopenshot][ffmpegwriter]" ) + t.Open(); + + /* WRITER ---------------- */ +- FFmpegWriter w("output1.gif"); ++ FFmpegWriter w("Gif-output1.gif"); + + // Set options (no audio options are set) + w.SetVideoOptions(true, "gif", Fraction(24,1), 1280, 720, Fraction(1,1), false, false, 15000000); +@@ -221,7 +221,7 @@ TEST_CASE( "Gif", "[libopenshot][ffmpegwriter]" ) + w.Close(); + t.Close(); + +- FFmpegReader r1("output1.gif"); ++ FFmpegReader r1("Gif-output1.gif"); + r1.Open(); + + // Verify various settings on new Gif +--- a/tests/ImageWriter.cpp ++++ b/tests/ImageWriter.cpp +@@ -64,7 +64,7 @@ TEST_CASE( "Gif", "[libopenshot][imagewriter]" ) + r.Open(); + + /* WRITER ---------------- */ +- ImageWriter w("output1.gif"); ++ ImageWriter w("ImageWriter-Gif-output1.gif"); + + CHECK_FALSE(w.IsOpen()); + +@@ -87,7 +87,7 @@ TEST_CASE( "Gif", "[libopenshot][imagewriter]" ) + r.Close(); + + // Open up the 5th frame from the newly created GIF +- ImageReader r1("output1.gif[4]"); ++ ImageReader r1("ImageWriter-Gif-output1.gif[4]"); + + // Basic Reader state queries + CHECK(r1.Name() == "ImageReader"); diff --git a/media-libs/libopenshot/libopenshot-0.3.2-r1.ebuild b/media-libs/libopenshot/libopenshot-0.3.2-r1.ebuild index f15646eaddd7..392a75b44969 100644 --- a/media-libs/libopenshot/libopenshot-0.3.2-r1.ebuild +++ b/media-libs/libopenshot/libopenshot-0.3.2-r1.ebuild @@ -41,6 +41,10 @@ BDEPEND="doc? ( app-doc/doxygen ) dev-libs/unittest++ )" +PATCHES=( + "${FILESDIR}"/libopenshot-0.3.2-fix-test-file-collisions.patch +) + pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp } @@ -86,7 +90,7 @@ src_compile() { src_test() { # https://github.com/OpenShot/libopenshot/issues/922 exclude broken test - virtx cmake_src_test -E '(Caption:caption effect)' || die + virtx cmake_src_test -E '(Caption:caption effect|Timeline:Multi-threaded Timeline GetFrame)' || die } src_install() {
