From 9e8f96c1b33dc01bc5dfbed0cfb2702bb299f1e0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 10 Jul 2023 04:26:23 +0100 Subject: gentoo auto-resync : 10:07:2023 - 04:26:23 --- media-libs/libopenshot/Manifest | 3 +- ...ibopenshot-0.3.2-fix-test-file-collisions.patch | 89 ++++++++++++++++++++++ media-libs/libopenshot/libopenshot-0.3.2-r1.ebuild | 6 +- 3 files changed, 96 insertions(+), 2 deletions(-) create mode 100644 media-libs/libopenshot/files/libopenshot-0.3.2-fix-test-file-collisions.patch (limited to 'media-libs/libopenshot') diff --git a/media-libs/libopenshot/Manifest b/media-libs/libopenshot/Manifest index a2d5d91c1e06..ba3f1ad3c2b0 100644 --- a/media-libs/libopenshot/Manifest +++ b/media-libs/libopenshot/Manifest @@ -1,5 +1,6 @@ +AUX libopenshot-0.3.2-fix-test-file-collisions.patch 2711 BLAKE2B 3712f9093389b16bbacb45aaf6dbadc9382f4694a69c1e6655391000a9a5b342ed873e6cf63760eb1102c3b38bc69de3d3dfc75e611a1ff97e94ed0dc0c0f245 SHA512 85c37d74c75f1db5e6a8a1d98422f044cf88a474322f2e48eac9a90bf18861be094f9c14a22aec188da065e9a1333073f1b82ae182d8942c5b9a3b119e4cc5f4 DIST libopenshot-0.2.7.tar.gz 22472544 BLAKE2B 511ed214f0ecc43294a787e1c0119f036e274a1e8d051cb6e926bf7a9b5cea416325a2e051fca758d1f80ec2b9d746a4dd268e5ac5322fe8539fa2041a8c4d9d SHA512 71cb0e4010d8f3ff453486c3da3c7019c6569066845dcc58f438049a08b1c8663f31c29a728ce5461e9d3a1ca550038b757d4528e62a26eeb45ecbe600353988 DIST libopenshot-0.3.2.tar.gz 26132237 BLAKE2B 5bc371481ddf69b5de909963cb83d1128066280e1259ae8b23f7ef5450f3da00ef1137dcefe2978e10d1a51931529f104aebdf0601be4b066c7ed371ea43439e SHA512 8891077af28a4db6bc3a7cd078ce5570a8f62e0795c13b0fff795eba60c3e977ece70247033ee4017c9785592355b7421655246a5d6807a5790bd18927739795 EBUILD libopenshot-0.2.7-r1.ebuild 2234 BLAKE2B 368a6a3dcd5bf00d06e85bab6841fa1b383826f53775939f8c0fdc6add290f52b186dacf855641a4f6b7614a4eafe4a70304eb4ad4b31d32dbbb47552692ea46 SHA512 88bdfd649812fedbab8e4bcf12158a38a8aa84df0d07233b1ab4acb976ce6268f5a1ba5db9a0ae2dfa11a0642bbb1d2371b35da046b03dca624a3ee1a3154f66 -EBUILD libopenshot-0.3.2-r1.ebuild 2546 BLAKE2B b3b635e7923812d8993fc73c9d05ee33cfde2b6e161b64a56e09ffe3e880a1112f5f79b91cd84ec1f28f479e64b1e949505112e19c505e510ca45e17771ee1d7 SHA512 095584250f32eb8cd3289d0bcd490fbe1f74a4980968944f823834813d757d3304029dcbe3dc18b4c43d31ae1b37182a6eb90fa1e19d7e5537f4ad31ab5887e2 +EBUILD libopenshot-0.3.2-r1.ebuild 2665 BLAKE2B 92ec123be7ea7d7837230b31685ef549bbbb456746066d7368602e313a4ee47e1705d06fdaa9f68b9c242d32019446994272b707e2cea7478be05769ce7961af SHA512 ce27e88fe66a20a42473a940a8472965ccfebb61164a443786b9a5683518c9b273f435a6b08b8ff0df9d908635adc606f427b8b336dcf27a9faf37c38a2d0dc0 MISC metadata.xml 692 BLAKE2B 4026573a8fcb925db47d77d761687f7b184e1ddc09607575d74f74989ee813171d8ca80b62242aeafff876016a09080813842c8745a91a04c90976bf30f5fe33 SHA512 38ebac4cf25be33304bc04bfe8435750c869f070cfa70d8aa53fe569fa95cbbab61fabefff1b4d6ebfd52d30ed18d806941dc7115d5a1906f2e4e2e2823bb2ec 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 +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() { -- cgit v1.2.3